bundler 1.10.2 → 1.10.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjNkYWY4MzNjOGQxZjE5ODZmZjk4ODcyNDAxNGZkMDMzZTI3ODEzYg==
-  data.tar.gz: !binary |-
-    OTA4YjBmMTFhZjM0ZDhmMjY0NGY1M2I5Mjc0MTY3MzIxNTZiYjc2ZA==
+SHA1:
+  metadata.gz: d16968eae1c5a56edc60ec57ec834ffdfb9af52e
+  data.tar.gz: 2d179b57f5b43cd083a0660b85b84a2eccd322b0
 SHA512:
-  metadata.gz: !binary |-
-    NDhkZmM0MTA0NDZlMjg4YTViY2Q4MTUxOTIxOTJhMWJmYmVmYjNiMmJmNDNl
-    OTEyNzk2YzUwM2ViN2JhNTU5N2FhZDBmYmM1ZjQxMDI1N2YxODdiODA4N2Uy
-    NmI5MDczN2FkMjM5ZjBlMzgxZDVhOWE2M2E1Y2YwMTNhZTU5YWQ=
-  data.tar.gz: !binary |-
-    ZjcwNTM2MWQwNzIwMGEzYmM2MTI5MWU0MmI1ZjVkZjAwN2VjYzYwMGJiNDU4
-    MjdkYTUyMWY4MGIzOTYxYTk2OGM0ZTBlZTcyOWJiYzQ4YzU1YTEzNzM2NTRm
-    MDE2ZGExMDY0MWY1ZWYxYmMxNWM3MGI2NTYxNzkxOTgzNDliMTY=
+  metadata.gz: 8c648e2a488da6ad4a30adf96d0f07834c20a5a4e971e3182c220fff3ae780236a43a5a0ef382e73680a56725e20fda88a964eb5772e788e578481246395cbf0
+  data.tar.gz: 5ece721abfc3d426cf737e57d480a32b6ecd4a6fe052eb6f8142078d2612b578c4ba8908a5fab3065d1954086f9544f8a882c45bbd85b2ab33ec9b18e6a78839

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.10.3 (2015-06-03)
+
+Bugfixes:
+
+  - allow missing gemspec files when validating path and git gems (#3686, #3698, @segiddins)
+  - fix regression in `rake install` (#3701, #3705, @segiddins)
+  - fix regression when calling `gem` with `bundle exec` or `-rbundler/setup` (#3699, @segiddins)
+  - fix `bundler/inline` requiring a newly-installed gem (#3693, @indirect, @segiddins)
+
 ## 1.10.2 (2015-05-29)
 
 Bugfixes:

data/lib/bundler.rb

@@ -40,6 +40,7 @@ module Bundler
   autoload :Settings,              'bundler/settings'
   autoload :SharedHelpers,         'bundler/shared_helpers'
   autoload :SpecSet,               'bundler/spec_set'
+  autoload :StubSpecification,     'bundler/stub_specification'
   autoload :Source,                'bundler/source'
   autoload :SourceList,            'bundler/source_list'
   autoload :Specification,         'bundler/shared_helpers'
@@ -96,7 +97,7 @@ module Bundler
     end
 
     def ui=(ui)
-      Bundler.rubygems.ui = UI::RGProxy.new(ui)
+      Bundler.rubygems.ui = ui ? UI::RGProxy.new(ui) : nil
       @ui = ui
     end
 

data/lib/bundler/cli/exec.rb

@@ -15,27 +15,33 @@ module Bundler
     end
 
     def run
+      ui = Bundler.ui
       raise ArgumentError if cmd.nil?
 
       # First, try to exec directly to something in PATH
       SharedHelpers.set_bundle_environment
       bin_path = Bundler.which(@cmd)
       if bin_path
+        Bundler.ui = nil
         Kernel.exec(bin_path, *args)
       end
 
       # If that didn't work, set up the whole bundle
       Bundler.definition.validate_ruby!
       Bundler.load.setup_environment
+      Bundler.ui = nil
       Kernel.exec(@cmd, *args)
     rescue Errno::EACCES
+      Bundler.ui = ui
       Bundler.ui.error "bundler: not executable: #{cmd}"
       exit 126
     rescue Errno::ENOENT
+      Bundler.ui = ui
       Bundler.ui.error "bundler: command not found: #{cmd}"
       Bundler.ui.warn  "Install missing gem executables with `bundle install`"
       exit 127
     rescue ArgumentError
+      Bundler.ui = ui
       Bundler.ui.error "bundler: exec needs a command to run"
       exit 128
     end

data/lib/bundler/dsl.rb

@@ -422,8 +422,8 @@ module Bundler
       #
       # @return [String] the message of the exception.
       #
-      def message
-        @message ||= begin
+      def to_s
+        @to_s ||= begin
           trace_line, description = parse_line_number_from_description
 
           m = "\n[!] "

data/lib/bundler/endpoint_specification.rb

@@ -29,6 +29,16 @@ module Bundler
       end
     end
 
+    # needed for inline
+    def load_paths
+      # remote specs aren't installed, and can't have load_paths
+      if _local_specification
+        _local_specification.load_paths
+      else
+        super
+      end
+    end
+
     # needed for binstubs
     def executables
       if @remote_specification
@@ -61,14 +71,19 @@ module Bundler
     end
 
     def _local_specification
-      eval(File.read(local_specification_path)) if @loaded_from && File.exist?(local_specification_path)
+      if @loaded_from && File.exist?(local_specification_path)
+        eval(File.read(local_specification_path)).tap do |spec|
+          spec.loaded_from = @loaded_from
+        end
+      end
     end
 
     def __swap__(spec)
       @remote_specification = spec
     end
 
-    private
+  private
+
     def local_specification_path
       "#{base_dir}/specifications/#{full_name}.gemspec"
     end

data/lib/bundler/inline.rb

@@ -51,7 +51,6 @@ def gemfile(install = false, &gemfile)
   end
 
   runtime = Bundler::Runtime.new(nil, definition)
-  runtime.setup_environment
   runtime.setup.require
 
   bundler_module = class << Bundler; self; end

data/lib/bundler/remote_specification.rb

@@ -54,24 +54,4 @@ module Bundler
       end
     end
   end
-
-  class StubSpecification < RemoteSpecification
-    def self.from_stub(stub)
-      spec = new(stub.name, stub.version, stub.platform, nil)
-      spec.stub = stub
-      spec
-    end
-
-    attr_accessor :stub
-
-    def to_yaml
-      _remote_specification.to_yaml
-    end
-
-    private
-
-    def _remote_specification
-      stub.to_spec
-    end
-  end
 end

data/lib/bundler/rubygems_integration.rb

@@ -49,6 +49,8 @@ module Bundler
 
     def validate(spec)
       Bundler.ui.silence { spec.validate(false) }
+    rescue Errno::ENOENT
+      nil
     end
 
     def path(obj)
@@ -462,10 +464,9 @@ module Bundler
       end
 
       def validate(spec)
-        # Missing summary is downgraded to a warning in later versions,
-        # so we set it to an empty string to prevent an exception here.
-        spec.summary ||= ""
-        Bundler.ui.silence { spec.validate }
+        # These versions of RubyGems always validate in "packaging" mode,
+        # which is too strict for the kinds of checks we care about. As a
+        # result, validation is disabled on versions of RubyGems below 1.7.
       end
     end
 
@@ -488,6 +489,8 @@ module Bundler
         # so we set it to an empty string to prevent an exception here.
         spec.summary ||= ""
         Bundler.ui.silence { spec.validate(false) }
+      rescue Errno::ENOENT
+        nil
       end
     end
 

data/lib/bundler/setup.rb

@@ -21,4 +21,6 @@ if Bundler::SharedHelpers.in_bundle?
   # Add bundler to the load path after disabling system gems
   bundler_lib = File.expand_path("../..", __FILE__)
   $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
+
+  Bundler.ui = nil
 end

data/lib/bundler/stub_specification.rb

@@ -0,0 +1,23 @@
+require 'bundler/remote_specification'
+
+module Bundler
+  class StubSpecification < RemoteSpecification
+    def self.from_stub(stub)
+      spec = new(stub.name, stub.version, stub.platform, nil)
+      spec.stub = stub
+      spec
+    end
+
+    attr_accessor :stub
+
+    def to_yaml
+      _remote_specification.to_yaml
+    end
+
+  private
+
+    def _remote_specification
+      stub.to_spec
+    end
+  end
+end

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ 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.10.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.10.3" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -31,56 +31,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Bundler manages an application's dependencies through its entire life,
@@ -93,9 +93,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -208,6 +208,7 @@ files:
 - lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
 - lib/bundler/ssl_certs/GeoTrustGlobalCA.pem
 - lib/bundler/ssl_certs/certificate_manager.rb
+- lib/bundler/stub_specification.rb
 - lib/bundler/templates/Executable
 - lib/bundler/templates/Executable.standalone
 - lib/bundler/templates/Gemfile
@@ -305,12 +306,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
@@ -320,3 +321,4 @@ signing_key:
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
+has_rdoc: