bundler 1.10.4 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96e28345d9c519a160bdabca5ae4746d05a1bc4a
-  data.tar.gz: bb30271388491a82103e07acb7d5e00084b6cfd7
+  metadata.gz: 2462b2530c9588977f9eca5df458b9f9cd50f5cf
+  data.tar.gz: 3e4c22647357a52bdcea5edcdc4b66af60ab1c1d
 SHA512:
-  metadata.gz: 6e5829c1f677281766f56a786ca7e2ba4dedc3aebed23d74e447a762599d77a738dbb1fbad49334d84682cc6ce566e215f7dc62d3377b825c60c9c2f7aad283d
-  data.tar.gz: 2743f91766b319a5192e0a12aedb5e4ea24d7f412ffdb16feff1a43e3ae7b5db02ec3fe81de4aa7576707d170c36d138362fbd9125ebd5507ab6810ebc62c1ac
+  metadata.gz: 0a871b02641e097cb07274f6944e9391950c14e4ac859ac7fe739f75786e37364f851b9b4fab058659bf504918438ff1343207d12f5a7f6bbdb32107404dcce8
+  data.tar.gz: a1ea05745751c4f07e5a33bf17ac507a2c4c706c23d3304791ed2618afc1456b85571d2370c67fa4fa2f93c76a35c1ceffaae6154528682435cbd5db4181099a

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.10.5 (2015-06-24)
+
+Workarounds:
+
+  - don't add or update BUNDLED WITH during `install` with no changes (@segiddins)
+
+Bugfixes:
+
+  - fix sorting of mixed DependencyLists with RubyGems >= 2.23 (#3762, @tony-spataro-rs)
+  - speed up resolver for path and git gems (@segiddins)
+  - fix `install --force` to not reinstall Bundler (#3743, @karlo57)
+
 ## 1.10.4 (2015-06-16)
 
 Workarounds:

data/README.md

@@ -14,9 +14,9 @@ It does this by managing the gems that the application depends on. Given a list
 ```
 gem install bundler
 bundle init
-echo "gem 'rails'" >> Gemfile
+echo 'gem "rspec"' >> Gemfile
 bundle install
-bundle exec rails new myapp
+bundle exec rspec
 ```
 
 See [bundler.io](http://bundler.io) for the full documentation.
@@ -34,3 +34,7 @@ Feel free to chat with the Bundler core team (and many other users) on IRC in th
 ### Contributing
 
 If you'd like to contribute to Bundler, that's awesome, and we <3 you. There's a guide to contributing to Bundler (both code and general help) over in [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md)
+
+### Code of Conduct
+
+Everyone interacting in the Bundler project’s codebases, issue trackers, chat rooms, and mailing lists is expected to follow the [Bundler code of conduct](https://github.com/bundler/bundler/blob/master/CODE_OF_CONDUCT.md).

data/lib/bundler/definition.rb

@@ -248,23 +248,24 @@ module Bundler
       # i.e., Windows with `git config core.autocrlf=true`
       contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match("\r\n")
 
-      return if lockfiles_equal?(@lockfile_contents, contents, preserve_bundled_with)
-
-      if Bundler.settings[:frozen]
-        Bundler.ui.error "Cannot write a changed lockfile while frozen."
-        return
-      end
-
       if @locked_bundler_version
         locked_major = @locked_bundler_version.segments.first
         current_major = Gem::Version.create(Bundler::VERSION).segments.first
 
-        if locked_major < current_major
-          Bundler.ui.warn "Warning: the lockfile is being updated to Bundler #{Bundler::VERSION.split('.').first}, " \
+        if updating_major = locked_major < current_major
+          Bundler.ui.warn "Warning: the lockfile is being updated to Bundler #{current_major}, " \
                           "after which you will be unable to return to Bundler #{@locked_bundler_version.segments.first}."
         end
       end
 
+      preserve_bundled_with ||= !updating_major && (Bundler.settings[:frozen] || !@unlocking)
+      return if lockfiles_equal?(@lockfile_contents, contents, preserve_bundled_with)
+
+      if Bundler.settings[:frozen]
+        Bundler.ui.error "Cannot write a changed lockfile while frozen."
+        return
+      end
+
       File.open(file, 'wb'){|f| f.puts(contents) }
     rescue Errno::EACCES
       raise Bundler::InstallError,

data/lib/bundler/remote_specification.rb

@@ -8,6 +8,7 @@ module Bundler
   # full specification will only be fetched when necessary.
   class RemoteSpecification
     include MatchPlatform
+    include Comparable
 
     attr_reader :name, :version, :platform
     attr_accessor :source, :remote
@@ -33,17 +34,41 @@ module Bundler
       end
     end
 
+    # Compare this specification against another object. Using sort_obj
+    # is compatible with Gem::Specification and other Bundler or RubyGems
+    # objects. Otherwise, use the default Object comparison.
+    def <=>(other)
+      if other.respond_to?(:sort_obj)
+        sort_obj <=> other.sort_obj
+      else
+        super
+      end
+    end
+
     # Because Rubyforge cannot be trusted to provide valid specifications
     # once the remote gem is downloaded, the backend specification will
     # be swapped out.
     def __swap__(spec)
-      @specification = spec
+      @_remote_specification = spec
     end
 
   private
 
+    # Create a delegate used for sorting. This strategy is copied from
+    # RubyGems 2.23 and ensures that Bundler's specifications can be
+    # compared and sorted with RubyGems' own specifications.
+    #
+    # @see #<=>
+    # @see Gem::Specification#sort_obj
+    #
+    # @return [Array] an object you can use to compare and sort this
+    #   specification against other specifications
+    def sort_obj
+      [@name, @version, @platform == Gem::Platform::RUBY ? -1 : 1]
+    end
+
     def _remote_specification
-      @specification ||= @spec_fetcher.fetch_spec([@name, @version, @platform])
+      @_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @platform])
     end
 
     def method_missing(method, *args, &blk)

data/lib/bundler/resolver.rb

@@ -309,11 +309,13 @@ module Bundler
           dependency.requirement.satisfied_by?(base.first.version) ? 0 : 1
         else
           base_dep = Dependency.new dependency.name, '>= 0.a'
-          all = search_for(DepProxy.new base_dep, dependency.__platform)
-          if all.size == 0
+          all = search_for(DepProxy.new base_dep, dependency.__platform).size.to_f
+          if all.zero?
+            0
+          elsif (search = search_for(dependency).size.to_f) == all && all == 1
             0
           else
-            search_for(dependency).size.to_f / all.size.to_f
+            search / all
           end
         end
       end

data/lib/bundler/source/rubygems.rb

@@ -98,7 +98,7 @@ module Bundler
           end
         end
 
-        if installed_specs[spec].any? && !force
+        if installed?(spec) && (!force || spec.name.eql?("bundler"))
           Bundler.ui.info "Using #{version_message(spec)}"
           return nil # no post-install message
         end
@@ -413,6 +413,10 @@ module Bundler
         spec.loaded_from && spec.loaded_from.include?("specifications/default/")
       end
 
+      def installed?(spec)
+        installed_specs[spec].any?
+      end
+
     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.4" unless defined?(::Bundler::VERSION)
+  VERSION = "1.10.5" unless defined?(::Bundler::VERSION)
 end

data/man/gemfile.5.ronn

@@ -443,6 +443,16 @@ In the case of the `git` block form, the `:ref`, `:branch`, `:tag`,
 and `:submodules` options may be passed to the `git` method, and
 all gems in the block will inherit those options.
 
+## INSTALL_IF (#install_if)
+
+The `install_if` method allows gems to be installed based on a proc or lambda.
+This is especially useful for optional gems that can only be used if certain
+software is installed or some other conditions are met.
+
+    install_if -> { RUBY_PLATFORM =~ /darwin/ } do
+      gem "pasteboard"
+    end
+
 ## GEMSPEC (#gemspec)
 
 If you wish to use Bundler to help install dependencies for a gem while it is

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.10.5
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache