bundler 1.6.0.pre.2 → 1.6.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82bb96245aad548e3f54e66a218d8e3067896263
-  data.tar.gz: b2db8a96173217dbe55870f6cfb5010d20c3dfb9
+  metadata.gz: 5d32bda726a60693191debeba799d0381900a0ad
+  data.tar.gz: 3030c023da47b1d7d59a812883ce432b1aea0204
 SHA512:
-  metadata.gz: 8ecbe4d05b632741d905d9ed74d5041e4e4c22215e30557db72d982e5c0414caf5e6ae8c297d79ede129b6ef1370d35dae597b3b7ffa09d38106f7ad0fcd20ef
-  data.tar.gz: cde92cfd5835369cc85496e4dbd42a6d63b8bd5091cb416031b161f0f9738ff9e3409cdbf598d4ad5283b402864a9325e83c61913d4fed07f6adbd8a22507f6c
+  metadata.gz: 3913a39ba40e4d72850c24ae963f28d83dfbf82de3905da16acc6f6322fab22bd72fdb0b5a0aa51b527c53a4560e3af25c5efcf6843bec3b97614e0f8add37cd
+  data.tar.gz: 16519e8be7841230cdaba12ff2dde2b04f60562d4221ae75d97c85ac39d4be471dc63a30ab05816c0c9f2b98ad2e0a1a1dd28a9d173de45f6a6dd4f5d0d871ef

data/CHANGELOG.md

@@ -7,6 +7,9 @@ Bugfixes:
   - gemspecs now handle filenames with newlines (#2634, @jasonmp85)
   - support escaped characters in usernames and passwords (@punkie)
   - no more exception on `update GEM` without lock file (@simi)
+  - allow long config values (#2823, @kgrz)
+  - cache successfully even locked to gems shipped with Ruby (#2869, @aughr)
+  - respect NO_PROXY even if a proxy is configured (#2878, @stlay)
 
 Features:
 
@@ -24,7 +27,7 @@ Features:
 Bugfixes:
 
   - find "missing" gems that are actually present (#2780, #2818, #2854)
-  - pse n-1 cores when given n jobs for parallel install (@jdickey)
+  - use n-1 cores when given n jobs for parallel install (@jdickey)
 
 ## 1.5.2 (2014-01-10)
 

data/lib/bundler.rb

@@ -158,7 +158,7 @@ module Bundler
       return @locked_gems if defined?(@locked_gems)
       if Bundler.default_lockfile.exist?
         lock = Bundler.read_file(Bundler.default_lockfile)
-        @lock_gems = LockfileParser.new(lock)
+        @locked_gems = LockfileParser.new(lock)
       else
         @locked_gems = nil
       end

data/lib/bundler/endpoint_specification.rb

@@ -61,7 +61,7 @@ module Bundler
     end
 
     def _local_specification
-      eval(File.read(local_specification_path)) if @loaded_from && File.exists?(local_specification_path)
+      eval(File.read(local_specification_path)) if @loaded_from && File.exist?(local_specification_path)
     end
 
     def __swap__(spec)

data/lib/bundler/fetcher.rb

@@ -151,7 +151,7 @@ module Bundler
       else
         Bundler.load_marshal Gem.inflate(fetch(uri))
       end
-    rescue MarshalError => e
+    rescue MarshalError
       raise HTTPError, "Gemspec #{spec} contained invalid data.\n" \
         "Your network or your gem server is probably having issues right now."
     end
@@ -166,7 +166,6 @@ module Bundler
     # return the specs in the bundler format as an index
     def specs(gem_names, source)
       index = Index.new
-      use_full_source_index = !gem_names || @remote_uri.scheme == "file" || Bundler::Fetcher.disable_endpoint
 
       if gem_names && use_api
         specs = fetch_remote_specs(gem_names)
@@ -220,7 +219,7 @@ module Bundler
       spec_list, deps_list = remote_specs
       returned_gems = spec_list.map {|spec| spec.first }.uniq
       fetch_remote_specs(deps_list, full_dependency_list + returned_gems, spec_list + last_spec_list)
-    rescue HTTPError, MarshalError, GemspecError => e
+    rescue HTTPError, MarshalError, GemspecError
       Bundler.ui.info "" unless Bundler.ui.debug? # new line now that the dots are over
       Bundler.ui.debug "could not fetch from the dependency API, trying the full index"
       @use_api = false
@@ -283,7 +282,7 @@ module Bundler
         password = uri.password ? CGI.unescape(uri.password) : nil
         req.basic_auth(user, password)
       end
-      response = connection.request(uri, req)
+      connection.request(uri, req)
     rescue Net::HTTPUnauthorized, Net::HTTPForbidden
       retry_with_auth { request(uri) }
     rescue OpenSSL::SSL::SSLError

data/lib/bundler/installer.rb

@@ -172,7 +172,7 @@ module Bundler
         next if executable == "bundle"
 
         binstub_path = "#{bin_path}/#{executable}"
-        if File.exists?(binstub_path) && !options[:force]
+        if File.exist?(binstub_path) && !options[:force]
           exists << executable
           next
         end

data/lib/bundler/resolver.rb

@@ -236,14 +236,11 @@ module Bundler
     end
 
     def resolve_conflict(current, states)
-      # Return a requirement/gem which has other possibles states
-      # Given the set of constraints placed by requrired_by
-
-      debug { "    -> Going to: #{current.name} state" }
-
       # Find the state where the conflict has occurred
       state = find_conflict_state(current, states)
 
+      debug { "    -> Going to: #{current.name} state" } if current
+
       # Resolve the conflicts by rewinding the state
       # when the conflicted gem was activated
       reqs, activated, depth = resolve_for_conflict(state)

data/lib/bundler/runtime.rb

@@ -106,7 +106,7 @@ module Bundler
 
     def cache(custom_path = nil)
       cache_path = cache_path(custom_path)
-      FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
+      FileUtils.mkdir_p(cache_path) unless File.exist?(cache_path)
 
       Bundler.ui.info "Updating files in vendor/cache"
       specs.each do |spec|
@@ -124,7 +124,7 @@ module Bundler
 
     def prune_cache(custom_path)
       cache_path = cache_path(custom_path)
-      FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
+      FileUtils.mkdir_p(cache_path) unless File.exist?(cache_path)
       resolve = @definition.resolve
       prune_gem_cache(resolve, custom_path)
       prune_git_and_path_cache(resolve, custom_path)
@@ -202,10 +202,10 @@ module Bundler
       end
 
       unless dry_run
-        stale_gem_bins.each { |bin| FileUtils.rm(bin) if File.exists?(bin) }
-        stale_gem_files.each { |file| FileUtils.rm(file) if File.exists?(file) }
-        stale_gemspec_files.each { |file| FileUtils.rm(file) if File.exists?(file) }
-        stale_git_cache_dirs.each { |dir| FileUtils.rm_rf(dir) if File.exists?(dir) }
+        stale_gem_bins.each { |bin| FileUtils.rm(bin) if File.exist?(bin) }
+        stale_gem_files.each { |file| FileUtils.rm(file) if File.exist?(file) }
+        stale_gemspec_files.each { |file| FileUtils.rm(file) if File.exist?(file) }
+        stale_git_cache_dirs.each { |dir| FileUtils.rm_rf(dir) if File.exist?(dir) }
       end
 
       output

data/lib/bundler/settings.rb

@@ -154,8 +154,8 @@ 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_.+): (?:['"](.*)['"]|(.+))$/
-        config_pairs = config_file.read.scan(config_regex).map{|m| m.compact }
+        config_regex =/^(BUNDLE_.+): (?:['"](.*)['"]|(.+(?:\n(?!BUNDLE).+))|(.+))$/
+        config_pairs = config_file.read.scan(config_regex).map{|m| m.compact.map { |n| n.gsub(/\n\s?/, "") } }
         Hash[config_pairs]
       else
         {}

data/lib/bundler/source/git.rb

@@ -136,6 +136,10 @@ module Bundler
 
       # TODO: actually cache git specs
       def specs(*)
+        if has_app_cache? && !local?
+          set_local!(app_cache_path)
+        end
+
         if requires_checkout? && !@copied
           git_proxy.checkout
           git_proxy.copy_to(install_path, submodules)

data/lib/bundler/source/git/git_proxy.rb

@@ -69,9 +69,7 @@ module Bundler
           else
             Bundler.ui.info "Fetching #{uri}"
             FileUtils.mkdir_p(path.dirname)
-            clone_command = %|clone #{uri_escaped} "#{path}" --bare --no-hardlinks|
-            clone_command = "#{clone_command} --quiet" if Bundler.ui.quiet?
-            git clone_command
+            git %|clone #{uri_escaped} "#{path}" --bare --no-hardlinks --quiet|
           end
         end
 
@@ -79,7 +77,7 @@ module Bundler
           unless File.exist?(destination.join(".git"))
             FileUtils.mkdir_p(destination.dirname)
             FileUtils.rm_rf(destination)
-            git %|clone --no-checkout "#{path}" "#{destination}"|
+            git %|clone --no-checkout --quiet "#{path}" "#{destination}"|
             File.chmod((0777 & ~File.umask), destination)
           end
 

data/lib/bundler/source/path.rb

@@ -146,7 +146,7 @@ module Bundler
               end
             end
           end
-        elsif File.exists?(expanded_path)
+        elsif File.exist?(expanded_path)
           raise PathError, "The path `#{expanded_path}` is not a directory."
         else
           raise PathError, "The path `#{expanded_path}` does not exist."

data/lib/bundler/source/rubygems.rb

@@ -114,6 +114,10 @@ module Bundler
       end
 
       def cache(spec, custom_path = nil)
+        # Gems bundled with Ruby don't have .gem files cached locally, but it doesn't matter
+        # since they're always going to be installed on this Ruby version.
+        return if builtin_gem?(spec)
+
         cached_path = cached_gem(spec)
         raise GemNotFound, "Missing gem file '#{spec.full_name}.gem'." unless cached_path
         return if File.dirname(cached_path) == Bundler.app_cache.to_s
@@ -273,6 +277,13 @@ module Bundler
         end
       end
 
+      def builtin_gem?(spec)
+        # Ruby 2.1-style
+        return true if spec.summary =~ /is bundled with Ruby/
+
+        # Ruby 2.0 style
+        spec.loaded_from.include?("specifications/default/")
+      end
     end
   end
 end

data/lib/bundler/templates/newgem/README.md.tt

@@ -22,8 +22,8 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( http://github.com/[my-github-username]/<%=config[:name]%>/fork )
+1. Fork it ( https://github.com/[my-github-username]/<%=config[:name]%>/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create a new Pull Request

data/lib/bundler/vendor/net/http/persistent.rb

@@ -616,6 +616,8 @@ class Net::HTTP::Persistent
     if @proxy_uri and not proxy_bypass? uri.host, uri.port then
       connection_id << @proxy_connection_id
       net_http_args.concat @proxy_args
+    elsif proxy_bypass? uri.host, uri.port then
+      net_http_args.concat [nil, nil]
     end
 
     connection = connections[connection_id]

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.0.pre.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.0.rc" unless defined?(::Bundler::VERSION)
 end

data/spec/cache/gems_spec.rb

@@ -74,6 +74,42 @@ describe "bundle cache" do
     end
   end
 
+  describe "when there is a built-in gem" do
+    let(:version) { "1.0.0" }
+
+    before :each do
+      build_repo2 do
+        build_gem "builtin_gem", version do |s|
+          s.summary = "This builtin_gem is bundled with Ruby"
+        end
+
+        build_gem "remote_gem", version do |s|
+          s.summary = "Totally normal gem"
+        end
+      end
+
+      build_gem "builtin_gem", version, :to_system => true do |s|
+        s.summary = "This builtin_gem is bundled with Ruby"
+      end
+
+      install_gemfile <<-G
+        source "file://#{gem_repo2}"
+        gem 'builtin_gem', '#{version}'
+        gem 'remote_gem', '#{version}'
+      G
+
+      FileUtils.rm("#{system_gem_path}/cache/builtin_gem-#{version}.gem")
+    end
+
+    it "caches normal gems successfully" do
+      bundle :cache, :exitstatus => true
+
+      expect(exitstatus).to be_zero
+      expect(bundled_app("vendor/cache/builtin_gem-#{version}.gem")).to_not exist
+      expect(bundled_app("vendor/cache/remote_gem-#{version}.gem")).to exist
+    end
+  end
+
   describe "when there are also git sources" do
     before do
       build_git "foo"

data/spec/commands/config_spec.rb

@@ -210,4 +210,18 @@ E
       expect(out).to eq("1")
     end
   end
+
+  describe "very long lines" do
+    before(:each) { bundle :install }
+    let(:long_string) do
+      "--with-xml2-include=/usr/pkg/include/libxml2 --with-xml2-lib=/usr/pkg/lib --with-xslt-dir=/usr/pkg"
+    end
+
+    it "doesn't wrap values" do
+      bundle "config foo #{long_string}"
+      run "puts Bundler.settings[:foo]"
+      expect(out).to match(long_string)
+    end
+  end
+
 end

data/spec/install/gems/simple_case_spec.rb

@@ -298,7 +298,7 @@ describe "bundle install with gem sources" do
       install_gemfile <<-G
       G
 
-      expect(File.exists?(bundled_app("Gemfile.lock"))).to eq(true)
+      expect(File.exist?(bundled_app("Gemfile.lock"))).to eq(true)
     end
 
     it "gracefully handles error when rubygems server is unavailable" do

data/spec/runtime/load_spec.rb

@@ -53,7 +53,7 @@ describe "Bundler.load" do
 
     it "does not find a Gemfile above the testing directory" do
       bundler_gemfile = tmp.join("../Gemfile")
-      unless File.exists?(bundler_gemfile)
+      unless File.exist?(bundler_gemfile)
         FileUtils.touch(bundler_gemfile)
         @remove_bundler_gemfile = true
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.6.0.pre.2
+  version: 1.6.0.rc
 platform: ruby
 authors:
 - André Arko
@@ -11,34 +11,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !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: 2.99.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.99.0.beta1
 description: Bundler manages an application's dependencies through its entire life,
@@ -51,9 +51,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
 - DEVELOPMENT.md
@@ -346,17 +346,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
@@ -467,3 +467,4 @@ test_files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
+has_rdoc: