bundler 1.11.2 → 1.12.0.pre.1

data/lib/bundler/definition.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/lockfile_parser"
 require "digest/sha1"
 require "set"
@@ -53,14 +54,16 @@ module Bundler
       @specs           = nil
       @ruby_version    = ruby_version
 
-      @lockfile_contents      = ""
+      @lockfile_contents      = String.new
       @locked_bundler_version = nil
+      @locked_ruby_version    = nil
 
       if lockfile && File.exist?(lockfile)
         @lockfile_contents = Bundler.read_file(lockfile)
         locked = LockfileParser.new(@lockfile_contents)
         @platforms = locked.platforms
         @locked_bundler_version = locked.bundler_version
+        @locked_ruby_version = locked.ruby_version
 
         if unlock != true
           @locked_deps    = locked.dependencies
@@ -194,8 +197,7 @@ module Bundler
           last_resolve
         else
           # Run a resolve against the locally available gems
-          requested_ruby_version = ruby_version.version if ruby_version
-          last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve, requested_ruby_version)
+          last_resolve.merge Resolver.resolve(expanded_dependencies, index, source_requirements, last_resolve, ruby_version)
         end
       end
     end
@@ -269,9 +271,7 @@ module Bundler
       end
     end
 
-    # Returns the version of Bundler that is creating or has created
-    # Gemfile.lock. Used in #to_lock.
-    def lock_version
+    def locked_bundler_version
       if @locked_bundler_version && @locked_bundler_version < Gem::Version.new(Bundler::VERSION)
         new_version = Bundler::VERSION
       end
@@ -279,8 +279,28 @@ module Bundler
       new_version || @locked_bundler_version || Bundler::VERSION
     end
 
+    def locked_ruby_version
+      if @unlock[:ruby]
+        if ruby_version && !@locked_ruby_version
+          return Bundler::RubyVersion.system
+        elsif ruby_version && @locked_ruby_version
+          return Bundler::RubyVersion.system
+        elsif !ruby_version && @locked_ruby_version
+          return nil
+        end
+      else
+        if ruby_version && !@locked_ruby_version
+          return Bundler::RubyVersion.system
+        elsif ruby_version && @locked_ruby_version
+          return @locked_ruby_version
+        elsif !ruby_version && @locked_ruby_version
+          return @locked_ruby_version
+        end
+      end
+    end
+
     def to_lock
-      out = ""
+      out = String.new
 
       sources.lock_sources.each do |source|
         # Add the source header
@@ -315,20 +335,26 @@ module Bundler
         handled << dep.name
       end
 
+      if locked_ruby_version
+        out << "\nRUBY VERSION\n"
+        out << "   #{locked_ruby_version}\n"
+      end
+
       # Record the version of Bundler that was used to create the lockfile
       out << "\nBUNDLED WITH\n"
-      out << "   #{lock_version}\n"
+      out << "   #{locked_bundler_version}\n"
 
       out
     end
 
     def ensure_equivalent_gemfile_and_lockfile(explicit_flag = false)
-      msg = "You are trying to install in deployment mode after changing\n" \
-            "your Gemfile. Run `bundle install` elsewhere and add the\n" \
-            "updated #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} to version control."
+      msg = String.new
+      msg << "You are trying to install in deployment mode after changing\n" \
+             "your Gemfile. Run `bundle install` elsewhere and add the\n" \
+             "updated #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} to version control."
 
       unless explicit_flag
-        msg += "\n\nIf this is a development machine, remove the #{Bundler.default_gemfile} " \
+        msg << "\n\nIf this is a development machine, remove the #{Bundler.default_gemfile} " \
                "freeze \nby running `bundle install --no-deployment`."
       end
 
@@ -381,7 +407,7 @@ module Bundler
     def validate_ruby!
       return unless ruby_version
 
-      if diff = ruby_version.diff(Bundler.ruby_version)
+      if diff = ruby_version.diff(Bundler::RubyVersion.system)
         problem, expected, actual = diff
 
         msg = case problem
@@ -390,7 +416,7 @@ module Bundler
               when :version
                 "Your Ruby version is #{actual}, but your Gemfile specified #{expected}"
               when :engine_version
-                "Your #{Bundler.ruby_version.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
+                "Your #{Bundler::RubyVersion.system.engine} version is #{actual}, but your Gemfile specified #{ruby_version.engine} #{expected}"
               when :patchlevel
                 if !expected.is_a?(String)
                   "The Ruby patchlevel in your Gemfile must be a string"
@@ -612,7 +638,7 @@ module Bundler
         dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name)
         next unless remote || dep.current_platform?
         dep.gem_platforms(@platforms).each do |p|
-          deps << DepProxy.new(dep, p) if remote || p == generic(Gem::Platform.local)
+          deps << DepProxy.new(dep, p) if remote || p == generic_local_platform
         end
       end
       deps

data/lib/bundler/dep_proxy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class DepProxy
     attr_reader :__platform, :dep

data/lib/bundler/dependency.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rubygems/dependency"
 require "bundler/shared_helpers"
 require "bundler/rubygems_ext"
@@ -54,6 +55,15 @@ module Bundler
       :x64_mingw_23 => Gem::Platform::X64_MINGW
     }.freeze
 
+    REVERSE_PLATFORM_MAP = {}.tap do |reverse_platform_map|
+      PLATFORM_MAP.each do |key, value|
+        reverse_platform_map[value] ||= []
+        reverse_platform_map[value] << key
+      end
+
+      reverse_platform_map.each {|_, platforms| platforms.freeze }
+    end.freeze
+
     def initialize(name, version, options = {}, &blk)
       type = options["type"] || :runtime
       super(name, version, type)

data/lib/bundler/deployment.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class Deployment
     def self.define_task(context, task_method = :task, opts = {})

data/lib/bundler/deprecate.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   if defined? ::Deprecate
     Deprecate = ::Deprecate

data/lib/bundler/dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/dependency"
 require "bundler/ruby_dsl"
 
@@ -28,10 +29,12 @@ module Bundler
       @env                  = nil
       @ruby_version         = nil
       @gemspecs             = []
+      @gemfile              = nil
       add_git_sources
     end
 
     def eval_gemfile(gemfile, contents = nil)
+      @gemfile = Pathname.new(gemfile)
       contents ||= Bundler.read_file(gemfile.to_s)
       instance_eval(contents, gemfile.to_s, 1)
     rescue Exception => e
@@ -47,7 +50,7 @@ module Bundler
       glob              = opts && opts[:glob]
       name              = opts && opts[:name] || "{,*}"
       development_group = opts && opts[:development_group] || :development
-      expanded_path     = File.expand_path(path, Bundler.default_gemfile.dirname)
+      expanded_path     = gemfile_root.join(path)
 
       gemspecs = Dir[File.join(expanded_path, "#{name}.gemspec")]
 
@@ -60,7 +63,8 @@ module Bundler
             "#{file}. Make sure you can build the gem, then try again"
         end
 
-        gem spec.name, :path => path, :glob => glob
+        gem_platforms = Bundler::Dependency::REVERSE_PLATFORM_MAP[Bundler::GemHelpers.generic_local_platform]
+        gem spec.name, :path => path, :glob => glob, :platforms => gem_platforms
 
         group(development_group) do
           spec.development_dependencies.each do |dep|
@@ -90,9 +94,8 @@ module Bundler
         if current.requirement != dep.requirement
           if current.type == :development
             @dependencies.delete current
-          elsif dep.type == :development
-            return
           else
+            return if dep.type == :development
             raise GemfileError, "You cannot specify the same gem twice with different version requirements.\n" \
                             "You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})"
           end
@@ -106,9 +109,8 @@ module Bundler
         if current.source != dep.source
           if current.type == :development
             @dependencies.delete current
-          elsif dep.type == :development
-            return
           else
+            return if dep.type == :development
             raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
                             "You specified that #{dep.name} (#{dep.requirement}) should come from " \
                             "#{current.source || "an unspecified source"} and #{dep.source}\n"
@@ -143,7 +145,9 @@ module Bundler
     end
 
     def path(path, options = {}, &blk)
-      with_source(@sources.add_path_source(normalize_hash(options).merge("path" => Pathname.new(path))), &blk)
+      source_options = normalize_hash(options).merge("path" => Pathname.new(path), "root_path" => gemfile_root)
+      source = @sources.add_path_source(source_options)
+      with_source(source, &blk)
     end
 
     def git(uri, options = {}, &blk)
@@ -342,7 +346,8 @@ module Bundler
     def validate_keys(command, opts, valid_keys)
       invalid_keys = opts.keys - valid_keys
       if invalid_keys.any?
-        message = "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "
+        message = String.new
+        message << "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "
         message << if invalid_keys.size > 1
                      "as options for #{command}, but they are invalid."
                    else
@@ -447,7 +452,7 @@ module Bundler
         @to_s ||= begin
           trace_line, description = parse_line_number_from_description
 
-          m = "\n[!] "
+          m = String.new("\n[!] ")
           m << description
           m << ". Bundler cannot continue.\n"
 
@@ -486,5 +491,10 @@ module Bundler
         [trace_line, description]
       end
     end
+
+    def gemfile_root
+      @gemfile ||= Bundler.default_gemfile
+      @gemfile.dirname
+    end
   end
 end

data/lib/bundler/endpoint_specification.rb

@@ -1,16 +1,20 @@
+# frozen_string_literal: true
 module Bundler
   # used for Creating Specifications from the Gemcutter Endpoint
   class EndpointSpecification < Gem::Specification
+    ILLFORMED_MESSAGE = 'Ill-formed requirement ["#<YAML::Syck::DefaultKey'.freeze
     include MatchPlatform
 
-    attr_reader :name, :version, :platform, :dependencies
+    attr_reader :name, :version, :platform, :dependencies, :required_rubygems_version, :required_ruby_version, :checksum
     attr_accessor :source, :remote
 
-    def initialize(name, version, platform, dependencies)
+    def initialize(name, version, platform, dependencies, metadata = nil)
       @name         = name
-      @version      = version
+      @version      = Gem::Version.create version
       @platform     = platform
-      @dependencies = dependencies
+      @dependencies = dependencies.map {|dep, reqs| build_dependency(dep, reqs) }
+
+      parse_metadata(metadata)
     end
 
     def fetch_platform
@@ -80,10 +84,9 @@ module Bundler
     end
 
     def _local_specification
-      if @loaded_from && File.exist?(local_specification_path)
-        eval(File.read(local_specification_path)).tap do |spec|
-          spec.loaded_from = @loaded_from
-        end
+      return unless @loaded_from && File.exist?(local_specification_path)
+      eval(File.read(local_specification_path)).tap do |spec|
+        spec.loaded_from = @loaded_from
       end
     end
 
@@ -96,5 +99,31 @@ module Bundler
     def local_specification_path
       "#{base_dir}/specifications/#{full_name}.gemspec"
     end
+
+    def parse_metadata(data)
+      return unless data
+      data.each do |k, v|
+        next unless v
+        case k.to_s
+        when "checksum"
+          @checksum = v.last
+        when "rubygems"
+          @required_rubygems_version = Gem::Requirement.new(v)
+        when "ruby"
+          @required_ruby_version = Gem::Requirement.new(v)
+        end
+      end
+    end
+
+    def build_dependency(name, *requirements)
+      Gem::Dependency.new(name, *requirements)
+    rescue ArgumentError => e
+      raise unless e.message.include?(ILLFORMED_MESSAGE)
+      puts # we shouldn't print the error message on the "fetching info" status line
+      raise GemspecError,
+        "Unfortunately, the gem #{name} (#{version}) has an invalid " \
+        "gemspec.\nPlease ask the gem author to yank the bad version to fix " \
+        "this issue. For more information, see http://bit.ly/syck-defaultkey."
+    end
   end
 end

data/lib/bundler/env.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/rubygems_integration"
 require "bundler/source/git/git_proxy"
 
@@ -11,7 +12,7 @@ module Bundler
       print_gemfile = options.delete(:print_gemfile)
       print_gemspecs = options.delete(:print_gemspecs)
 
-      out = "Environment\n\n"
+      out = String.new("Environment\n\n")
       out << "    Bundler   #{Bundler::VERSION}\n"
       out << "    Rubygems  #{Gem::VERSION}\n"
       out << "    Ruby      #{ruby_version}"
@@ -43,7 +44,7 @@ module Bundler
       if print_gemspecs
         dsl = Dsl.new.tap {|d| d.eval_gemfile(Bundler.default_gemfile) }
         dsl.gemspecs.each do |gs|
-          out << "\n#{Pathname.new(gs).basename}:"
+          out << "\n#{Pathname.new(gs).basename}"
           out << "\n\n    " << read_file(gs).gsub(/\n/, "\n    ") << "\n"
         end
       end
@@ -62,7 +63,7 @@ module Bundler
     end
 
     def ruby_version
-      str = "#{RUBY_VERSION}"
+      str = String.new("#{RUBY_VERSION}")
       if RUBY_VERSION < "1.9"
         str << " (#{RUBY_RELEASE_DATE}"
         str << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL

data/lib/bundler/environment.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class Environment
     attr_reader :root

data/lib/bundler/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class BundlerError < StandardError
     def self.status_code(code)
@@ -5,14 +6,27 @@ module Bundler
     end
   end
 
-  class GemfileNotFound < BundlerError; status_code(10); end
-  class GemNotFound < BundlerError; status_code(7); end
   class GemfileError < BundlerError; status_code(4); end
   class InstallError < BundlerError; status_code(5); end
+
+  # Internal error, should be rescued
+  class VersionConflict < BundlerError
+    attr_reader :conflicts
+
+    def initialize(conflicts, msg = nil)
+      super(msg)
+      @conflicts = conflicts
+    end
+
+    status_code(6)
+  end
+
+  class GemNotFound < BundlerError; status_code(7); end
   class InstallHookError < BundlerError; status_code(8); end
-  class PathError < BundlerError; status_code(13); end
+  class GemfileNotFound < BundlerError; status_code(10); end
   class GitError < BundlerError; status_code(11); end
   class DeprecatedError < BundlerError; status_code(12); end
+  class PathError < BundlerError; status_code(13); end
   class GemspecError < BundlerError; status_code(14); end
   class InvalidOption < BundlerError; status_code(15); end
   class ProductionError < BundlerError; status_code(16); end
@@ -25,42 +39,22 @@ module Bundler
   class GemfileEvalError < GemfileError; end
   class MarshalError < StandardError; end
 
-  # Internal errors, should be rescued
-  class VersionConflict < BundlerError
-    attr_reader :conflicts
-
-    def initialize(conflicts, msg = nil)
-      super(msg)
-      @conflicts = conflicts
-    end
-
-    status_code(6)
-  end
-
-  class GemRequireError < BundlerError
-    attr_reader :orig_exception
-
-    def initialize(orig_exception, msg)
-      super(msg)
-      @orig_exception = orig_exception
-    end
-
-    status_code(24)
-  end
-
   class PermissionError < BundlerError
     def initialize(path, permission_type = :write)
       @path = path
       @permission_type = permission_type
     end
 
-    def message
-      action = case @permission_type
-               when :read then "read from"
-               when :write then "write to"
-               when :executable, :exec then "execute"
-               else @permission_type.to_s
+    def action
+      case @permission_type
+      when :read then "read from"
+      when :write then "write to"
+      when :executable, :exec then "execute"
+      else @permission_type.to_s
       end
+    end
+
+    def message
       "There was an error while trying to #{action} `#{@path}`. " \
       "It is likely that you need to grant #{@permission_type} permissions " \
       "for that path."
@@ -69,6 +63,21 @@ module Bundler
     status_code(23)
   end
 
+  class GemRequireError < BundlerError
+    attr_reader :orig_exception
+
+    def initialize(orig_exception, msg)
+      full_message = msg + "\nGem Load Error is: #{orig_exception.message}\n"\
+                      "Backtrace for gem load error is:\n"\
+                      "#{orig_exception.backtrace.join("\n")}\n"\
+                      "Bundler Error Backtrace:\n"
+      super(full_message)
+      @orig_exception = orig_exception
+    end
+
+    status_code(24)
+  end
+
   class YamlSyntaxError < BundlerError
     attr_reader :orig_exception
 
@@ -79,4 +88,14 @@ module Bundler
 
     status_code(25)
   end
+
+  class TemporaryResourceError < PermissionError
+    def message
+      "There was an error while trying to #{action} `#{@path}`. " \
+      "Some resource was temporarily unavailable. It's suggested that you try" \
+      "the operation again."
+    end
+
+    status_code(26)
+  end
 end