bundler 1.15.0.pre.2 → 1.15.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc0514820479e02853769a88cea9f78ddfb91146
-  data.tar.gz: 0c7736db509279645483b3187f7b238906b982b5
+  metadata.gz: e9686bfd491be95a83088cbad46dfb994c7e81e6
+  data.tar.gz: 6a258bf2b5a72d9f8cf022d8a0437c4031c68b35
 SHA512:
-  metadata.gz: 4330bf16e081ad1e568afb8b6603e603bbc6029c986dc47c92c0661468afb4b70ea82590bef0d63abf39c02848f2ac3549bb96035b061df6c34b2245f7e3f31e
-  data.tar.gz: 02abbb9bb724329f63e3a90f3547ece0ff3f196add05401c371dc536b9efa9149860dd856d20a4ca336a877207496c64d533558b613b7ade4727073266cb7482
+  metadata.gz: 5290fc10956b9399f4723b23af050f197cf1b15f6f793652645182ddec047d9268098f8e1479bac2e5f23ea53a90f68eda5b56961c61d19a252b38244d335c6f
+  data.tar.gz: b249ee0e8cd96a45e4fc49e2e65b9668d2d96f291ff129763274fe55e87885e462b9f6fff011a6b9bb51a3314110faf51e60a52398d65f6bc226973f025c4447

data/.rubocop.yml

@@ -122,6 +122,9 @@ Metrics/CyclomaticComplexity:
 Metrics/ParameterLists:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 # It will be obvious which code is complex, Rubocop should only lint simple
 # rules for us.
 Metrics/PerceivedComplexity:

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.15.0.pre.3 (2017-04-30)
+
+Bugfixes:
+
+  - avoid redundant blank lines in the readme generated by `bundle gem` (@koic)
+  - ensure that `open-uri` is not loaded after `bundle exec` (@segiddins)
+  - print a helpful error message when an activated default gem conflicts with
+    a gem in the gemfile (@segiddins)
+  - only shorten `ref` option for git gems when it is a SHA (#5620, @segiddins)
+
 ## 1.15.0.pre.2 (2017-04-23)
 
 Bugfixes:

data/CODE_OF_CONDUCT.md

@@ -14,7 +14,7 @@ Individuals asked to stop any harassing behavior are expected to comply immediat
 
 Maintainers, including the core team, are also subject to the anti-harassment policy.
 
-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 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.
 

data/Rakefile

@@ -70,7 +70,7 @@ namespace :spec do
       sh "sudo apt-get install graphviz -y 2>&1 | tail -n 2"
 
       # Install the gems with a consistent version of RubyGems
-      sh "gem update --system 2.6.4"
+      sh "gem update --system 2.6.11"
 
       $LOAD_PATH.unshift("./spec")
       require "support/rubygems_ext"

data/bundler.gemspec

@@ -18,6 +18,15 @@ Gem::Specification.new do |s|
   s.summary     = "The best way to manage your application's dependencies"
   s.description = "Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably"
 
+  if s.respond_to?(:metadata=)
+    s.metadata = {
+      "bug_tracker_uri" => "http://github.com/bundler/bundler/issues",
+      "changelog_uri" => "https://github.com/bundler/bundler/blob/master/CHANGELOG.md",
+      "homepage_uri" => "https://bundler.io/",
+      "source_code_uri" => "http://github.com/bundler/bundler/",
+    }
+  end
+
   s.required_ruby_version     = ">= 1.8.7"
   s.required_rubygems_version = ">= 1.3.6"
 

data/doc/contributing/COMMUNITY.md

@@ -6,7 +6,7 @@ It would be tremendously helpful to have more people answering questions about B
 
 Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [bundler.io](http://bundler.io), we would absolutely love it if you opened an issue or pull request on the [bundler-site](https://github.com/bundler/bundler-site) repository.
 
-Sharing your experiences and discoveries by writing them up is a valuable way to help others who have similar problems or experiences in the future. You can write a blog post, create an example and commit it to Github, take screenshots, or make videos.
+Sharing your experiences and discoveries by writing them up is a valuable way to help others who have similar problems or experiences in the future. You can write a blog post, create an example and commit it to GitHub, take screenshots, or make videos.
 
 Publishing examples of how Bundler is used helps everyone, and we’ve discovered that people already use it in ways that we never imagined when we were writing it. If you’re still not sure what to write about, there are also several projects doing interesting things based on Bundler. They could probably use publicity too.
 

data/doc/development/PULL_REQUESTS.md

@@ -8,7 +8,7 @@ Before you submit a pull request, please remember to do the following:
 
 ## Code formatting
 
-Make sure the code formatting and styling adheres to the guidelines. We use Rubocop for this. Lack of formatting adherence will result in automatic Travis build failures.
+Make sure the code formatting and styling adheres to the guidelines. We use RuboCop for this. Lack of formatting adherence will result in automatic Travis build failures.
 
       $ bin/rubocop -a
 
@@ -28,7 +28,7 @@ Ex. For a pull request that changes something with `bundle update`, you might ru
 ## Commit messages
 
 Please ensure that the commit messages included in the pull request __do not__ have the following:
-  - `@tag` Github user or team references (ex. `@indirect` or `@bundler/core`)
+  - `@tag` GitHub user or team references (ex. `@indirect` or `@bundler/core`)
   - `#id` references to issues or pull requests (ex. `#43` or `bundler/bundler-site#12`)
 
 If you want to use these mechanisms, please instead include them in the pull request description. This prevents multiple notifications or references being created on commit rebases or pull request/branch force pushes.

data/lib/bundler/cli.rb

@@ -4,7 +4,6 @@ require "bundler/vendored_thor"
 
 module Bundler
   class CLI < Thor
-    include Thor::Actions
     AUTO_INSTALL_CMDS = %w(show binstubs outdated exec open console licenses clean).freeze
 
     def self.start(*)

data/lib/bundler/cli/gem.rb

@@ -2,6 +2,11 @@
 require "pathname"
 
 module Bundler
+  class CLI
+    Bundler.require_thor_actions
+    include Thor::Actions
+  end
+
   class CLI::Gem
     TEST_FRAMEWORK_VERSIONS = {
       "rspec" => "3.0",
@@ -13,7 +18,10 @@ module Bundler
     def initialize(options, gem_name, thor)
       @options = options
       @gem_name = resolve_name(gem_name)
+
       @thor = thor
+      thor.behavior = :invoke
+      thor.destination_root = nil
 
       @name = @gem_name
       @target = SharedHelpers.pwd.join(gem_name)

data/lib/bundler/dsl.rb

@@ -189,7 +189,7 @@ module Bundler
     end
 
     def github(repo, options = {})
-      raise ArgumentError, "Github sources require a block" unless block_given?
+      raise ArgumentError, "GitHub sources require a block" unless block_given?
       github_uri  = @git_sources["github"].call(repo)
       git_options = normalize_hash(options).merge("uri" => github_uri)
       git_source  = @sources.add_git_source(git_options)

data/lib/bundler/rubygems_integration.rb

@@ -74,12 +74,16 @@ module Bundler
     def spec_missing_extensions?(spec, default = true)
       return spec.missing_extensions? if spec.respond_to?(:missing_extensions?)
 
-      return false if spec.respond_to?(:default_gem?) && spec.default_gem?
+      return false if spec_default_gem?(spec)
       return false if spec.extensions.empty?
 
       default
     end
 
+    def spec_default_gem?(spec)
+      spec.respond_to?(:default_gem?) && spec.default_gem?
+    end
+
     def stub_set_spec(stub, spec)
       stub.instance_variable_set(:@spec, spec)
     end

data/lib/bundler/runtime.rb

@@ -29,18 +29,7 @@ module Bundler
           raise GemNotFound, "#{spec.full_name} is missing. Run `bundle install` to get it."
         end
 
-        if (activated_spec = Bundler.rubygems.loaded_specs(spec.name)) && activated_spec.version != spec.version
-          e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
-                                 "but your Gemfile requires #{spec.name} #{spec.version}. Prepending " \
-                                 "`bundle exec` to your command may solve this."
-          e.name = spec.name
-          if e.respond_to?(:requirement=)
-            e.requirement = Gem::Requirement.new(spec.version.to_s)
-          else
-            e.version_requirement = Gem::Requirement.new(spec.version.to_s)
-          end
-          raise e
-        end
+        check_for_activated_spec!(spec)
 
         Bundler.rubygems.mark_loaded(spec)
         spec.load_paths.reject {|path| $LOAD_PATH.include?(path) }
@@ -305,5 +294,27 @@ module Bundler
 
       output
     end
+
+    def check_for_activated_spec!(spec)
+      return unless activated_spec = Bundler.rubygems.loaded_specs(spec.name)
+      return if activated_spec.version == spec.version
+
+      suggestion = if Bundler.rubygems.spec_default_gem?(activated_spec)
+        "Since #{spec.name} is a default gem, you can either remove your dependency on it" \
+        " or try updating to a newer version of bundler that supports #{spec.name} as a default gem."
+      else
+        "Prepending `bundle exec` to your command may solve this."
+      end
+
+      e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
+                             "but your Gemfile requires #{spec.name} #{spec.version}. #{suggestion}"
+      e.name = spec.name
+      if e.respond_to?(:requirement=)
+        e.requirement = Gem::Requirement.new(spec.version.to_s)
+      else
+        e.version_requirement = Gem::Requirement.new(spec.version.to_s)
+      end
+      raise e
+    end
   end
 end

data/lib/bundler/source/git.rb

@@ -61,8 +61,12 @@ module Bundler
       def to_s
         at = if local?
           path
-        elsif options["ref"]
-          shortref_for_display(options["ref"])
+        elsif user_ref = options["ref"]
+          if ref =~ /\A[a-z0-9]{4,}\z/i
+            shortref_for_display(user_ref)
+          else
+            user_ref
+          end
         else
           ref
         end

data/lib/bundler/templates/newgem/README.md.tt

@@ -39,8 +39,8 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/<%= co
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 <% end -%>
-
 <% if config[:coc] -%>
+
 ## Code of Conduct
 
 Everyone interacting in the <%= config[:constant_name] %> project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/<%= config[:github_username] %>/<%= config[:name] %>/blob/master/CODE_OF_CONDUCT.md).

data/lib/bundler/vendored_thor.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
-module Bundler; end
+module Bundler
+  def self.require_thor_actions
+    Kernel.send(:require, "bundler/vendor/thor/lib/thor/actions")
+  end
+end
 require "bundler/vendor/thor/lib/thor"
-require "bundler/vendor/thor/lib/thor/actions"

data/lib/bundler/version.rb

@@ -7,7 +7,7 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.15.0.pre.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.15.0.pre.3" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin

data/man/bundle-add.ronn

@@ -0,0 +1,29 @@
+bundle-add(1) -- Add gem to the Gemfile and run bundle install
+================================================================
+
+## SYNOPSIS
+
+`bundle add` <GEM_NAME> [--group=GROUP] [--version=VERSION] [--source=SOURCE]
+
+## DESCRIPTION
+Adds the named gem to the Gemfile and run `bundle install`.
+
+Example:
+
+bundle add rails
+
+bundle add rails --version "< 3.0, > 1.1"
+
+bundle add rails --version "~> 5.0.0" --source "https://gems.example.com" --group "development"
+
+bundle add rails --group "development, test"
+
+## OPTIONS
+* `--version`, `-v`:
+  Specify version requirements(s) for the added gem.
+
+* `--group`, `-g`:
+  Specify the group(s) for the added gem. Multiple groups should be separated by commas.
+
+* `--source`, , `-s`:
+  Specify the source for the added gem.

data/man/bundle-pristine.ronn

@@ -0,0 +1,13 @@
+bundle-pristine(1) -- Restores installed gems to their pristine condition
+===========================================================================
+
+## SYNOPSIS
+
+`bundle pristine`
+
+## DESCRIPTION
+
+`pristine` restores the installed gems in the bundle to their pristine condition using the local gem
+cache from RubyGems. For git gems - a forced checkout will be performed.
+
+Note the Bundler gem cannot be restored to its original state with `pristine`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.15.0.pre.2
+  version: 1.15.0.pre.3
 platform: ruby
 authors:
 - André Arko
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek
@@ -357,6 +357,9 @@ files:
 - lib/bundler/vlad.rb
 - lib/bundler/worker.rb
 - lib/bundler/yaml_serializer.rb
+- man/bundle-add.1
+- man/bundle-add.1.txt
+- man/bundle-add.ronn
 - man/bundle-binstubs.1
 - man/bundle-binstubs.1.txt
 - man/bundle-binstubs.ronn
@@ -402,6 +405,9 @@ files:
 - man/bundle-platform.1
 - man/bundle-platform.1.txt
 - man/bundle-platform.ronn
+- man/bundle-pristine.1
+- man/bundle-pristine.1.txt
+- man/bundle-pristine.ronn
 - man/bundle-show.1
 - man/bundle-show.1.txt
 - man/bundle-show.ronn
@@ -422,7 +428,11 @@ files:
 homepage: http://bundler.io
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: http://github.com/bundler/bundler/issues
+  changelog_uri: https://github.com/bundler/bundler/blob/master/CHANGELOG.md
+  homepage_uri: https://bundler.io/
+  source_code_uri: http://github.com/bundler/bundler/
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -439,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies