bundler 1.7.13 → 1.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52077386a3541d9c2aee5208c378887d8ed4e4fe
-  data.tar.gz: 5688627918ab06e42226e70e7759ce4adc50f55b
+  metadata.gz: 746df673800f5d41fe2d1291b907039aba505909
+  data.tar.gz: 85c28b901946ef92a7ffbf9ead8fad33974d563f
 SHA512:
-  metadata.gz: 49a73d3536173e9ec53b420df33f946863978625ecf8ce635af8ec55cf6c03428e3d4243a876b6a03531f0e11fb0884204bf415c57063b8e6fdf3c571406ba15
-  data.tar.gz: 3ec463bd63a4deb40f6a0b30e26c38d4e12878710ec010a6df4d47d8f25b9685483ad27931deeaaa5addc53b9a21a4eae3dc2fef9abad70c59df22ff4812679d
+  metadata.gz: f72f1fd05fb6525b87302286252357f7f48cab2f59d30a65fb85ad366ea869f752937077165a78e7bdd1b9461cd9bc7323d9bff45f1fe78f014dd5d4b6675e72
+  data.tar.gz: e3e476266759921138364b64d9f7b2e096b5d87ea8329c15c166c1192c96ee34450dd78817847c9dd19e649f92ac6ffe3af894cdd3004aefd3e00929e1336b64

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.7.14 (2015-03-30)
+
+Bugfixes:
+
+  - Keep gems locked when updating another gem from the same source (#3250, @indirect)
+  - Don't add extra quotes around long, quoted config values (@aroben, #3338)
+
 ## 1.7.13 (2015-02-07)
 
 Bugfixes:

data/lib/bundler/definition.rb

@@ -276,7 +276,7 @@ module Bundler
           each do |spec|
             next if spec.name == 'bundler'
             out << spec.to_lock
-        end
+          end
         out << "\n"
       end
 
@@ -558,8 +558,11 @@ module Bundler
       resolve
     end
 
-    def in_locked_deps?(dep, d)
-      d && dep.source == d.source
+    def in_locked_deps?(dep, locked_dep)
+      # Because the lockfile can't link a dep to a specific remote, we need to
+      # treat sources as equivalent anytime the locked dep has all the remotes
+      # that the Gemfile dep does.
+      locked_dep && locked_dep.source && dep.source && locked_dep.source.include?(dep.source)
     end
 
     def satisfies_locked_spec?(dep)

data/lib/bundler/settings.rb

@@ -155,9 +155,10 @@ module Bundler
     def load_config(config_file)
       valid_file = config_file && config_file.exist? && !config_file.size.zero?
       if !ignore_config? && valid_file
-        config_regex = /^(BUNDLE_.+): (?:['"](.*)['"]|(.+(?:\n(?!BUNDLE).+))|(.+))$/
+        config_regex = /^(BUNDLE_.+): (['"]?)(.*(?:\n(?!BUNDLE).+)?)\2$/
         config_pairs = config_file.read.scan(config_regex).map do |m|
-          m.compact.map { |n| n.gsub(/\s+/, " ").tr('"', "'") }
+          key, _, value = m
+          [key, value.gsub(/\s+/, " ").tr('"', "'")]
         end
         Hash[config_pairs]
       else

data/lib/bundler/source.rb

@@ -33,5 +33,10 @@ module Bundler
     def can_lock?(spec)
       spec.source == self
     end
+
+    def include?(other)
+      other == self
+    end
+
   end
 end

data/lib/bundler/source/rubygems.rb

@@ -34,11 +34,15 @@ module Bundler
       end
 
       def eql?(o)
-        o.is_a?(Rubygems) && remotes_equal?(o.remotes)
+        o.is_a?(Rubygems) && o.credless_remotes == credless_remotes
       end
 
       alias == eql?
 
+      def include?(o)
+        o.is_a?(Rubygems) && (o.credless_remotes - credless_remotes).empty?
+      end
+
       def can_lock?(spec)
         spec.source.is_a?(Rubygems)
       end
@@ -186,6 +190,12 @@ module Bundler
         end
       end
 
+    protected
+
+      def credless_remotes
+        remotes.map(&method(:suppress_configured_credentials))
+      end
+
     private
 
       def source_uris_for_spec(spec)
@@ -356,10 +366,6 @@ module Bundler
         spec.loaded_from && spec.loaded_from.include?("specifications/default/")
       end
 
-      def remotes_equal?(other_remotes)
-        remotes.map(&method(:suppress_configured_credentials)) == other_remotes.map(&method(:suppress_configured_credentials))
-      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.7.13" unless defined?(::Bundler::VERSION)
+  VERSION = "1.7.14" unless defined?(::Bundler::VERSION)
 end

data/spec/bundler/bundler_spec.rb

@@ -17,13 +17,11 @@ describe Bundler do
         end
       end
 
-      context "on Ruby 1.8", :ruby => "1.8" do
-        it "catches YAML syntax errors" do
-          expect { subject }.to raise_error(Bundler::GemspecError)
-        end
+      it "catches YAML syntax errors" do
+        expect { subject }.to raise_error(Bundler::GemspecError)
       end
 
-      context "on Ruby 1.9", :ruby => "1.9" do
+      context "on Rubies with a settable YAML engine", :if => defined?(YAML::ENGINE) do
         context "with Syck as YAML::Engine" do
           it "raises a GemspecError after YAML load throws ArgumentError" do
             orig_yamler, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'syck'

data/spec/bundler/gem_helper_spec.rb

@@ -8,6 +8,7 @@ describe Bundler::GemHelper do
   let(:app_gemspec_path) { app_path.join("#{app_name}.gemspec") }
 
   before(:each) do
+    global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false"
     bundle "gem #{app_name}"
   end
 

data/spec/commands/config_spec.rb

@@ -215,14 +215,27 @@ E
       File.open(bundled_app(".bundle/config"), 'w') do |f|
         f.write 'BUNDLE_FOO: "$BUILD_DIR"'
       end
-      expect(bundled_app(".bundle/config").read).to eq('BUNDLE_FOO: "$BUILD_DIR"')
-      bundle :install, :jobs => 4
+
+      bundle "config bar baz"
       run "puts Bundler.settings.send(:local_config_file).read"
 
       # Starting in Ruby 2.1, YAML automatically adds double quotes
       # around some values, including $ and newlines.
       expect(out).to include('BUNDLE_FOO: "$BUILD_DIR"')
     end
+
+    it "doesn't duplicate quotes around long wrapped values" do
+      long_string = "--with-xml2-include=/usr/pkg/include/libxml2 --with-xml2-lib=/usr/pkg/lib --with-xslt-dir=/usr/pkg"
+      bundle "config foo #{long_string}"
+
+      run "puts Bundler.settings[:foo]"
+      expect(out).to eq(long_string)
+
+      bundle "config bar baz"
+
+      run "puts Bundler.settings[:foo]"
+      expect(out).to eq(long_string)
+    end
   end
 
   describe "very long lines" do
@@ -230,12 +243,21 @@ E
     let(:long_string) do
       "--with-xml2-include=/usr/pkg/include/libxml2 --with-xml2-lib=/usr/pkg/lib --with-xslt-dir=/usr/pkg"
     end
+    let(:long_string_without_special_characters) do
+      "here is quite a long string that will wrap to a second line but will not be surrounded by quotes"
+    end
 
     it "doesn't wrap values" do
       bundle "config foo #{long_string}"
       run "puts Bundler.settings[:foo]"
       expect(out).to match(long_string)
     end
+
+    it "can read wrapped unquoted values" do
+      bundle "config foo #{long_string_without_special_characters}"
+      run "puts Bundler.settings[:foo]"
+      expect(out).to match(long_string_without_special_characters)
+    end
   end
 
 end

data/spec/commands/newgem_spec.rb

@@ -1,6 +1,11 @@
 require "spec_helper"
 
 describe "bundle gem" do
+  def reset!
+    super
+    global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false", "BUNDLE_GEM__COC" => "false"
+  end
+
   before do
     @git_name = `git config --global user.name`.chomp
     `git config --global user.name "Bundler User"`

data/spec/install/gems/sources_spec.rb

@@ -289,4 +289,64 @@ describe "bundle install with gems on multiple sources" do
       should_be_installed("rack 1.0.0")
     end
   end
+
+  context "when a single source contains multiple locked gems" do
+    before do
+      # 1. With these gems,
+      build_repo4 do
+        build_gem "foo", "0.1"
+        build_gem "bar", "0.1"
+      end
+
+      # 2. Installing this gemfile will produce...
+      gemfile <<-G
+        source 'file://#{gem_repo1}'
+        gem 'rack'
+        gem 'foo', '~> 0.1', :source => 'file://#{gem_repo4}'
+        gem 'bar', '~> 0.1', :source => 'file://#{gem_repo4}'
+      G
+
+      # 3. this lockfile.
+      lockfile <<-L
+        GEM
+          remote: file:/Users/andre/src/bundler/bundler/tmp/gems/remote1/
+          remote: file:/Users/andre/src/bundler/bundler/tmp/gems/remote4/
+          specs:
+            bar (0.1)
+            foo (0.1)
+            rack (1.0.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          bar (~> 0.1)!
+          foo (~> 0.1)!
+          rack
+      L
+
+      bundle "install --path ../gems/system"
+
+      # 4. Then we add some new versions...
+      update_repo4 do
+        build_gem "foo", "0.2"
+        build_gem "bar", "0.3"
+      end
+    end
+
+    it "allows them to be unlocked separately" do
+      # 5. and install this gemfile, updating only foo.
+      install_gemfile <<-G
+        source 'file://#{gem_repo1}'
+        gem 'rack'
+        gem 'foo', '~> 0.2', :source => 'file://#{gem_repo4}'
+        gem 'bar', '~> 0.1', :source => 'file://#{gem_repo4}'
+      G
+
+      # 6. Which should update foo to 0.2, but not the (locked) bar 0.1
+      should_be_installed("foo 0.2")
+      should_be_installed("bar 0.1")
+    end
+  end
+
 end

data/spec/support/builders.rb

@@ -260,12 +260,15 @@ module Spec
       FileUtils.rm_rf Dir[gem_repo3("prerelease*")]
     end
 
-    # A repo that has no pre-installed gems included.  (The caller completely determines the contents with the block)
-    def build_repo4(&blk)
+    # A repo that has no pre-installed gems included. (The caller completely
+    # determines the contents with the block.)
+    def build_repo4
       FileUtils.rm_rf gem_repo4
-      build_repo(gem_repo4) do
-        yield if block_given?
-      end
+      build_repo(gem_repo4) { yield }
+    end
+
+    def update_repo4
+      update_repo(gem_repo4) { yield }
     end
 
     def update_repo2

data/spec/support/helpers.rb

@@ -153,8 +153,7 @@ module Spec
       @exitstatus = $?.exitstatus
     end
 
-    def config(config = nil)
-      path = bundled_app('.bundle/config')
+    def config(config = nil, path = bundled_app('.bundle/config'))
       return YAML.load_file(path) unless config
       FileUtils.mkdir_p(File.dirname(path))
       File.open(path, 'w') do |f|
@@ -163,20 +162,23 @@ module Spec
       config
     end
 
+    def global_config(config = nil)
+      config(config, home(".bundle/config"))
+    end
+
     def gemfile(*args)
-      path = bundled_app("Gemfile")
-      path = args.shift if args.first.is_a?(Pathname)
-      str  = args.shift || ""
-      path.dirname.mkpath
-      File.open(path.to_s, 'w') do |f|
-        f.puts strip_whitespace(str)
-      end
+      create_file("Gemfile", *args)
     end
 
     def lockfile(*args)
-      path = bundled_app("Gemfile.lock")
+      create_file("Gemfile.lock", *args)
+    end
+
+    def create_file(*args)
+      path = bundled_app(args.shift)
       path = args.shift if args.first.is_a?(Pathname)
       str  = args.shift || ""
+      path.dirname.mkpath
       File.open(path.to_s, 'w') do |f|
         f.puts strip_whitespace(str)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.7.13
+  version: 1.7.14
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache