bundler 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced74899cff274adbec06e5601be3abc4c20c45c
-  data.tar.gz: aad3f866ca2062e2cacf71949d1d72bddc496a5d
+  metadata.gz: a89eb823ec7cbdb414f00ff9332326cfc87dee65
+  data.tar.gz: 547184539810c8c7c3ff1bfb5f7863c7408360e1
 SHA512:
-  metadata.gz: 5732a5f69f62662e3f47c51a2e31858a478202e6ed49eb4d5b2f1eefc6eddc452f6924a755efba2d61b348fd0ccd8d4b8a4c84ac5e6587475aaa7757c3e99d99
-  data.tar.gz: 5a1d0fbd3f34682bf03a340e40db6f8a547634b24a4c8c845921ef9bb6fabc222ab3d12f2606cf15b7b155c6fa3ede6e1e2abe3b2f0ac5e85bb3f916b93938e8
+  metadata.gz: d8c4602184d1fae30a6feb1cd9b798737ef3d1dc03bdc42d917283232c3527d4f16242af034ace71a701973acc77c207ae7b12c6e0ae40893e795b299b85cc9b
+  data.tar.gz: a5246b6165e3463a9e38edb0fd7cf8c28db10c97a60f5e8c7a668d0336dd8b28e2bbf79b9d92b36e8d505130b2d8170f8b19f5db8e084c01c3010403b1c8c821

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.7.7 (2014-11-19)
+
+Bugfixes:
+
+  - Ensure server credentials stored in config or ENV will be used (#3180, @arronmabrey)
+  - Fix race condition causing errors while installing git-based gems (#3174, @Who828)
+  - Use single quotes in config so YAML won't add more quotes (#3261, @indirect)
+
 ## 1.7.6 (2014-11-11)
 
 Bugfixes:

data/lib/bundler.rb

@@ -210,11 +210,10 @@ module Bundler
     end
 
     def settings
-      @settings ||= begin
-        Settings.new(app_config_path)
-      rescue GemfileNotFound
-        Settings.new
-      end
+      return @settings if defined?(@settings)
+      @settings = Settings.new(app_config_path)
+    rescue GemfileNotFound
+      @settings = Settings.new
     end
 
     def with_original_env

data/lib/bundler/fetcher.rb

@@ -277,7 +277,7 @@ module Bundler
         response.body
       when Net::HTTPRequestEntityTooLarge
         raise FallbackError, response.body
-      when Net::HTTPUnauthorized
+      when Net::HTTPUnauthorized, Net::HTTPForbidden
         raise AuthenticationRequiredError, "#{response.class}: #{response.body}"
       else
         raise HTTPError, "#{response.class}: #{response.body}"

data/lib/bundler/rubygems_integration.rb

@@ -193,7 +193,7 @@ module Bundler
     end
 
     def build_gem(gem_dir, spec)
-      SharedHelpers.chdir(gem_dir) { build(spec) }
+       build(spec)
     end
 
     def download_gem(spec, uri, path)

data/lib/bundler/settings.rb

@@ -139,6 +139,7 @@ module Bundler
         require 'bundler/psyched_yaml'
         File.open(file, "w") { |f| f.puts YAML.dump(hash) }
       end
+
       value
     end
 
@@ -154,8 +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_pairs = config_file.read.scan(config_regex).map{|m| m.compact.map { |n| n.gsub(/\n\s?/, "") } }
+        config_regex = /^(BUNDLE_.+): (?:['"](.*)['"]|(.+(?:\n(?!BUNDLE).+))|(.+))$/
+        config_pairs = config_file.read.scan(config_regex).map do |m|
+          m.compact.map { |n| n.gsub(/\s+/, " ").tr('"', "'") }
+        end
         Hash[config_pairs]
       else
         {}

data/lib/bundler/shared_helpers.rb

@@ -1,3 +1,4 @@
+require 'monitor'
 require 'pathname'
 require 'rubygems'
 
@@ -18,6 +19,7 @@ end
 module Bundler
   module SharedHelpers
     attr_accessor :gem_loaded
+    CHDIR_MONITOR = Monitor.new
 
     def default_gemfile
       gemfile = find_gemfile
@@ -33,26 +35,18 @@ module Bundler
       find_gemfile
     end
 
-    if Bundler.current_ruby.mswin? || Bundler.current_ruby.jruby?
-      require 'monitor'
-      @chdir_monitor = Monitor.new
-      def chdir(dir, &blk)
-        @chdir_monitor.synchronize do
-          Dir.chdir dir, &blk
-        end
-      end
+    def chdir_monitor
+      CHDIR_MONITOR
+    end
 
-      def pwd
-        @chdir_monitor.synchronize do
-          Dir.pwd
-        end
-      end
-    else
-      def chdir(dir, &blk)
+    def chdir(dir, &blk)
+      chdir_monitor.synchronize do
         Dir.chdir dir, &blk
       end
+    end
 
-      def pwd
+    def pwd
+      chdir_monitor.synchronize do
         Dir.pwd
       end
     end

data/lib/bundler/source/git.rb

@@ -216,7 +216,7 @@ module Bundler
         @allow_remote || @allow_cached
       end
 
-    private
+      private
 
       def serialize_gemspecs_in(destination)
         expanded_path = destination.expand_path(Bundler.root)

data/lib/bundler/source/path.rb

@@ -169,6 +169,7 @@ module Bundler
 
       def generate_bin(spec, disable_extensions = false)
         gem_dir  = Pathname.new(spec.full_gem_path)
+        gem_file = nil
 
         # Some gem authors put absolute paths in their gemspec
         # and we have to save them from themselves
@@ -181,14 +182,16 @@ module Bundler
           end
         end.compact
 
-        gem_file = Bundler.rubygems.build_gem gem_dir, spec
+        SharedHelpers.chdir(gem_dir) do
+          gem_file = Bundler.rubygems.build_gem gem_dir, spec
 
-        installer = Path::Installer.new(spec, :env_shebang => false)
-        run_hooks(:pre_install, installer)
-        installer.build_extensions unless disable_extensions
-        run_hooks(:post_build, installer)
-        installer.generate_bin
-        run_hooks(:post_install, installer)
+          installer = Path::Installer.new(spec, :env_shebang => false)
+          run_hooks(:pre_install, installer)
+          installer.build_extensions unless disable_extensions
+          run_hooks(:post_build, installer)
+          installer.generate_bin
+          run_hooks(:post_install, installer)
+        end
       rescue Gem::InvalidSpecificationException => e
         Bundler.ui.warn "\n#{spec.name} at #{spec.full_gem_path} did not have a valid gemspec.\n" \
                         "This prevents bundler from installing bins or native extensions, but " \

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

data/spec/commands/config_spec.rb

@@ -194,7 +194,7 @@ E
   end
 
   describe "quoting" do
-    before(:each) { bundle :install }
+    before(:each) { gemfile "# no gems" }
 
     it "saves quotes" do
       bundle "config foo something\\'"
@@ -209,6 +209,20 @@ E
       run "puts Bundler.settings[:foo]"
       expect(out).to eq("1")
     end
+
+    it "doesn't duplicate quotes around values", :if => (RUBY_VERSION >= "2.1") do
+      bundled_app(".bundle").mkpath
+      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
+      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
   end
 
   describe "very long lines" do

data/spec/spec_helper.rb

@@ -76,11 +76,7 @@ RSpec.configure do |config|
     config.filter_run_excluding :rubygems => "2.2"
   end
 
-  if ENV['RGV'] == "master"
-    config.filter_run :rubygems_master => true
-  else
-    config.filter_run_excluding :rubygems_master => true
-  end
+  config.filter_run_excluding :rubygems_master => (ENV['RGV'] != "master")
 
   config.filter_run :focused => true unless ENV['CI']
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache