bundler 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef2d9111a116f5375fcbbc9fcf791173f17f8191
-  data.tar.gz: 4aa9735c3b3e22247ea7586c0afb4461d98c1f53
+  metadata.gz: af68420035a0c7b45ad5bded38f16b47d34e1926
+  data.tar.gz: ec122e1e73be3e4d5bed140544922889251d9518
 SHA512:
-  metadata.gz: 68568a8e2ac0307a22e2ca03813f85c4669e0387fdb404810a82db19bb547f907e5cb180db076e481a24367e8428285503a6f14e00629ae1a09e86d1b864fb30
-  data.tar.gz: 74c1ab0165a4cf9281eec6745019eb7ec5ab0f2544e44148deb3ac722709b078ebbe408820c37e2b9596c0d496566ccd6214823f7be5df3b9eac65e567769569
+  metadata.gz: 395e1cc327ddb3b6b7587563368b042231d8b6e1f3cdc72b898c4f69035cffe734f13c437079eecb831999d80ba38851772a7988e0d22408ca1a5de11a702d25
+  data.tar.gz: 16234c8a9b02d81db591e10dede42804294fc05c3d6863cbf8fd5d3cf2b3bb976357aff1fd5b5e7a2581b230fd24281cd595221e1aa7e06e8b8a264295ee1726

data/CHANGELOG.md

@@ -1,14 +1,25 @@
+## 1.8.1 (2015-02-13)
+
+Bugfixes:
+
+  - synchronize building git gem native extensions (#3385, @antifuchs & @indirect)
+  - set gemspec bindir correctly (#3392, @tmoore)
+  - request lockfile deletion when it is malformed (#3396, @indirect)
+  - explain problem when mirror config is missing (#3386, @indirect)
+  - explain problem when caching causes permission error (#3390, @indirect)
+  - normalize URLs in config keys (#3391, @indirect)
+
 ## 1.8.0 (2015-02-10)
 
 Bugfixes:
 
-  - Gemfile `github` blocks now work (#3379, @indirect)
+  - gemfile `github` blocks now work (#3379, @indirect)
 
 Bugfixes from v1.7.13:
 
-  - Look up installed gems in remote sources (#3300, #3368, #3377, #3380, #3381, @indirect)
-  - Look up gems across all sources to satisfy dependencies (#3365, @keiths-osc)
-  - Request dependencies for no more than 100 gems at a time (#3367, @segiddins)
+  - look up installed gems in remote sources (#3300, #3368, #3377, #3380, #3381, @indirect)
+  - look up gems across all sources to satisfy dependencies (#3365, @keiths-osc)
+  - request dependencies for no more than 100 gems at a time (#3367, @segiddins)
 
 ## 1.8.0.rc (2015-01-26)
 

data/lib/bundler/fetcher.rb

@@ -323,7 +323,7 @@ module Bundler
       gem_list = []
       deps_list = []
 
-      gem_names.each_slice(Source::Rubygems::API_REQUEST_LIMIT) do |names|
+      gem_names.each_slice(Source::Rubygems::API_REQUEST_SIZE) do |names|
         marshalled_deps = fetch dependency_api_uri(names)
         gem_list += Bundler.load_marshal(marshalled_deps)
       end

data/lib/bundler/installer.rb

@@ -195,13 +195,12 @@ module Bundler
   private
 
     def can_install_in_parallel?
-      min_rubygems = "2.0.7"
-      if Bundler.current_ruby.mri? || Bundler.rubygems.provides?(">= #{min_rubygems}")
+      if Bundler.rubygems.provides?(">= 2.1.0")
         true
       else
         Bundler.ui.warn "Rubygems #{Gem::VERSION} is not threadsafe, so your "\
-          "gems must be installed one at a time. Upgrade to Rubygems " \
-          "#{min_rubygems} or higher to enable parallel gem installation."
+          "gems must be installed one at a time. Upgrade to Rubygems 2.1.0 " \
+          "or higher to enable parallel gem installation."
         false
       end
     end

data/lib/bundler/lockfile_parser.rb

@@ -47,6 +47,10 @@ module Bundler
       end
       @sources << @rubygems_aggregate
       @specs = @specs.values
+    rescue ArgumentError => e
+      Bundler.ui.debug(e)
+      raise LockfileError, "Your lockfile is unreadable. Run `rm Gemfile.lock` " \
+        "and then `bundle install` to generate a new lockfile."
     end
 
   private

data/lib/bundler/rubygems_integration.rb

@@ -1,3 +1,4 @@
+require 'monitor'
 require 'rubygems'
 require 'rubygems/config_file'
 
@@ -134,6 +135,10 @@ module Bundler
       Gem::DefaultUserInteraction.ui = obj
     end
 
+    def ext_lock
+      @ext_lock ||= Monitor.new
+    end
+
     def fetch_specs(all, pre, &blk)
       specs = Gem::SpecFetcher.new.list(all, pre)
       specs.each { yield } if block_given?
@@ -554,9 +559,37 @@ module Bundler
       end
     end
 
+    class MoreFuture < Future
+      def initialize
+        super
+        backport_ext_builder_monitor
+      end
+
+      def backport_ext_builder_monitor
+        require 'rubygems/ext'
+
+        Gem::Ext::Builder.class_eval do
+          if !const_defined?(:CHDIR_MONITOR)
+            const_set(:CHDIR_MONITOR, Monitor.new)
+          end
+
+          if const_defined?(:CHDIR_MUTEX)
+            remove_const(:CHDIR_MUTEX)
+            const_set(:CHDIR_MUTEX, const_get(:CHDIR_MONITOR))
+          end
+        end
+      end
+
+      def ext_lock
+        Gem::Ext::Builder::CHDIR_MONITOR
+      end
+    end
+
   end
 
-  if RubygemsIntegration.provides?(">= 1.99.99")
+  if RubygemsIntegration.provides?(">= 2.1.0")
+    @rubygems = RubygemsIntegration::MoreFuture.new
+  elsif RubygemsIntegration.provides?(">= 1.99.99")
     @rubygems = RubygemsIntegration::Future.new
   elsif RubygemsIntegration.provides?('>= 1.8.20')
     @rubygems = RubygemsIntegration::MoreModern.new

data/lib/bundler/settings.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Bundler
   class Settings
     BOOL_KEYS = %w(frozen cache_all no_prune disable_local_branch_check gem.mit gem.coc).freeze
@@ -127,6 +129,9 @@ module Bundler
 
   private
     def key_for(key)
+      if key.is_a?(String) && key.include?("http")
+        key = normalize_uri(key).to_s
+      end
       key = key.to_s.gsub(".", "__").upcase
       "BUNDLE_#{key}"
     end
@@ -182,7 +187,9 @@ module Bundler
       uri = uri.to_s
       uri = "#{uri}/" unless uri =~ %r[/\Z]
       uri = URI(uri)
-      raise ArgumentError, "Gem mirror sources must be absolute URIs (configured: #{mirror_source})" unless uri.absolute?
+      unless uri.absolute?
+        raise ArgumentError, "Gem sources must be absolute. You provided '#{uri}'."
+      end
       uri
     end
 

data/lib/bundler/shared_helpers.rb

@@ -1,4 +1,3 @@
-require 'monitor'
 require 'pathname'
 require 'rubygems'
 
@@ -19,7 +18,6 @@ end
 module Bundler
   module SharedHelpers
     attr_accessor :gem_loaded
-    CHDIR_MONITOR = Monitor.new
 
     def default_gemfile
       gemfile = find_gemfile
@@ -52,7 +50,7 @@ module Bundler
     end
 
     def chdir_monitor
-      CHDIR_MONITOR
+      Bundler.rubygems.ext_lock
     end
 
     def chdir(dir, &blk)

data/lib/bundler/source/path.rb

@@ -172,7 +172,7 @@ module Bundler
       end
 
       def generate_bin(spec, disable_extensions = false)
-        gem_dir  = Pathname.new(spec.full_gem_path)
+        gem_dir = Pathname.new(spec.full_gem_path)
 
         # Some gem authors put absolute paths in their gemspec
         # and we have to save them from themselves

data/lib/bundler/source/rubygems.rb

@@ -5,8 +5,10 @@ require 'rubygems/spec_fetcher'
 module Bundler
   class Source
     class Rubygems < Source
-      # threshold for switching back to the modern index instead of fetching every spec
-      API_REQUEST_LIMIT = 100
+      # Use the API when installing less than X gems
+      API_REQUEST_LIMIT = 500
+      # Ask for X gems per API request
+      API_REQUEST_SIZE = 50
 
       attr_reader :remotes, :caches
 
@@ -149,6 +151,9 @@ module Bundler
         return if File.dirname(cached_path) == Bundler.app_cache.to_s
         Bundler.ui.info "  * #{File.basename(cached_path)}"
         FileUtils.cp(cached_path, Bundler.app_cache(custom_path))
+      rescue Errno::EACCES => e
+        Bundler.ui.debug(e)
+        raise InstallError, e.message
       end
 
       def cached_built_in_gem(spec)

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

@@ -26,7 +26,7 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment. <% if config[:bin] %>Run `bundle exec <%= config[:name] %>` to use the code located in this directory, ignoring other installed copies of this gem.<% end %>
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the code located in this directory, ignoring other installed copies of this gem.<% end %>
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 <%- if config[:ext] -%>

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

metadata

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