Merge branch 'master' of https://github.com/Homebrew/homebrew

nonnenmacher · Jul 19, 2016 · 4a42998 · 4a42998
2 parents 367cc33 + 73a2e75
commit 4a42998
Show file tree

Hide file tree

Showing 3,795 changed files with 7,396 additions and 167,820 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -0,0 +1,6 @@
+**DO NOT CREATE NEW ISSUES OR PULL REQUESTS ON THIS REPOSITORY!**
+
+- Please create all issues found when running `brew install` at https://github.com/Homebrew/homebrew-core/issues/new
+- Please create all issues found when running any other `brew` command at https://github.com/Homebrew/brew/issues/new
+- Please create formula pull requests at https://github.com/Homebrew/homebrew-core
+- Please create core code pull requests at https://github.com/Homebrew/brew
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,5 @@
+DO NOT CREATE NEW ISSUES ON THIS REPOSITORY!
+
+Please create all issues found when running `brew install` at https://github.com/Homebrew/homebrew-core/issues/new
+
+Please create all issues found when running any other `brew` command at https://github.com/Homebrew/brew/issues/new
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+DO NOT CREATE NEW PULL REQUESTS ON THIS REPOSITORY!
+
+Please create formula pull requests at https://github.com/Homebrew/homebrew-core
+
+Please create core code pull requests at https://github.com/Homebrew/brew
diff --git a/.gitignore b/.gitignore
@@ -1,19 +1,13 @@
+# First, ignore everything.
 /*
-!/.gitignore
-!/.travis.yml
-!/.yardopts
-!/Library/
-!/CODEOFCONDUCT.md
-!/CONTRIBUTING.md
-!/LICENSE.txt
-!/README.md
-!/SUPPORTERS.md
-!/bin
-/bin/*
-!/bin/brew
-!/share/doc/homebrew
-!/share/man/man1/brew.1
+
+# Explicitly ignore OS X Finder thumbnail files.
 .DS_Store
+
+# Unignore the contents of `Library` as that's where our code lives.
+!/Library/
+
+# Ignore generated files within `Library` (again).
 /Library/Homebrew/doc
 /Library/Homebrew/test/.bundle
 /Library/Homebrew/test/bin
@@ -22,5 +16,28 @@
 /Library/Homebrew/test/fs_leak_log
 /Library/LinkedKegs
 /Library/PinnedKegs
-/Library/Taps
 /Library/PinnedTaps
+/Library/Taps
+
+# Ignore `bin` contents (again).
+/bin
+
+# Unignore our `brew` script.
+!/bin/brew
+
+# Ignore `share` contents (again).
+/share
+/share/doc
+
+# Unignore our documentation.
+!/.github
+!/share/doc/homebrew
+!/share/man/man1/brew.1
+
+# Unignore our root-level metadata files.
+!/.gitignore
+!/.travis.yml
+!/.yardopts
+!/CODEOFCONDUCT.md
+!/LICENSE.txt
+!/README.md
diff --git a/.travis.yml b/.travis.yml
diff --git a/.yardopts b/.yardopts
diff --git a/CODEOFCONDUCT.md b/CODEOFCONDUCT.md
@@ -1,25 +1 @@
-# Code of Conduct
-The Homebrew community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences great successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines which help steer our interactions and strive to keep Homebrew a positive, successful, and growing community.
-
-A member of the Homebrew community is:
-
-## Open
-Members of the community are open to collaboration, whether it's on GitHub, email, IRC or otherwise. We're receptive to constructive comment and criticism, as the experiences and skill sets of other members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate and everyone can make a difference.
-
-## Considerate
-Members of the community are considerate of their peers - other Homebrew users. We're thoughtful when addressing the efforts of others, keeping in mind that oftentimes their labor was completed simply for the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
-
-## Respectful
-Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments, and their efforts. We're respectful of the volunteer efforts that permeate the Homebrew community. We're respectful of the processes set forth in the community, and we work within them. When we disagree, we are courteous in raising our issues.
-
-Overall, we're good to each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
-
-# Diversity
-The Homebrew community welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, and encouragement, and we are working to help each other live up to these principles. We want our community to be more diverse: whoever you are, and whatever your background, we welcome you.
-
-We have created this diversity statement because we believe that a diverse Homebrew community is stronger and more vibrant. A diverse community where people treat each other with respect has more potential contributors and more sources for ideas.
-
-Although we have phrased the formal diversity statement generically to make it all-inclusive, we recognise that there are specific attributes that are used to discriminate against people. In alphabetical order, some of these attributes include (but are not limited to): age, culture, ethnicity, gender identity or expression, national origin, physical or mental difference, politics, race, religion, sex, sexual orientation, socio-economic status, and subculture. We welcome people regardless of the values of these or other attributes.
-
-# Attribution
-This code of conduct is heavily based on the [Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/) and the [Python Diversity Statement](https://www.python.org/community/diversity/).
+Moved to https://github.com/Homebrew/brew/blob/master/CODEOFCONDUCT.md.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright 2009-2015 Homebrew contributors.
+Copyright 2009-2016 Homebrew contributors.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
diff --git a/Library/Aliases/0install b/Library/Aliases/0install
diff --git a/Library/Aliases/0mq b/Library/Aliases/0mq
diff --git a/Library/Aliases/4store b/Library/Aliases/4store
diff --git a/Library/Aliases/Secret Rabbit Code b/Library/Aliases/Secret Rabbit Code
diff --git a/Library/Aliases/actor-framework b/Library/Aliases/actor-framework
diff --git a/Library/Aliases/adwaita-icon-theme b/Library/Aliases/adwaita-icon-theme
diff --git a/Library/Aliases/ag b/Library/Aliases/ag
diff --git a/Library/Aliases/alut b/Library/Aliases/alut
diff --git a/Library/Aliases/android b/Library/Aliases/android
diff --git a/Library/Aliases/apache-activemq b/Library/Aliases/apache-activemq
diff --git a/Library/Aliases/apache-fop b/Library/Aliases/apache-fop
diff --git a/Library/Aliases/atlassian-cli b/Library/Aliases/atlassian-cli
diff --git a/Library/Aliases/aws-as b/Library/Aliases/aws-as
diff --git a/Library/Aliases/aws-mon b/Library/Aliases/aws-mon
diff --git a/Library/Aliases/awsebcli b/Library/Aliases/awsebcli
diff --git a/Library/Aliases/beanstalkd b/Library/Aliases/beanstalkd
diff --git a/Library/Aliases/bjam b/Library/Aliases/bjam
diff --git a/Library/Aliases/blazegraph b/Library/Aliases/blazegraph
diff --git a/Library/Aliases/boehmgc b/Library/Aliases/boehmgc
diff --git a/Library/Aliases/boost-jam b/Library/Aliases/boost-jam
diff --git a/Library/Aliases/boot2docker-cli b/Library/Aliases/boot2docker-cli
diff --git a/Library/Aliases/brightness b/Library/Aliases/brightness
diff --git a/Library/Aliases/bzr b/Library/Aliases/bzr
diff --git a/Library/Aliases/cmark b/Library/Aliases/cmark
diff --git a/Library/Aliases/cowthink b/Library/Aliases/cowthink
diff --git a/Library/Aliases/cpanm b/Library/Aliases/cpanm
diff --git a/Library/Aliases/csvfix b/Library/Aliases/csvfix