bundler 1.10.6 → 1.11.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5b82f62ba26e1ac9da898f780001baab80d27e
-  data.tar.gz: 72988f3a780eea7870f3c1306ffa455aa33cffce
+  metadata.gz: 047d83c72808c23bfb02d3d021734e2648247391
+  data.tar.gz: c7d2e0109ecdc27b9ef3bdb17a865ef1847ce46f
 SHA512:
-  metadata.gz: d70d3b9ac2f6f76bd2a301e03c6b515e1468030c85daf2dc678ab0475582ba6fc289238f3e9d80656c75ff783426c10850b317c4c5922dda6e98f768945ee064
-  data.tar.gz: a8c44a1a6b8d8eb4497d39ad64fd9bf2693e280b5eb9ba410d6112ae8f635acaa7901ef75355961edabbcee040e302f206ff4bfe2d6402bc512241c02d5962b9
+  metadata.gz: a1c58b0e79318f49082d0b81d27a2f932b624cd48bdb003bd2c7cffd3aed332859cdd932bad1f0ce664d0a14c83b9c94fefb447432e20ddaf080000cab807799
+  data.tar.gz: 269aff92a5244798680969bf42282909249b0c17b023a38bcb6d05b7ed7fb620b7c29edf2898132c17e59c534fd23ed10895f868c10107a02d1aa0bdaefd22b2

data/.rubocop.yml

@@ -0,0 +1,105 @@
+inherit_from:
+  - .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - tmp/**/*
+    - lib/bundler/vendor/**/*
+  DisplayCopNames: true
+
+# Lint
+
+# They are idiomatic
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Lint/EndAlignment:
+  AlignWith: variable
+
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+# Style
+
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/MultilineBlockChain:
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Style/PerlBackrefs:
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  SpaceBeforeBlockParameters: false
+
+Style/TrivialAccessors:
+  Enabled: false
+
+# We adopted raise instead of fail.
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+# Having these make it easier to *not* forget to add one when adding a new
+# value and you can simply copy the previous line.
+Style/TrailingComma:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
+
+# 1.8.7 support
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/Lambda:
+  Enabled: false
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/EachWithObject:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Style/TrailingComma:
+  Enabled: false
+
+# Metrics
+
+# We've chosen to use Rubocop only for style, and not for complexity or quality checks.
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,120 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-11-21 00:03:12 -0600 using RuboCop version 0.35.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+Lint/Eval:
+  Exclude:
+    - 'lib/bundler.rb'
+    - 'lib/bundler/endpoint_specification.rb'
+    - 'spec/support/streams.rb'
+
+# Offense count: 5
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/bundler/fetcher/dependency.rb'
+    - 'lib/bundler/installer.rb'
+    - 'lib/bundler/psyched_yaml.rb'
+    - 'lib/bundler/vendored_persistent.rb'
+
+# Offense count: 1
+Lint/NestedMethodDefinition:
+  Exclude:
+    - 'lib/bundler/graph.rb'
+
+# Offense count: 5
+Lint/RescueException:
+  Exclude:
+    - 'lib/bundler/cli.rb'
+    - 'lib/bundler/dsl.rb'
+    - 'lib/bundler/friendly_errors.rb'
+    - 'lib/bundler/rubygems_integration.rb'
+    - 'lib/bundler/worker.rb'
+
+# Offense count: 7
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/bundler/graph.rb'
+    - 'lib/bundler/index.rb'
+    - 'lib/bundler/installer.rb'
+
+# Offense count: 1031
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 207
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 50
+Metrics/PerceivedComplexity:
+  Max: 54
+
+# Offense count: 1
+Style/AccessorMethodName:
+  Exclude:
+    - 'lib/bundler/source/git.rb'
+
+# Offense count: 3
+Style/CaseEquality:
+  Exclude:
+    - 'lib/bundler/dsl.rb'
+    - 'lib/bundler/match_platform.rb'
+    - 'lib/bundler/rubygems_ext.rb'
+
+# Offense count: 22
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 119
+# Configuration parameters: Exclude.
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: Exclude.
+Style/FileName:
+  Exclude:
+    - 'lib/bundler/templates/Executable'
+
+# Offense count: 4
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Exclude:
+    - 'lib/bundler/cli.rb'
+    - 'spec/spec_helper.rb'
+    - 'spec/support/helpers.rb'
+
+# Offense count: 32
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false
+
+# Offense count: 2
+Style/ModuleFunction:
+  Exclude:
+    - 'lib/bundler/shared_helpers.rb'
+    - 'spec/support/path.rb'
+
+# Offense count: 8
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+Style/PredicateName:
+  Exclude:
+    - 'lib/bundler/definition.rb'
+    - 'lib/bundler/installer/parallel_installer.rb'
+    - 'lib/bundler/settings.rb'
+    - 'lib/bundler/source/git.rb'
+    - 'lib/bundler/source/git/git_proxy.rb'
+    - 'lib/bundler/source/path.rb'
+
+# Offense count: 7
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/RaiseArgs:
+  Enabled: false

data/.travis.yml

@@ -5,16 +5,8 @@ before_script: travis_retry rake spec:travis:deps
 branches:
   only:
     - master
-    - 1-10-stable
-    - 1-9-stable
-    - 1-8-stable
-    - 1-7-stable
-    - 1-6-stable
-    - 1-5-stable
-    - 1-3-stable
-    - 1-2-stable
-    - 1-1-stable
-    - 1-0-stable
+    - auto
+    - /.+-stable$/
 
 notifications:
   email:
@@ -34,7 +26,6 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.8.7
-  - rbx-2
 
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:66 for the list of possible RGV values
@@ -42,24 +33,25 @@ env:
   # We need to know if changes to rubygems will break bundler on release
   - RGV=master
   # Test the latest rubygems release with all of our supported rubies
+  - RGV=v2.5.0
   - RGV=v2.4.8
 
 matrix:
   include:
-    # Ruby 2.2, Rubygems 2.4.5 and up (RG 2.4 is included by the matrix above)
+    # Ruby 2.2, Rubygems 2.4.5 and up (included by RGV above)
     # Ruby 2.1, Rubygems 2.2.2 and up
     - rvm: 2.1
-      env: RGV=v2.2.3
+      env: RGV=v2.2.5
     # Ruby 2.0.0, Rubygems 2.0.0 and up
     - rvm: 2.0.0
-      env: RGV=v2.2.3
+      env: RGV=v2.2.5
     - rvm: 2.0.0
       env: RGV=v2.1.11
     - rvm: 2.0.0
       env: RGV=v2.0.14
     # Ruby 1.9.3, Rubygems 1.5.3 and up
     - rvm: 1.9.3
-      env: RGV=v2.2.3
+      env: RGV=v2.2.5
     - rvm: 1.9.3
       env: RGV=v2.1.11
     - rvm: 1.9.3
@@ -74,7 +66,7 @@ matrix:
       env: RGV=v1.5.3
     # Ruby 1.8.7, Rubygems 1.3.6 and up
     - rvm: 1.8.7
-      env: RGV=v2.2.3
+      env: RGV=v2.2.5
     - rvm: 1.8.7
       env: RGV=v2.0.14
     - rvm: 1.8.7
@@ -96,17 +88,10 @@ matrix:
     # For no apparent reason, this often goes over the Travis limit
     - rvm: 1.8.7
       env: RGV=v2.1.11
-    # Ruby 1.9.2 sanity check
-    # (but it's just too slow and sometimes goes over the Travis limit)
-    - rvm: 1.9.2
-      env: RGV=v2.4.8
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master
   allow_failures:
     - rvm: 1.8.7
       env: RGV=v2.1.11
-    - rvm: 1.9.2
     - rvm: ruby-head
-    - rvm: jruby
-    - rvm: rbx-2

data/CHANGELOG.md

@@ -1,3 +1,66 @@
+## 1.11.0.pre.1 (2015-11-29)
+
+Features:
+
+  - actual Gemfile and lockfile filenames are used in messages (#3672, @segiddins)
+  - the git remote for `rake release` is now customizable (@skateman)
+  - file access permissions errors are now much more friendly (#3703, #3735, #3858, #3988, #4009 @repinel, @Elffers, @segiddins, @agis-)
+  - add support for showing help for plugin commands (@tf)
+  - send `X-Gemfile-Source` header to source mirrors (@agis-)
+  - show what version upstream dependencies were resolved to in conflict messages (@segiddins)
+  - add support for using bundler setting to add private access credentials for git sources (@frsyuki)
+  - take into consideration HTTP proxy settings in `.gemrc` (@PG-kura)
+  - allow specifying a gem host to push to in the `GEM_HOST` environment variable (@pmenglund)
+  - when gempec `required_ruby_version` is available and the Gemfile specifies a ruby version, resolve for the given ruby version (@segiddins)
+  - allow setting a `silence_root_warning` setting to silence the warning when `bundle install` is run as root (@blackxored)
+  - update the `bundle gem` code of conduct template to Contributor Covenant v1.3.0 (@CoralineAda)
+  - add support for specifying gems to update when running `bundle lock` via `--update gem1 gem2` (@JuanitoFatas)
+
+Bugfixes:
+
+  - avoid showing bundler version warning messages twice (@fotanus)
+  - fix running `bundle check` with `--path` when the gems are only installed globally (@akihiro17)
+  - fix `bin/setup` from `bundle gem` assuming `bash` is in `/bin`
+  - fail more gracefully when an HTTP remote is unreachable (#3765, @steverob)
+  - fix a warning running `bundle exec` on jruby 9.0.0.0 (@deivid-rodriguez, @mastfish)
+  - added support for MRI 2.3 (@amatsuda)
+  - fix the `bundle gem` readme when no tests are generated (@roseweixel)
+  - the dependencies on test gems in `bundle gem` are now locked to major versions (#3811, @indirect)
+  - fix the paths for native extensions generated by `--standalone` (#3813, @AlexanderPavlenko)
+  - fix trying to cache a gem that has no source (@EduardoBautista)
+  - fix `--source` option to `bundle update` causing incorrect gem unlocking (#3759, #3761, @neoeno)
+  - show a helpful message when requiring a file in `bundler require` fails (#3960, @agis-)
+  - improve hint when a resolution conflict occurs (@seanlinsley)
+  - fix handling an empty `BUNDLE_GEMFILE` environment variables (#3678, @agis-)
+  - avoid cleaning up gem extension directory in `bundle clean` (@Sirupsen)
+  - include git revision hash when printing a git source (#3433, @agis-)
+  - fix the `ssl_verify_mode` setting not being treated as a number (@goughy000)
+  - fix not retrying on zlib errors (#4047, @andremedeiros)
+  - fix a warning being shown for using `URI.encode` (@EduardoBautista)
+  - fix handling of fatal HTTP errors (#3830, @indirect)
+  - improve error message when sources are not absolute URIs (#3925, @agis-)
+  - ensure all `sudo` access is done in a thread-safe manner (#3910, @agis-)
+  - show a friendly error when a git ref is not found (#3879, @agis-)
+  - fix caching gems with a path with the same prefix as the bundled application (@indirect)
+  - fix showing gemspec validation errors on `bundle exec` (#3895, @agis-)
+  - distinguish Gemfile syntax and evaluation errors (#3783, @agis-)
+  - fix nested Gemfile sources not restoring the previous source (#3974, @agis-)
+  - fix the `RUBYLIB` environment variable not being cleaned (#3982, @agis-)
+  - fix handling a dependency missing from `Gemfile.lock` so parallel installation does not deadlock (#4012, @lukaso)
+  - add `pkg` to rake's clobber list (#3676, @jasonkarns)
+  - also print gemspecs in `bundle env` output (@agis-)
+  - fix handling when a `path` source does not have a gemspec but a lockfile says there is (#4004, @segiddins)
+  - show a warning when the `RUBYGEMS_GEMDEPS` environment variable is set (#3656, @agis-)
+  - fix handling invalid RubyGems configuration files (#4042, @agis-)
+  - fix `bundle console` falling back to `irb` when the preferred console is unavailable (@felixbuenemann)
+  - retry fetching specs when fetching version metadata fails (@jingweno)
+  - restrict platforms when referencing a `gemspec` in the `Gemfile` to those defined in the gemspec (#4102, @smellsblue)
+
+Performance:
+
+  - speed up dependency resolution in pathological cases by 25x (#3803, @segiddins)
+  - drop string allocations when searching for gems (@jrafanie)
+
 ## 1.10.6 (2015-07-22)
 
 Workarounds:
@@ -116,6 +179,12 @@ Deprecations:
 
   - deprecated the (never enabled) `bundle_ruby` binary (@smlance)
 
+## 1.9.10 (2015-06-22)
+
+Features:
+
+  - the `BUNDLED WITH` section of lockfiles generated by 1.10+ will be preserved (@segiddins)
+
 ## 1.9.9 (2015-05-16)
 
 Bugfixes:

data/CODE_OF_CONDUCT.md

@@ -1,6 +1,6 @@
 # Bundler Code of Conduct
 
-The Bundler project strongly values contributors from anywhere, regardless of gender, sexual orientation, disability, physical appearance, body size, race, or religion. As a result, the Bundler team has agreed to and enforces this code of conduct in order to provide a harassment-free experience for everyone who participates in the development of Bundler.
+The Bundler project strongly values contributors from anywhere, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, ethnicity, age, religion, or nationality. As a result, the Bundler team has agreed to and enforces this code of conduct in order to provide a harassment-free experience for everyone who participates in the development of Bundler.
 
 ### Summary
 
@@ -8,18 +8,20 @@ Harassment in code and discussion or violation of physical boundaries is complet
 
 ### In detail
 
-Harassment includes offensive verbal comments related to gender, sexual orientation, disability, physical appearance, body size, race, religion, sexual images, deliberate intimidation, stalking, sustained disruption, and unwelcome sexual attention.
+Harassment includes offensive verbal comments related to level of experience, gender, gender identity and expression, sexual orientation, disability, physical appearance, body size, race, ethnicity, age, religion, nationality, the use of sexualized language or imagery, deliberate intimidation, stalking, sustained disruption, and unwelcome sexual attention.
 
 Individuals asked to stop any harassing behavior are expected to comply immediately.
 
 Maintainers, including the core team, are also subject to the anti-harassment policy.
 
-If anyone engages in harassing behavior, including maintainers, we may take appropriate action, up to and including warning the offender, deletion of comments, removal from the project’s codebase and communication systems, and escalation to Github support.
+If anyone engages in abusive, harassing, or otherwise unacceptable behavior, including maintainers, we may take appropriate action, up to and including warning the offender, deletion of comments, removal from the project’s codebase and communication systems, and escalation to Github support.
 
 If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of [the core team](http://bundler.io/contributors.html) or [email the core team](mailto:team@bundler.io) immediately.
 
 We expect everyone to follow these rules anywhere in the Bundler project’s codebases, issue trackers, IRC channel, group chat, and mailing lists.
 
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
 Finally, don't forget that it is human to make mistakes! We all do. Let’s work together to help each other, resolve issues, and learn from the mistakes that we will all inevitably make from time to time.
 
 
@@ -37,4 +39,4 @@ Thanks to the [JSConf Code of Conduct](http://jsconf.com/codeofconduct.html) and
   <a rel="license" href="http://creativecommons.org/publicdomain/zero/1.0/">
     <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0">
   </a>
-</p>
+</p>

data/DEVELOPMENT.md

@@ -10,11 +10,10 @@ If you’re interested in contributing to Bundler, that’s awesome! We’d love
 
 If you have any questions after reading this page, please feel free to contact either [@indirect](http://github.com/indirect) or [@hone](http://github.com/hone). They are both happy to provide help working through your first bugfix or thinking through the problem you’re trying to resolve.
 
-## Tackle some small problems
+## How you can help
 
 We track [small
-bugs](https://github.com/bundler/bundler/issues?labels=small&state=open) and [small features](https://github.com/bundler/bundler-features/issues?labels=small&state=open) so that anyone who wants to help can start with something that's not too overwhelming. If nothing on those lists looks good, though, just talk to us.
-
+bugs](https://github.com/bundler/bundler/issues?labels=small&state=open) and [small features](https://github.com/bundler/bundler-features/issues?labels=small&state=open) so that anyone who wants to help can start with something that's not too overwhelming. We also keep a [list of things anyone can help with, any time](https://github.com/bundler/bundler/blob/master/CONTRIBUTING.md#contributing). If nothing on those lists looks good, talk to us, and we'll figure out what you can help with. We can absolutely use your help, no matter what level of programming skill you have at the moment.
 
 # Development setup
 
@@ -30,7 +29,7 @@ Bundler doesn't use a Gemfile to list development dependencies, because when we
 
   3. Set up a shell alias to run Bundler from your clone, e.g. a Bash alias:
 
-        $ alias dbundle='ruby -I /path/to/bundler/lib /path/to/bundler/bin/bundle'
+        $ alias dbundle='ruby -I /path/to/bundler/lib /path/to/bundler/exe/bundle'
 
      With that set up, you can test changes you've made to Bundler by running `dbundle`, without interfering with the regular `bundle` command.
 
@@ -83,7 +82,7 @@ If you don't hear back immediately, don’t get discouraged! We all have day job
 
 Early releases require heavy testing, especially across various system setups. We :heart: testers, and are big fans of anyone who can run `gem install bundler --pre` and try out upcoming releases in their development and staging environments.
 
-There may not always be prereleases or beta versions of Bundler. That said, you are always welcome to try checking out master and building a gem yourself if you want to try out the latest changes.
+There may not always be prereleases or beta versions of Bundler. The Bundler team will tweet from the [@bundlerio account](http://twitter.com/bundlerio) when a prerelease or beta version becomes available. You are also always welcome to try checking out master and building a gem yourself if you want to try out the latest changes.
 
 
 # Translations