bundler 1.10.6 → 1.11.0.pre.1

data/lib/bundler/cli/init.rb

@@ -7,7 +7,7 @@ module Bundler
 
     def run
       if File.exist?("Gemfile")
-        Bundler.ui.error "Gemfile already exists at #{Dir.pwd}/Gemfile"
+        Bundler.ui.error "Gemfile already exists at #{SharedHelpers.pwd}/Gemfile"
         exit 1
       end
 
@@ -18,16 +18,15 @@ module Bundler
           exit 1
         end
         spec = Gem::Specification.load(gemspec)
-        puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
-        File.open('Gemfile', 'wb') do |file|
+        puts "Writing new Gemfile to #{SharedHelpers.pwd}/Gemfile"
+        File.open("Gemfile", "wb") do |file|
           file << "# Generated from #{gemspec}\n"
           file << spec.to_gemfile
         end
       else
-        puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
-        FileUtils.cp(File.expand_path('../../templates/Gemfile', __FILE__), 'Gemfile')
+        puts "Writing new Gemfile to #{SharedHelpers.pwd}/Gemfile"
+        FileUtils.cp(File.expand_path("../../templates/Gemfile", __FILE__), "Gemfile")
       end
     end
-
   end
 end

data/lib/bundler/cli/inject.rb

@@ -23,11 +23,10 @@ module Bundler
 
       if added.any?
         Bundler.ui.confirm "Added to Gemfile:"
-        Bundler.ui.confirm added.map{ |g| "  #{g}" }.join("\n")
+        Bundler.ui.confirm added.map {|g| "  #{g}" }.join("\n")
       else
         Bundler.ui.confirm "All injected gems were already present in the Gemfile"
       end
     end
-
   end
 end

data/lib/bundler/cli/install.rb

@@ -29,17 +29,17 @@ module Bundler
       Bundler.settings.without = [] if options[:without] && options[:without].empty?
 
       with = options.fetch("with", [])
-      with |= Bundler.settings.with.map {|group| group.to_s }
+      with |= Bundler.settings.with.map(&:to_s)
       with -= options[:without] if options[:without]
 
       without = options.fetch("without", [])
-      without |= Bundler.settings.without.map {|group| group.to_s }
+      without |= Bundler.settings.without.map(&:to_s)
       without -= options[:with] if options[:with]
 
       options[:with]    = with
       options[:without] = without
 
-      ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
+      ENV["RB_USER_INSTALL"] = "1" if Bundler::FREEBSD
 
       # Just disable color in deployment mode
       Bundler.ui.shell = Thor::Shell::Basic.new if options[:deployment]
@@ -50,10 +50,10 @@ module Bundler
         exit 1
       end
 
-      if (options["trust-policy"])
-        unless (Bundler.rubygems.security_policies.keys.include?(options["trust-policy"]))
+      if options["trust-policy"]
+        unless Bundler.rubygems.security_policies.keys.include?(options["trust-policy"])
           Bundler.ui.error "Rubygems doesn't know about trust policy '#{options["trust-policy"]}'. " \
-            "The known policies are: #{Bundler.rubygems.security_policies.keys.join(', ')}."
+            "The known policies are: #{Bundler.rubygems.security_policies.keys.join(", ")}."
           exit 1
         end
         Bundler.settings["trust-policy"] = options["trust-policy"]
@@ -63,17 +63,15 @@ module Bundler
 
       if options[:deployment] || options[:frozen]
         unless Bundler.default_lockfile.exist?
-          flag = options[:deployment] ? '--deployment' : '--frozen'
-          raise ProductionError, "The #{flag} flag requires a Gemfile.lock. Please make " \
-                                 "sure you have checked your Gemfile.lock into version control " \
+          flag = options[:deployment] ? "--deployment" : "--frozen"
+          raise ProductionError, "The #{flag} flag requires a #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}. Please make " \
+                                 "sure you have checked your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} into version control " \
                                  "before deploying."
         end
 
-        if Bundler.app_cache.exist?
-          options[:local] = true
-        end
+        options[:local] = true if Bundler.app_cache.exist?
 
-        Bundler.settings[:frozen] = '1'
+        Bundler.settings[:frozen] = "1"
       end
 
       # When install is called with --no-deployment, disable deployment mode
@@ -85,7 +83,7 @@ module Bundler
       Bundler.settings[:path]     = nil if options[:system]
       Bundler.settings[:path]     = "vendor/bundle" if options[:deployment]
       Bundler.settings[:path]     = options["path"] if options["path"]
-      Bundler.settings[:path]     ||= "bundle" if options["standalone"]
+      Bundler.settings[:path] ||= "bundle" if options["standalone"]
       Bundler.settings[:bin]      = options["binstubs"] if options["binstubs"]
       Bundler.settings[:bin]      = nil if options["binstubs"] && options["binstubs"].empty?
       Bundler.settings[:shebang]  = options["shebang"] if options["shebang"]
@@ -96,7 +94,7 @@ module Bundler
       Bundler.settings.without    = options[:without]
       Bundler.settings.with       = options[:with]
       Bundler::Fetcher.disable_endpoint = options["full-index"]
-      Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
+      Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? "1" : nil
 
       # rubygems plugins sometimes hook into the gem install process
       Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
@@ -112,7 +110,7 @@ module Bundler
 
       if Bundler.settings[:path]
         absolute_path = File.expand_path(Bundler.settings[:path])
-        relative_path = absolute_path.sub(File.expand_path('.'), '.')
+        relative_path = absolute_path.sub(File.expand_path("."), ".")
         Bundler.ui.confirm "Bundled gems are installed into #{relative_path}."
       else
         Bundler.ui.confirm "Use `bundle show [gemname]` to see where a bundled gem is installed."
@@ -128,7 +126,7 @@ module Bundler
         Bundler.ui.error "Warning: the gem '#{name}' was found in multiple sources."
         Bundler.ui.error "Installed from: #{installed_from_uri}"
         Bundler.ui.error "Also found in:"
-        also_found_in_uris.each { |uri| Bundler.ui.error "  * #{uri}" }
+        also_found_in_uris.each {|uri| Bundler.ui.error "  * #{uri}" }
         Bundler.ui.error "You should add a source requirement to restrict this gem to your preferred source."
         Bundler.ui.error "For example:"
         Bundler.ui.error "    gem '#{name}', :source => '#{installed_from_uri}'"
@@ -157,7 +155,7 @@ module Bundler
   private
 
     def warn_if_root
-      return if Bundler::WINDOWS || !Process.uid.zero?
+      return if Bundler.settings[:silence_root_warning] || Bundler::WINDOWS || !Process.uid.zero?
       Bundler.ui.warn "Don't run Bundler as root. Bundler can ask for sudo " \
         "if it is needed, and installing your bundle as root will break this " \
         "application for all non-root users on this machine.", :wrap => true
@@ -172,18 +170,17 @@ module Bundler
 
     def dependencies_count_for(definition)
       count = definition.dependencies.count
-      "#{count} Gemfile #{count == 1 ? 'dependency' : 'dependencies'}"
+      "#{count} Gemfile #{count == 1 ? "dependency" : "dependencies"}"
     end
 
     def gems_installed_for(definition)
       count = definition.specs.count
-      "#{count} #{count == 1 ? 'gem' : 'gems'} now installed"
+      "#{count} #{count == 1 ? "gem" : "gems"} now installed"
     end
 
     def print_post_install_message(name, msg)
       Bundler.ui.confirm "Post-install message from #{name}:"
       Bundler.ui.info msg
     end
-
   end
 end

data/lib/bundler/cli/lock.rb

@@ -16,8 +16,14 @@ module Bundler
       ui = Bundler.ui
       Bundler.ui = UI::Silent.new if print
 
-      unlock = options[:update]
-      definition = Bundler.definition(unlock)
+      gems = options[:update]
+
+      if gems && !gems.empty?
+        definition = Bundler.definition(:gems => gems)
+      else
+        definition = Bundler.definition(true)
+      end
+
       definition.resolve_remotely! unless options[:local]
 
       if print
@@ -31,6 +37,5 @@ module Bundler
 
       Bundler.ui = ui
     end
-
   end
 end

data/lib/bundler/cli/open.rb

@@ -1,5 +1,5 @@
-require 'bundler/cli/common'
-require 'shellwords'
+require "bundler/cli/common"
+require "shellwords"
 
 module Bundler
   class CLI::Open
@@ -10,14 +10,13 @@ module Bundler
     end
 
     def run
-      editor = [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
+      editor = [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? }
       return Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") unless editor
       path = Bundler::CLI::Common.select_spec(name, :regex_match).full_gem_path
       Dir.chdir(path) do
         command = Shellwords.split(editor) + [path]
-        system(*command) || Bundler.ui.info("Could not run '#{command.join(' ')}'")
+        system(*command) || Bundler.ui.info("Could not run '#{command.join(" ")}'")
       end
     end
-
   end
 end

data/lib/bundler/cli/outdated.rb

@@ -1,4 +1,4 @@
-require 'bundler/cli/common'
+require "bundler/cli/common"
 
 module Bundler
   class CLI::Outdated
@@ -18,7 +18,7 @@ module Bundler
       Bundler.definition.validate_ruby!
       current_specs = Bundler.ui.silence { Bundler.load.specs }
       current_dependencies = {}
-      Bundler.ui.silence { Bundler.load.dependencies.each { |dep| current_dependencies[dep.name] = dep } }
+      Bundler.ui.silence { Bundler.load.dependencies.each {|dep| current_dependencies[dep.name] = dep } }
 
       if gems.empty? && sources.empty?
         # We're doing a full update
@@ -32,18 +32,18 @@ module Bundler
 
       out_count = 0
       # Loop through the current specs
-      gemfile_specs, dependency_specs = current_specs.partition { |spec| current_dependencies.has_key? spec.name }
+      gemfile_specs, dependency_specs = current_specs.partition {|spec| current_dependencies.key? spec.name }
       [gemfile_specs.sort_by(&:name), dependency_specs.sort_by(&:name)].flatten.each do |current_spec|
         next if !gems.empty? && !gems.include?(current_spec.name)
 
         dependency = current_dependencies[current_spec.name]
 
         if options["strict"]
-          active_spec =  definition.specs.detect { |spec| spec.name == current_spec.name }
+          active_spec = definition.specs.detect {|spec| spec.name == current_spec.name }
         else
-          active_spec = definition.index[current_spec.name].sort_by { |b| b.version }
+          active_spec = definition.index[current_spec.name].sort_by(&:version)
           if !current_spec.version.prerelease? && !options[:pre] && active_spec.size > 1
-            active_spec = active_spec.delete_if { |b| b.respond_to?(:version) && b.version.prerelease? }
+            active_spec = active_spec.delete_if {|b| b.respond_to?(:version) && b.version.prerelease? }
           end
           active_spec = active_spec.last
         end
@@ -62,7 +62,7 @@ module Bundler
 
           spec_version    = "#{active_spec.version}#{active_spec.git_version}"
           current_version = "#{current_spec.version}#{current_spec.git_version}"
-          dependency_version = %|, requested #{dependency.requirement}| if dependency && dependency.specific?
+          dependency_version = %(, requested #{dependency.requirement}) if dependency && dependency.specific?
 
           if dependency
             groups = dependency.groups.join(", ")
@@ -82,6 +82,5 @@ module Bundler
         exit 1
       end
     end
-
   end
 end

data/lib/bundler/cli/package.rb

@@ -23,7 +23,7 @@ module Bundler
   private
 
     def install
-      require 'bundler/cli/install'
+      require "bundler/cli/install"
       options = self.options.dup
       if Bundler.settings[:cache_all_platforms]
         options["local"] = false

data/lib/bundler/cli/platform.rb

@@ -7,8 +7,8 @@ module Bundler
 
     def run
       platforms, ruby_version = Bundler.ui.silence do
-        [ Bundler.definition.platforms.map {|p| "* #{p}" },
-          Bundler.definition.ruby_version ]
+        [Bundler.definition.platforms.map {|p| "* #{p}" },
+         Bundler.definition.ruby_version]
       end
       output = []
 
@@ -38,6 +38,5 @@ module Bundler
 
       Bundler.ui.info output.join("\n\n")
     end
-
   end
 end

data/lib/bundler/cli/show.rb

@@ -1,4 +1,4 @@
-require 'bundler/cli/common'
+require "bundler/cli/common"
 
 module Bundler
   class CLI::Show
@@ -23,7 +23,7 @@ module Bundler
           spec = Bundler::CLI::Common.select_spec(gem_name, :regex_match)
           return unless spec
           path = spec.full_gem_path
-          if !File.directory?(path)
+          unless File.directory?(path)
             Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at:"
           end
         end
@@ -31,19 +31,19 @@ module Bundler
       end
 
       if options[:paths]
-        Bundler.load.specs.sort_by { |s| s.name }.map do |s|
+        Bundler.load.specs.sort_by(&:name).map do |s|
           Bundler.ui.info s.full_gem_path
         end
       else
         Bundler.ui.info "Gems included by the bundle:"
-        Bundler.load.specs.sort_by { |s| s.name }.each do |s|
+        Bundler.load.specs.sort_by(&:name).each do |s|
           desc = "  * #{s.name} (#{s.version}#{s.git_version})"
           if @verbose
-            latest = latest_specs.find { |l| l.name == s.name }
-            Bundler.ui.info <<-END.gsub(/^ +/, '')
+            latest = latest_specs.find {|l| l.name == s.name }
+            Bundler.ui.info <<-END.gsub(/^ +/, "")
               #{desc}
-              \tSummary:  #{s.summary || 'No description available.'}
-              \tHomepage: #{s.homepage || 'No website available.'}
+              \tSummary:  #{s.summary || "No description available."}
+              \tHomepage: #{s.homepage || "No website available."}
               \tStatus:   #{outdated?(s, latest) ? "Outdated - #{s.version} < #{latest.version}" : "Up to date"}
             END
           else
@@ -53,7 +53,7 @@ module Bundler
       end
     end
 
-    private
+  private
 
     def fetch_latest_specs
       definition = Bundler.definition(true)

data/lib/bundler/cli/update.rb

@@ -21,7 +21,7 @@ module Bundler
             "Run `bundle install` to update and install the bundled gems."
         end
         # cycle through the requested gems, just to make sure they exist
-        names = Bundler.locked_gems.specs.map{ |s| s.name }
+        names = Bundler.locked_gems.specs.map(&:name)
         gems.each do |g|
           next if names.include?(g)
           require "bundler/cli/common"
@@ -30,7 +30,7 @@ module Bundler
 
         if groups.any?
           specs = Bundler.definition.specs_for groups
-          sources.concat(specs.map(&:name))
+          gems.concat(specs.map(&:name))
         end
 
         Bundler.definition(:gems => gems, :sources => sources)
@@ -68,6 +68,5 @@ module Bundler
         Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
       end
     end
-
   end
 end

data/lib/bundler/cli/viz.rb

@@ -6,7 +6,7 @@ module Bundler
     end
 
     def run
-      require 'graphviz'
+      require "graphviz"
       output_file = File.expand_path(options[:file])
       graph = Graph.new(Bundler.load, output_file, options[:version], options[:requirements], options[:format], options[:without])
       graph.viz
@@ -22,6 +22,5 @@ module Bundler
         raise
       end
     end
-
   end
 end

data/lib/bundler/constants.rb

@@ -1,5 +1,5 @@
 module Bundler
-  WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+  WINDOWS = RbConfig::CONFIG["host_os"] =~ /(msdos|mswin|djgpp|mingw)/
   FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/
   NULL    = WINDOWS ? "NUL" : "/dev/null"
 end

data/lib/bundler/current_ruby.rb

@@ -27,6 +27,14 @@ module Bundler
       RUBY_VERSION =~ /^2\.2/
     end
 
+    def on_23?
+      RUBY_VERSION =~ /^2\.3/
+    end
+
+    def on_2?
+      on_20? || on_21? || on_22? || on_23?
+    end
+
     def ruby?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev")
     end
@@ -51,6 +59,14 @@ module Bundler
       ruby? && on_22?
     end
 
+    def ruby_23?
+      ruby? && on_23?
+    end
+
+    def ruby_2?
+      ruby? && on_2?
+    end
+
     def mri?
       !mswin? && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
     end
@@ -75,6 +91,10 @@ module Bundler
       mri? && on_22?
     end
 
+    def mri_23?
+      mri? && on_23?
+    end
+
     def rbx?
       ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
     end
@@ -119,8 +139,12 @@ module Bundler
       mswin? && on_22?
     end
 
+    def mswin_23?
+      mswin? && on_23?
+    end
+
     def mswin64?
-      Bundler::WINDOWS && Gem::Platform.local.os == "mswin64" && Gem::Platform.local.cpu == 'x64'
+      Bundler::WINDOWS && Gem::Platform.local.os == "mswin64" && Gem::Platform.local.cpu == "x64"
     end
 
     def mswin64_19?
@@ -139,8 +163,12 @@ module Bundler
       mswin64? && on_22?
     end
 
+    def mswin64_23?
+      mswin64? && on_23?
+    end
+
     def mingw?
-      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu != 'x64'
+      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu != "x64"
     end
 
     def mingw_18?
@@ -163,8 +191,12 @@ module Bundler
       mingw? && on_22?
     end
 
+    def mingw_23?
+      mingw? && on_23?
+    end
+
     def x64_mingw?
-      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == 'x64'
+      Bundler::WINDOWS && Gem::Platform.local.os == "mingw32" && Gem::Platform.local.cpu == "x64"
     end
 
     def x64_mingw_20?
@@ -179,5 +211,8 @@ module Bundler
       x64_mingw? && on_22?
     end
 
+    def x64_mingw_23?
+      x64_mingw? && on_23?
+    end
   end
 end