Skip to content

Commit

Permalink
(maint) legal and notices
Browse files Browse the repository at this point in the history
  • Loading branch information
ferventcoder committed Dec 14, 2013
1 parent 3e8881f commit 4e46309
Show file tree
Hide file tree
Showing 11 changed files with 722 additions and 0 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at http:https://EditorConfig.org

root = true

[*]
end_of_line = CRLF

[*.ps1]
indent_style = space
indent_size = 2
430 changes: 430 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions COMMITTERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
Committing
==========

We like to see folks contributing to Chocolatey. If you are a committer, we'd like to see you help from time to time with triage and the pull request process.

## Terminology

**contributor** - A person who makes a change to the code base and submits a change set in the form of a pull request.

**change set** - A set of discrete patches which combined together form a contribution. A change set takes the form of git commits and is submitted in the form of a pull request.

**committer** - A person responsible for reviewing a pull request and then making the decision what base branch to merge the change set into.

## Review Process

The process is as follows:

* A contributor sends a pull request (usually against master).
* A committer typically reviews it within a week or less to determine the feasibility of the changes.
* In all cases politeness goes a long way. Please thank folks for contributions - they are going out of their way to help make the codebase better or adding something they may personally feel is necessary for the codebase.
* Initial gotchas to check for:
* Did the user create a branch with these changes? If it is on their master, please ask them to review the [contributing document](https://github.com/chocolatey/chocolatey/blob/master/CONTRIBUTING.md).
* Did the user reformat files and they should not have? What is just whitespace? You can try adding [?w=1](https://github.com/blog/967-github-secrets) to the url on github.
* Are there tests? We really want any new contributions to contain tests so unless the committer believes this code really needs to be in the codebase and is willing to write the tests, then we need to ask the contributor to make a good faith effort in adding test cases. Ask them to review the [contributing document](https://github.com/chocolatey/chocolatey/blob/master/CONTRIBUTING.md) and provide tests. **Note:** Some commits may be refactoring which wouldn't necessarily add additional test sets.
* Is the code documented properly? Does this additional set of changes require changes to the wiki?
* Was this code warranted? Did the contributor follow the process of gaining approval for big changesets? If not please have them review the [contributing document](https://github.com/chocolatey/chocolatey/blob/master/CONTRIBUTING.md) and ask that they follow up with a case for putting the code into the codebase on the mailing list.
* Review the code:
* Does the code meet the naming conventions and formatting?
* Is the code sound? Does it read well? Can you understand what it is doing without having to execute it? Principal of no clever hacks (need link).
* Does the code do what the purpose of the pull request is for?
* Once you have reviewed the initial items and are not waiting for additional feedback or work by the contributor, give the thumbs up that it is ready for the next part of the process (merging).
* Unless there is something wrong with the code, we don't ask contributors to try to stay in sync with master. They did the work to create the patch in the first place, asking them to unnecessarily come back and try to keep their code synced up with master is not an acceptable process.

## Merging

Once you have reviewed the change set and determined it is ready for merge, the next steps are to bring it local and evaluate the code further by actually working with it, running the tests locally and adding any additional commits or fixups that are necessary in a local branch.

When merging the user's contribution, it should be done with `git merge --no-ff` to create a merge commit so that in case there is an issue it becomes easier to rever later. And so that we can see where the code came from should we ever need to go find it later.
25 changes: 25 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Contributors
============

The process for contributions is roughly as follows:

* Through github or through the mailing list (preferred) you talk about a feature you would like to see (or a bug) and why it should be in choco.
* Once you get a nod from one of the chocolatey team folks (https://github.com/chocolatey?tab=members), you can start on the feature.
* You create or update a fork of chocolatey under your GitHub account.
* From there you create a branch named specific to the feature.
* In the branch you do work specific to the feature. Please also observe the following:
* No reformatting
* No changing files that are not specific to the feature
* Test your changes and please help us out by updating and implementing some automated tests. If you are not familiar with [Pester](https://github.com/pester/Pester), I would suggest just spend some time looking over the tests in the source code. You can't go wrong emulating one of the existing tests and then changing it specific to the behavior you are testing. You can install Pester with Chocolatey by ```cinst pester```.
* Once you feel it is ready, submit the pull request to the chocolatey/chocolatey repository (which is pretty easy).
* In the pull request, outline what you did and point to specific conversations (as in urls) and issues that you are are resolving. This is a tremendous help for us in evaluation and acceptance.
* Once the pull request is in, please do not delete the branch or close the pull request (unless something is wrong with it).
* One of the members will evaluate it within a reasonable time period (which is to say usually within 2-4 weeks). Some things get evaluated faster or fast tracked. We are human and we have active lives outside of open source so don't fret if you haven't seen any activity on your pull request within a month or two. We don't have an SLA for pull requests. Just know that we will evaluate your pull request.
* If we have comments or questions when we do evaluate it and receive no response, it will probably lessen the chance of getting accepted.

The helpers/utility functions that are available to the packages are what we consider the API. If you are working in the API, please note that you will need to maintain backwards compatibility. If you plan to rename a function or make it more generic, you must provide an alias in the chocolateyInstaller.psm1 (https://github.com/chocolatey/chocolatey/blob/master/src/helpers/chocolateyInstaller.psm1) as part of what gets exported. You should not remove or reorder parameters, only add optional parameters to the end. They should be named and not positional (we are moving away from positional parameters as much as possible).

If you reformat code or hit core functionality without an approval from a person on the choco team, it's likely that no matter how awesome it looks afterwards, it will probably not get accepted. Reformatting code makes it harder for us to evaluate exactly what was changed.

If you do these things, it will be make evaluation and acceptance easy. Now if you stray outside of the guidelines we have above, it doesn't mean we are going to ignore your pull request. It will just make things harder for us. Harder for us roughly translates to a longer SLA for your pull request.

174 changes: 174 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
Apache License
Version 2.0, January 2004
http:https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
13 changes: 13 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2011 - Present Rob Reynolds, the maintainers of Chocolatey, and RealDimensions Software, LLC

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http:https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
15 changes: 15 additions & 0 deletions docs/legal/CREDITS
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Chocolatey has been the thoughts and work of the following people:

Committers & Contributors
----------
Rob Reynolds (https://github.com/ferventcoder), Vision, direction and main committer
Nekresh (https://github.com/nekresh) - Contributing code and ideas on direction
Chris Ortman (https://github.com/chrisortman) - package contributions and thoughts on where to take it
Svein Arne Ackenhausen (https://github.com/acken) - suggestions and thoughts on features and packages
Marcel Hoyer - suggestions on making this stuff work without administrative access to a machine
Jason Jarrett (https://github.com/staxmanade) - contributing code and ideas


Other Credits
-------------
Chocolatey name started as a joke as what you would name a framework that would sit on top of NuGet as an enhancement
Binary file added docs/logo/chocolateyicon.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/logo/chocolateyicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/logo/favicon.ico
Binary file not shown.
16 changes: 16 additions & 0 deletions readme.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Chocolatey NuGet (like apt-get, but for Windows)
=======
![Chocolatey Logo](https://github.com/chocolatey/chocolatey/raw/master/docs/logo/chocolateyicon.gif "Chocolatey")

# LICENSE
Apache 2.0 - see docs/legal (just LEGAL in the zip folder)

# INFO
##Please see the [wiki](https://github.com/chocolatey/chocolatey/wiki)

# SOURCE REQUIREMENTS
* .NET Framework 4.0
* PowerShell 2.0+

# CREDITS
see [docs/legal/CREDITS](https://github.com/chocolatey/chocolatey/raw/master/docs/legal/CREDITS) (just LEGAL/Credits in the zip folder)

0 comments on commit 4e46309

Please sign in to comment.