bundler 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859744bca4fa4bf88cbe5c1935e4c54a151ceb2e
-  data.tar.gz: f597f3f62256ce30c585b68a2b3502102f2e5cb4
+  metadata.gz: 47d03cb52cb9c56cfb0a8e3ac50050a2dfe2e73e
+  data.tar.gz: 4a1e485a82e9703c83f4eec7fd8b11d36c0aaeef
 SHA512:
-  metadata.gz: 31d78a3839acbd4e47defaa27980522ead8a7a4ac3a85999542c2ae6f94259b210e5b8deb8dfce5523389a641b815f43848c27da3411b9d28abaa6c61e9dbf4e
-  data.tar.gz: 168d70e1e4f17069e568814fca58b96fb1479e69dd444ba83fed82ad176baaf7672f2ae674937538dc705f795420db0a835ae1bc3a5f62a97209584d70d2fa4a
+  metadata.gz: 04ff3dd741753285f4f95d1bc62830025f861176f922308b0fdaad31c13bc7661c34a4d3e225045ecafe7725ceaf6d666b16cf68af884b763eb0f70b374826e4
+  data.tar.gz: 7f4850dfe4fabc581ca1a5be0fad0caf357f48c8397a92f5aadcf5537e48ee322248d7c4021cc5cb92c1a124c2c84e1bb3c0f676834c73100ffde153a7c36745

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.6.3 (2014-06-16)
+
+Bugfixes:
+
+  - fix regression when resolving many conflicts (#2994, @Who828)
+  - use local gemspec for builtin gems during install --local (#3041, @Who828)
+  - don't warn about sudo when installing on Windows (#2984, @indirect)
+  - shell escape `bundle open` arguments (@indirect)
+
 ## 1.6.2 (2014-04-13)
 
 Bugfixes:

data/lib/bundler/cli/install.rb

@@ -116,7 +116,7 @@ module Bundler
   private
 
     def warn_if_root
-      return unless Process.uid.zero?
+      return if Bundler::WINDOWS || !Process.uid.zero?
       Bundler.ui.warn "Don't run Bundler as root. Bundler can ask for sudo " \
         "if it is needed, and installing your bundle as root will break this " \
         "application for all non-root users on this machine.", :wrap => true

data/lib/bundler/cli/open.rb

@@ -1,4 +1,5 @@
 require 'bundler/cli/common'
+require 'shellwords'
 
 module Bundler
   class CLI::Open
@@ -11,13 +12,10 @@ module Bundler
     def run
       editor = [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
       return Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") unless editor
-      spec = Bundler::CLI::Common.select_spec(name, :regex_match)
-      return unless spec
-      full_gem_path = spec.full_gem_path
-      Dir.chdir(full_gem_path) do
-        command = "#{editor} #{full_gem_path}"
-        success = system(command)
-        Bundler.ui.info "Could not run '#{command}'" unless success
+      path = Bundler::CLI::Common.select_spec(name, :regex_match).full_gem_path
+      Dir.chdir(path) do
+        command = Shellwords.split(editor) + [path]
+        system(*command) || Bundler.ui.info("Could not run '#{command.join(' ')}'")
       end
     end
 

data/lib/bundler/definition.rb

@@ -412,10 +412,8 @@ module Bundler
       locked = @locked_sources.find(&block)
 
       if locked
-        unlocking = locked.specs.any? do |spec|
-          @locked_specs.any? do |locked_spec|
-            locked_spec.source != locked
-          end
+        unlocking = @locked_specs.any? do |locked_spec|
+          locked_spec.source != locked
         end
       end
 
@@ -508,8 +506,9 @@ module Bundler
       # and Gemfile.lock. If the Gemfile modified a dependency, but
       # the gem in the Gemfile.lock still satisfies it, this is fine
       # too.
+      locked_deps_hash = @locked_deps.inject({}) { |hsh, dep| hsh[dep] = dep; hsh }
       @dependencies.each do |dep|
-        locked_dep = @locked_deps.find { |d| dep == d }
+        locked_dep = locked_deps_hash[dep]
 
         if in_locked_deps?(dep, locked_dep) || satisfies_locked_spec?(dep)
           deps << dep

data/lib/bundler/resolver.rb

@@ -136,7 +136,6 @@ module Bundler
 
     def initialize(index, source_requirements, base)
       @errors               = {}
-      @stack                = []
       @base                 = base
       @index                = index
       @deps_for             = {}
@@ -165,7 +164,7 @@ module Bundler
       resolve(reqs, activated)
     end
 
-    class State < Struct.new(:reqs, :activated, :requirement, :possibles, :depth)
+    class State < Struct.new(:reqs, :activated, :requirement, :possibles, :depth, :conflicts)
       def name
         requirement.name
       end
@@ -226,13 +225,13 @@ module Bundler
 
     def resolve_for_conflict(state)
       raise version_conflict if state.nil? || state.possibles.empty?
-      reqs, activated, depth = state.reqs.dup, state.activated.dup, state.depth
+      reqs, activated, depth, conflicts = state.reqs.dup, state.activated.dup, state.depth, state.conflicts.dup
       requirement = state.requirement
       possible = state.possibles.pop
 
       activate_gem(reqs, activated, possible, requirement)
 
-      return reqs, activated, depth
+      return reqs, activated, depth, conflicts
     end
 
     def resolve_conflict(current, states)
@@ -243,18 +242,19 @@ module Bundler
 
       # Resolve the conflicts by rewinding the state
       # when the conflicted gem was activated
-      reqs, activated, depth = resolve_for_conflict(state)
+      reqs, activated, depth, conflicts = resolve_for_conflict(state)
 
       # Keep the state around if it still has other possibilities
       states << state unless state.possibles.empty?
       clear_search_cache
 
-      return reqs, activated, depth
+      return reqs, activated, depth, conflicts
     end
 
     def resolve(reqs, activated)
       states = []
       depth = 0
+      conflicts = Set.new
 
       until reqs.empty?
 
@@ -307,6 +307,8 @@ module Bundler
             debug { "    * [FAIL] Already activated" }
             @errors[existing.name] = [existing, current]
 
+            conflicts << current.name
+
             parent = current.required_by.last
             if existing.respond_to?(:required_by)
               parent = handle_conflict(current, states, existing.required_by[-2]) unless other_possible?(parent, states)
@@ -314,10 +316,13 @@ module Bundler
               parent = handle_conflict(current, states) unless other_possible?(parent, states)
             end
 
-            raise version_conflict if parent.nil? || parent.name == 'bundler'
+            if parent.nil? && !conflicts.empty?
+              parent = states.reverse.detect { |i| conflicts.include?(i.name) && state_any?(i)}
+            end
 
+            raise version_conflict if parent.nil? || parent.name == 'bundler'
 
-            reqs, activated, depth = resolve_conflict(parent, states)
+            reqs, activated, depth, conflicts = resolve_conflict(parent, states)
           end
         else
           matching_versions = search(current)
@@ -359,7 +364,7 @@ module Bundler
             end
           end
 
-          state = State.new(reqs.dup, activated.dup, current, matching_versions, depth)
+          state = State.new(reqs.dup, activated.dup, current, matching_versions, depth, conflicts)
           states << state
           requirement = state.possibles.pop
           activate_gem(reqs, activated, requirement, current)

data/lib/bundler/source/rubygems.rb

@@ -126,8 +126,7 @@ module Bundler
 
       def cache(spec, custom_path = nil)
         if builtin_gem?(spec)
-          remote_spec = remote_specs.search(spec).first
-          cached_path = fetch_gem(remote_spec)
+          cached_path = cached_built_in_gem(spec)
         else
           cached_path = cached_gem(spec)
         end
@@ -137,6 +136,15 @@ module Bundler
         FileUtils.cp(cached_path, Bundler.app_cache(custom_path))
       end
 
+      def cached_built_in_gem(spec)
+        cached_path = cached_path(spec)
+        if cached_path.nil?
+          remote_spec = remote_specs.search(spec).first
+          cached_path = fetch_gem(remote_spec)
+        end
+        cached_path
+      end
+
       def add_remote(source)
         @remotes << normalize_uri(source)
       end
@@ -155,14 +163,18 @@ module Bundler
     private
 
       def cached_gem(spec)
-        possibilities = @caches.map { |p| "#{p}/#{spec.file_name}" }
-        cached_gem = possibilities.find { |p| File.exist?(p) }
+        cached_gem = cached_path(spec)
         unless cached_gem
           raise Bundler::GemNotFound, "Could not find #{spec.file_name} for installation"
         end
         cached_gem
       end
 
+      def cached_path(spec)
+        possibilities = @caches.map { |p| "#{p}/#{spec.file_name}" }
+        possibilities.find { |p| File.exist?(p) }
+      end
+
       def normalize_uri(uri)
         uri = uri.to_s
         uri = "#{uri}/" unless uri =~ %r'/$'

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.6.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.3" unless defined?(::Bundler::VERSION)
 end

data/spec/cache/gems_spec.rb

@@ -103,6 +103,20 @@ describe "bundle cache" do
       expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
       expect(bundled_app("vendor/cache/builtin_gem-1.0.2.gem")).to exist
     end
+
+    it "doesn't make remote request after caching the gem" do
+      build_gem "builtin_gem_2", "1.0.2", :path => bundled_app('vendor/cache') do |s|
+        s.summary = "This builtin_gem is bundled with Ruby"
+      end
+
+      install_gemfile <<-G
+        source "file://#{gem_repo2}"
+        gem 'builtin_gem_2', '1.0.2'
+      G
+
+      bundle "install --local"
+      should_be_installed("builtin_gem_2 1.0.2")
+    end
   end
 
   describe "when there are also git sources" do

data/spec/spec_helper.rb

@@ -1,12 +1,13 @@
 $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
-require 'rspec'
-require 'bundler/psyched_yaml'
+# stdlib first
+require 'uri'
+require 'digest/sha1'
 require 'fileutils'
+require 'bundler/psyched_yaml'
 require 'rubygems'
+require 'rspec'
 require 'bundler'
-require 'uri'
-require 'digest/sha1'
 
 # Require the correct version of popen for the current platform
 if RbConfig::CONFIG['host_os'] =~ /mingw|mswin/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn