bundler 1.10.6 → 1.11.0.pre.1

data/lib/bundler/dependency.rb

@@ -1,6 +1,6 @@
-require 'rubygems/dependency'
-require 'bundler/shared_helpers'
-require 'bundler/rubygems_ext'
+require "rubygems/dependency"
+require "bundler/shared_helpers"
+require "bundler/rubygems_ext"
 
 module Bundler
   class Dependency < Gem::Dependency
@@ -15,12 +15,14 @@ module Bundler
       :ruby_20  => Gem::Platform::RUBY,
       :ruby_21  => Gem::Platform::RUBY,
       :ruby_22  => Gem::Platform::RUBY,
+      :ruby_23  => Gem::Platform::RUBY,
       :mri      => Gem::Platform::RUBY,
       :mri_18   => Gem::Platform::RUBY,
       :mri_19   => Gem::Platform::RUBY,
       :mri_20   => Gem::Platform::RUBY,
       :mri_21   => Gem::Platform::RUBY,
       :mri_22   => Gem::Platform::RUBY,
+      :mri_23   => Gem::Platform::RUBY,
       :rbx      => Gem::Platform::RUBY,
       :jruby    => Gem::Platform::JAVA,
       :jruby_18 => Gem::Platform::JAVA,
@@ -30,36 +32,49 @@ module Bundler
       :mswin_19 => Gem::Platform::MSWIN,
       :mswin_20 => Gem::Platform::MSWIN,
       :mswin_21 => Gem::Platform::MSWIN,
+      :mswin_22 => Gem::Platform::MSWIN,
+      :mswin_23 => Gem::Platform::MSWIN,
       :mswin64    => Gem::Platform::MSWIN64,
       :mswin64_19 => Gem::Platform::MSWIN64,
       :mswin64_20 => Gem::Platform::MSWIN64,
       :mswin64_21 => Gem::Platform::MSWIN64,
+      :mswin64_22 => Gem::Platform::MSWIN64,
+      :mswin64_23 => Gem::Platform::MSWIN64,
       :mingw    => Gem::Platform::MINGW,
       :mingw_18 => Gem::Platform::MINGW,
       :mingw_19 => Gem::Platform::MINGW,
       :mingw_20 => Gem::Platform::MINGW,
       :mingw_21 => Gem::Platform::MINGW,
       :mingw_22 => Gem::Platform::MINGW,
+      :mingw_23 => Gem::Platform::MINGW,
       :x64_mingw    => Gem::Platform::X64_MINGW,
       :x64_mingw_20 => Gem::Platform::X64_MINGW,
       :x64_mingw_21 => Gem::Platform::X64_MINGW,
-      :x64_mingw_22 => Gem::Platform::X64_MINGW
+      :x64_mingw_22 => Gem::Platform::X64_MINGW,
+      :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)
 
       @autorequire    = nil
-      @groups         = Array(options["group"] || :default).map { |g| g.to_sym }
+      @groups         = Array(options["group"] || :default).map(&:to_sym)
       @source         = options["source"]
       @platforms      = Array(options["platforms"])
       @env            = options["env"]
       @should_include = options.fetch("should_include", true)
 
-      if options.key?('require')
-        @autorequire = Array(options['require'] || [])
-      end
+      @autorequire = Array(options["require"] || []) if options.key?("require")
     end
 
     def gem_platforms(valid_platforms)
@@ -91,14 +106,14 @@ module Bundler
 
     def current_platform?
       return true if @platforms.empty?
-      @platforms.any? { |p|
+      @platforms.any? do |p|
         Bundler.current_ruby.send("#{p}?")
-      }
+      end
     end
 
     def to_lock
       out = super
-      out << '!' if source
+      out << "!" if source
       out << "\n"
     end
 

data/lib/bundler/deployment.rb

@@ -40,7 +40,7 @@ module Bundler
         send task_method, :install, opts do
           bundle_cmd     = context.fetch(:bundle_cmd, "bundle")
           bundle_flags   = context.fetch(:bundle_flags, "--deployment --quiet")
-          bundle_dir     = context.fetch(:bundle_dir, File.join(context.fetch(:shared_path), 'bundle'))
+          bundle_dir     = context.fetch(:bundle_dir, File.join(context.fetch(:shared_path), "bundle"))
           bundle_gemfile = context.fetch(:bundle_gemfile, "Gemfile")
           bundle_without = [*context.fetch(:bundle_without, [:development, :test])].compact
           bundle_with    = [*context.fetch(:bundle_with, [])].compact
@@ -54,7 +54,7 @@ module Bundler
           args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
           args << "--with #{bundle_with.join(" ")}" unless bundle_with.empty?
 
-          run "cd #{app_path} && #{bundle_cmd} install #{args.join(' ')}"
+          run "cd #{app_path} && #{bundle_cmd} install #{args.join(" ")}"
         end
       end
     end

data/lib/bundler/deprecate.rb

@@ -1,5 +1,4 @@
 module Bundler
-
   if defined? ::Deprecate
     Deprecate = ::Deprecate
   elsif defined? Gem::Deprecate
@@ -9,7 +8,8 @@ module Bundler
   end
 
   unless Deprecate.respond_to?(:skip_during)
-    def Deprecate.skip_during; yield; end
+    def Deprecate.skip_during
+      yield
+    end
   end
-
 end

data/lib/bundler/dsl.rb

@@ -1,5 +1,5 @@
-require 'bundler/dependency'
-require 'bundler/ruby_dsl'
+require "bundler/dependency"
+require "bundler/ruby_dsl"
 
 module Bundler
   class Dsl
@@ -13,6 +13,7 @@ module Bundler
 
     VALID_PLATFORMS = Bundler::Dependency::PLATFORM_MAP.keys.freeze
 
+    attr_reader :gemspecs
     attr_accessor :dependencies
 
     def initialize
@@ -26,6 +27,7 @@ module Bundler
       @platforms            = []
       @env                  = nil
       @ruby_version         = nil
+      @gemspecs             = []
       add_git_sources
     end
 
@@ -33,14 +35,17 @@ module Bundler
       contents ||= Bundler.read_file(gemfile.to_s)
       instance_eval(contents, gemfile.to_s, 1)
     rescue Exception => e
-      message = "There was an error parsing `#{File.basename gemfile.to_s}`: #{e.message}"
+      message = "There was an error " \
+        "#{e.is_a?(GemfileEvalError) ? "evaluating" : "parsing"} " \
+        "`#{File.basename gemfile.to_s}`: #{e.message}"
+
       raise DSLError.new(message, gemfile, e.backtrace, contents)
     end
 
     def gemspec(opts = nil)
-      path              = opts && opts[:path] || '.'
+      path              = opts && opts[:path] || "."
       glob              = opts && opts[:glob]
-      name              = opts && opts[:name] || '{,*}'
+      name              = opts && opts[:name] || "{,*}"
       development_group = opts && opts[:development_group] || :development
       expanded_path     = File.expand_path(path, Bundler.default_gemfile.dirname)
 
@@ -52,21 +57,23 @@ module Bundler
 
         unless spec
           raise InvalidOption, "There was an error loading the gemspec at " \
-            "#{file}. Make sure you can build the gem, then try again."
+            "#{file}. Make sure you can build the gem, then try again"
         end
 
-        gem spec.name, :path => path, :glob => glob
+        gem spec.name, :path => path, :glob => glob, :platforms => Bundler::Dependency::REVERSE_PLATFORM_MAP[spec.platform]
 
         group(development_group) do
           spec.development_dependencies.each do |dep|
             gem dep.name, *(dep.requirement.as_list + [:type => :development])
           end
         end
+
+        @gemspecs << gemspecs.first
       when 0
-        raise InvalidOption, "There are no gemspecs at #{expanded_path}."
+        raise InvalidOption, "There are no gemspecs at #{expanded_path}"
       else
         raise InvalidOption, "There are multiple gemspecs at #{expanded_path}. " \
-          "Please use the :name option to specify which one should be used."
+          "Please use the :name option to specify which one should be used"
       end
     end
 
@@ -79,7 +86,7 @@ module Bundler
       dep = Dependency.new(name, version, options)
 
       # if there's already a dependency with this name we try to prefer one
-      if current = @dependencies.find { |d| d.name == dep.name }
+      if current = @dependencies.find {|d| d.name == dep.name }
         if current.requirement != dep.requirement
           if current.type == :development
             @dependencies.delete current
@@ -104,7 +111,7 @@ module Bundler
           else
             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"
+                            "#{current.source || "an unspecified source"} and #{dep.source}\n"
           end
         end
       end
@@ -198,7 +205,8 @@ module Bundler
     alias_method :platform, :platforms
 
     def env(name)
-      @env, old = name, @env
+      old = @env
+      @env = name
       yield
     ensure
       @env = old
@@ -212,27 +220,41 @@ module Bundler
 
     def add_git_sources
       git_source(:github) do |repo_name|
+        # It would be better to use https instead of the git protocol, but this
+        # can break deployment of existing locked bundles when switching between
+        # different versions of Bundler. The change will be made in 2.0, which
+        # does not guarantee compatibility with the 1.x series.
+        #
+        # See https://github.com/bundler/bundler/pull/2569 for discussion
+        #
+        # This can be overridden by adding this code to your Gemfiles:
+        #
+        #   git_source(:github) do |repo_name|
+        #     repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+        #     "https://github.com/#{repo_name}.git"
+        #   end
         repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
         "git://github.com/#{repo_name}.git"
       end
 
-      git_source(:gist){ |repo_name| "https://gist.github.com/#{repo_name}.git" }
+      git_source(:gist) {|repo_name| "https://gist.github.com/#{repo_name}.git" }
 
       git_source(:bitbucket) do |repo_name|
-        user_name, repo_name = repo_name.split '/'
+        user_name, repo_name = repo_name.split "/"
         repo_name ||= user_name
         "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
       end
     end
 
     def with_source(source)
+      old_source = @source
       if block_given?
         @source = source
         yield
       end
       source
     ensure
-      @source = nil
+      @source = old_source
     end
 
     def normalize_hash(opts)
@@ -248,10 +270,10 @@ module Bundler
 
     def normalize_options(name, version, opts)
       if name.is_a?(Symbol)
-        raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name}"' instead.}
+        raise GemfileError, %(You need to specify gem names as Strings. Use 'gem "#{name}"' instead)
       end
       if name =~ /\s/
-        raise GemfileError, %{'#{name}' is not a valid gem name because it contains whitespace.}
+        raise GemfileError, %('#{name}' is not a valid gem name because it contains whitespace)
       end
 
       normalize_hash(opts)
@@ -273,14 +295,14 @@ module Bundler
       platforms = @platforms.dup
       opts["platforms"] = opts["platform"] || opts["platforms"]
       platforms.concat Array(opts.delete("platforms"))
-      platforms.map! { |p| p.to_sym }
+      platforms.map!(&:to_sym)
       platforms.each do |p|
         next if VALID_PLATFORMS.include?(p)
         raise GemfileError, "`#{p}` is not a valid platform. The available options are: #{VALID_PLATFORMS.inspect}"
       end
 
       # Save sources passed in a key
-      if opts.has_key?("source")
+      if opts.key?("source")
         source = normalize_source(opts["source"])
         opts["source"] = @sources.add_rubygems_source("remotes" => source)
       end
@@ -290,20 +312,19 @@ module Bundler
         opts["git"] = @git_sources[git_name].call(opts[git_name])
       end
 
-      ["git", "path"].each do |type|
-        if param = opts[type]
-          if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/
-            options = opts.merge("name" => name, "version" => $1)
-          else
-            options = opts.dup
-          end
-          source = send(type, param, options) {}
-          opts["source"] = source
+      %w(git path).each do |type|
+        next unless param = opts[type]
+        if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/
+          options = opts.merge("name" => name, "version" => $1)
+        else
+          options = opts.dup
         end
+        source = send(type, param, options) {}
+        opts["source"] = source
       end
 
-      opts["source"]       ||= @source
-      opts["env"]          ||= @env
+      opts["source"] ||= @source
+      opts["env"] ||= @env
       opts["platforms"]      = platforms.dup
       opts["group"]          = groups
       opts["should_include"] = install_if
@@ -321,7 +342,7 @@ 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 = "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "
         message << if invalid_keys.size > 1
                      "as options for #{command}, but they are invalid."
                    else
@@ -354,7 +375,7 @@ module Bundler
         raise GemspecError, "Warning: this Gemfile contains multiple primary sources. " \
           "Each source after the first must include a block to indicate which gems " \
           "should come from that source. To downgrade this error to a warning, run " \
-          "`bundle config --delete disable_multisource`."
+          "`bundle config --delete disable_multisource`"
       else
         Bundler.ui.warn "Warning: this Gemfile contains multiple primary sources. " \
           "Using `source` more than once without a block is a security risk, and " \
@@ -432,40 +453,38 @@ module Bundler
 
           return m unless backtrace && dsl_path && contents
 
-          trace_line = backtrace.find { |l| l.include?(dsl_path.to_s) } || trace_line
+          trace_line = backtrace.find {|l| l.include?(dsl_path.to_s) } || trace_line
           return m unless trace_line
-          line_numer = trace_line.split(':')[1].to_i - 1
+          line_numer = trace_line.split(":")[1].to_i - 1
           return m unless line_numer
 
           lines      = contents.lines.to_a
-          indent     = ' #  '
-          indicator  = indent.gsub('#', '>')
+          indent     = " #  "
+          indicator  = indent.tr('#', ">")
           first_line = (line_numer.zero?)
           last_line  = (line_numer == (lines.count - 1))
 
           m << "\n"
-          m << "#{indent}from #{trace_line.gsub(/:in.*$/, '')}\n"
+          m << "#{indent}from #{trace_line.gsub(/:in.*$/, "")}\n"
           m << "#{indent}-------------------------------------------\n"
-          m << "#{indent}#{    lines[line_numer - 1] }" unless first_line
-          m << "#{indicator}#{ lines[line_numer] }"
-          m << "#{indent}#{    lines[line_numer + 1] }" unless last_line
+          m << "#{indent}#{lines[line_numer - 1]}" unless first_line
+          m << "#{indicator}#{lines[line_numer]}"
+          m << "#{indent}#{lines[line_numer + 1]}" unless last_line
           m << "\n" unless m.end_with?("\n")
           m << "#{indent}-------------------------------------------\n"
         end
       end
 
-      private
+    private
 
       def parse_line_number_from_description
         description = self.description
         if dsl_path && description =~ /((#{Regexp.quote File.expand_path(dsl_path)}|#{Regexp.quote dsl_path.to_s}):\d+)/
           trace_line = Regexp.last_match[1]
-          description = description.sub(/#{Regexp.quote trace_line}:\s*/, '').sub("\n", ' - ')
+          description = description.sub(/#{Regexp.quote trace_line}:\s*/, "").sub("\n", " - ")
         end
         [trace_line, description]
       end
     end
-
   end
-
 end

data/lib/bundler/env.rb

@@ -1,27 +1,27 @@
-require 'bundler/rubygems_integration'
-require 'bundler/source/git/git_proxy'
+require "bundler/rubygems_integration"
+require "bundler/source/git/git_proxy"
 
 module Bundler
   class Env
-
     def write(io)
-      io.write report(:print_gemfile => true)
+      io.write report(:print_gemfile => true, :print_gemspecs => true)
     end
 
     def report(options = {})
       print_gemfile = options.delete(:print_gemfile)
+      print_gemspecs = options.delete(:print_gemspecs)
 
       out = "Environment\n\n"
       out << "    Bundler   #{Bundler::VERSION}\n"
       out << "    Rubygems  #{Gem::VERSION}\n"
       out << "    Ruby      #{ruby_version}"
-      out << "    GEM_HOME  #{ENV['GEM_HOME']}\n" unless ENV['GEM_HOME'].nil? || ENV['GEM_HOME'].empty?
-      out << "    GEM_PATH  #{ENV['GEM_PATH']}\n" unless ENV['GEM_PATH'] == ENV['GEM_HOME']
-      out << "    RVM       #{ENV['rvm_version']}\n" if ENV['rvm_version']
+      out << "    GEM_HOME  #{ENV["GEM_HOME"]}\n" unless ENV["GEM_HOME"].nil? || ENV["GEM_HOME"].empty?
+      out << "    GEM_PATH  #{ENV["GEM_PATH"]}\n" unless ENV["GEM_PATH"] == ENV["GEM_HOME"]
+      out << "    RVM       #{ENV["rvm_version"]}\n" if ENV["rvm_version"]
       out << "    Git       #{git_version}\n"
       %w(rubygems-bundler open_gem).each do |name|
         specs = Bundler.rubygems.find_name(name)
-        out << "    #{name} (#{specs.map(&:version).join(',')})\n" unless specs.empty?
+        out << "    #{name} (#{specs.map(&:version).join(",")})\n" unless specs.empty?
       end
 
       out << "\nBundler settings\n\n" unless Bundler.settings.all.empty?
@@ -33,13 +33,21 @@ module Bundler
       end
 
       if print_gemfile
-        out << "\nGemfile\n\n"
+        out << "\n#{Bundler.default_gemfile.relative_path_from(SharedHelpers.pwd)}\n\n"
         out << "    " << read_file(Bundler.default_gemfile).gsub(/\n/, "\n    ") << "\n"
 
-        out << "\n" << "Gemfile.lock\n\n"
+        out << "\n#{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}\n\n"
         out << "    " << read_file(Bundler.default_lockfile).gsub(/\n/, "\n    ") << "\n"
       end
 
+      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\n    " << read_file(gs).gsub(/\n/, "\n    ") << "\n"
+        end
+      end
+
       out
     end
 
@@ -55,7 +63,7 @@ module Bundler
 
     def ruby_version
       str = "#{RUBY_VERSION}"
-      if RUBY_VERSION < '1.9'
+      if RUBY_VERSION < "1.9"
         str << " (#{RUBY_RELEASE_DATE}"
         str << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
         str << ") [#{RUBY_PLATFORM}]\n"
@@ -70,6 +78,5 @@ module Bundler
     rescue Bundler::Source::Git::GitNotInstalledError
       "not installed"
     end
-
   end
 end