bundler 1.10.6 → 1.11.2

data/lib/bundler/cli/config.rb

@@ -1,87 +1,100 @@
 module Bundler
   class CLI::Config
-    attr_reader :options, :thor
+    attr_reader :name, :options, :scope, :thor
     attr_accessor :args
 
     def initialize(options, args, thor)
       @options = options
       @args = args
       @thor = thor
+      @name = peek = args.shift
+      @scope = "global"
+      if peek && peek =~ /^\-\-/
+        @name = args.shift
+        @scope = $'
+      end
     end
 
     def run
-      peek = args.shift
+      unless name
+        confirm_all
+        return
+      end
 
-      if peek && peek =~ /^\-\-/
-        name, scope = args.shift, $'
-      else
-        name, scope = peek, "global"
+      unless valid_scope?(scope)
+        Bundler.ui.error "Invalid scope --#{scope} given. Please use --local or --global."
+        exit 1
       end
 
-      unless name
-        Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
+      if scope == "delete"
+        Bundler.settings.set_local(name, nil)
+        Bundler.settings.set_global(name, nil)
+        return
+      end
 
-        Bundler.settings.all.each do |setting|
-          Bundler.ui.confirm "#{setting}"
-          thor.with_padding do
-            Bundler.settings.pretty_values_for(setting).each do |line|
-              Bundler.ui.info line
-            end
-          end
-          Bundler.ui.confirm ""
-        end
+      if args.empty?
+        confirm(name)
         return
       end
 
-      case scope
-      when "delete"
-        Bundler.settings.set_local(name, nil)
-        Bundler.settings.set_global(name, nil)
-      when "local", "global"
-        if args.empty?
-          Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used"
-          thor.with_padding do
-            Bundler.settings.pretty_values_for(name).each { |line| Bundler.ui.info line }
-          end
-          return
-        end
+      Bundler.ui.info(message) if message
+      Bundler.settings.send("set_#{scope}", name, new_value)
+    end
 
-        new_value = args.join(" ")
-        locations = Bundler.settings.locations(name)
+  private
 
-        if scope == "global"
-          if locations[:local]
-            Bundler.ui.info "Your application has set #{name} to #{locations[:local].inspect}. " \
-              "This will override the global value you are currently setting"
-          end
+    def confirm_all
+      Bundler.ui.confirm "Settings are listed in order of priority. The top value will be used.\n"
+      Bundler.settings.all.each do |setting|
+        Bundler.ui.confirm "#{setting}"
+        show_pretty_values_for(setting)
+        Bundler.ui.confirm ""
+      end
+    end
 
-          if locations[:env]
-            Bundler.ui.info "You have a bundler environment variable for #{name} set to " \
-              "#{locations[:env].inspect}. This will take precedence over the global value you are setting"
-          end
+    def confirm(name)
+      Bundler.ui.confirm "Settings for `#{name}` in order of priority. The top value will be used"
+      show_pretty_values_for(name)
+    end
 
-          if locations[:global] && locations[:global] != new_value
-            Bundler.ui.info "You are replacing the current global value of #{name}, which is currently " \
-              "#{locations[:global].inspect}"
-          end
-        end
+    def new_value
+      pathname = Pathname.new(args.join(" "))
+      if name.match(/\Alocal\./) && pathname.directory?
+        pathname.expand_path.to_s
+      else
+        args.join(" ")
+      end
+    end
 
-        if scope == "local" && locations[:local] != new_value
-          Bundler.ui.info "You are replacing the current local value of #{name}, which is currently " \
-            "#{locations[:local].inspect}"
+    def message
+      locations = Bundler.settings.locations(name)
+      if scope == "global"
+        if locations[:local]
+          "Your application has set #{name} to #{locations[:local].inspect}. " \
+            "This will override the global value you are currently setting"
+        elsif locations[:env]
+          "You have a bundler environment variable for #{name} set to " \
+            "#{locations[:env].inspect}. This will take precedence over the global value you are setting"
+        elsif locations[:global] && locations[:global] != args.join(" ")
+          "You are replacing the current global value of #{name}, which is currently " \
+            "#{locations[:global].inspect}"
         end
+      elsif scope == "local" && locations[:local] != args.join(" ")
+        "You are replacing the current local value of #{name}, which is currently " \
+          "#{locations[:local].inspect}"
+      end
+    end
 
-        if name.match(/\Alocal\./)
-          pathname = Pathname.new(args.join(" "))
-          new_value = pathname.expand_path.to_s if pathname.directory?
+    def show_pretty_values_for(setting)
+      thor.with_padding do
+        Bundler.settings.pretty_values_for(setting).each do |line|
+          Bundler.ui.info line
         end
-
-        Bundler.settings.send("set_#{scope}", name, new_value)
-      else
-        Bundler.ui.error "Invalid scope --#{scope} given. Please use --local or --global."
-        exit 1
       end
     end
 
+    def valid_scope?(scope)
+      %w(delete local global).include?(scope)
+    end
   end
 end

data/lib/bundler/cli/console.rb

@@ -7,10 +7,10 @@ module Bundler
     end
 
     def run
-      group ? Bundler.require(:default, *(group.split.map! {|g| g.to_sym })) : Bundler.require
+      group ? Bundler.require(:default, *(group.split.map!(&:to_sym))) : Bundler.require
       ARGV.clear
 
-      console = get_console(Bundler.settings[:console] || 'irb')
+      console = get_console(Bundler.settings[:console] || "irb")
       console.start
     end
 
@@ -18,21 +18,21 @@ module Bundler
       require name
       get_constant(name)
     rescue LoadError
-      Bundler.ui.error "Couldn't load console #{name}"
-      get_constant('irb')
+      Bundler.ui.error "Couldn't load console #{name}, falling back to irb"
+      require "irb"
+      get_constant("irb")
     end
 
     def get_constant(name)
       const_name = {
-        'pry'  => :Pry,
-        'ripl' => :Ripl,
-        'irb'  => :IRB,
+        "pry"  => :Pry,
+        "ripl" => :Ripl,
+        "irb"  => :IRB,
       }[name]
       Object.const_get(const_name)
     rescue NameError
       Bundler.ui.error "Could not find constant #{const_name}"
       exit 1
     end
-
   end
 end

data/lib/bundler/cli/exec.rb

@@ -1,3 +1,5 @@
+require "bundler/current_ruby"
+
 module Bundler
   class CLI::Exec
     attr_reader :options, :args, :cmd
@@ -7,7 +9,7 @@ module Bundler
       @cmd = args.shift
       @args = args
 
-      if RUBY_VERSION >= "2.0"
+      if Bundler.current_ruby.ruby_2? && !Bundler.current_ruby.jruby?
         @args << { :close_others => !options.keep_file_descriptors? }
       elsif options.keep_file_descriptors?
         Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec."
@@ -31,20 +33,19 @@ module Bundler
       Bundler.load.setup_environment
       Bundler.ui = nil
       Kernel.exec(@cmd, *args)
-    rescue Errno::EACCES
+    rescue Errno::EACCES, Errno::ENOEXEC
       Bundler.ui = ui
       Bundler.ui.error "bundler: not executable: #{cmd}"
       exit 126
     rescue Errno::ENOENT
       Bundler.ui = ui
       Bundler.ui.error "bundler: command not found: #{cmd}"
-      Bundler.ui.warn  "Install missing gem executables with `bundle install`"
+      Bundler.ui.warn "Install missing gem executables with `bundle install`"
       exit 127
     rescue ArgumentError
       Bundler.ui = ui
       Bundler.ui.error "bundler: exec needs a command to run"
       exit 128
     end
-
   end
 end

data/lib/bundler/cli/gem.rb

@@ -1,7 +1,12 @@
-require 'pathname'
+require "pathname"
 
 module Bundler
   class CLI::Gem
+    TEST_FRAMEWORK_VERSIONS = {
+      "rspec" => "3.0",
+      "minitest" => "5.0"
+    }
+
     attr_reader :options, :gem_name, :thor, :name, :target
 
     def initialize(options, gem_name, thor)
@@ -10,7 +15,7 @@ module Bundler
       @thor = thor
 
       @name = @gem_name
-      @target = Pathname.pwd.join(gem_name)
+      @target = SharedHelpers.pwd.join(gem_name)
 
       validate_ext_name if options[:ext]
     end
@@ -18,10 +23,11 @@ module Bundler
     def run
       Bundler.ui.confirm "Creating gem '#{name}'..."
 
-      underscored_name = name.tr('-', '_')
-      namespaced_path = name.tr('-', '/')
-      constant_name = name.gsub(/-[_-]*(?![_-]|$)/){ '::' }.gsub(/([_-]+|(::)|^)(.|$)/){ $2.to_s + $3.upcase }
-      constant_array = constant_name.split('::')
+      underscored_name = name.tr("-", "_")
+      namespaced_path = name.tr("-", "/")
+      constant_name = name.gsub(/-[_-]*(?![_-]|$)/) { "::" }.gsub(/([_-]+|(::)|^)(.|$)/) { $2.to_s + $3.upcase }
+      constant_array = constant_name.split("::")
+      test_task = options[:test] == "minitest" ? "test" : "spec"
 
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
@@ -36,6 +42,7 @@ module Bundler
         :author           => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
         :email            => git_user_email.empty? ? "TODO: Write your email address" : git_user_email,
         :test             => options[:test],
+        :test_task        => test_task,
         :ext              => options[:ext],
         :bin              => options[:bin],
         :bundler_version  => bundler_dependency_version
@@ -54,45 +61,25 @@ module Bundler
         "bin/setup.tt" => "bin/setup"
       }
 
-      executables = %w[
+      executables = %w(
         bin/console
         bin/setup
-      ]
-
-      if ask_and_set(:coc, "Do you want to include a code of conduct in gems you generate?",
-          "Codes of conduct can increase contributions to your project by contributors who " \
-          "prefer collaborative, safe spaces. You can read more about the code of conduct at " \
-          "contributor-covenant.org. Having a code of conduct means agreeing to the responsibility " \
-          "of enforcing it, so be sure that you are prepared to do that. For suggestions about " \
-          "how to enforce codes of conduct, see bit.ly/coc-enforcement."
-        )
-        config[:coc] = true
-        Bundler.ui.info "Code of conduct enabled in config"
-        templates.merge!("CODE_OF_CONDUCT.md.tt" => "CODE_OF_CONDUCT.md")
-      end
-
-      if ask_and_set(:mit, "Do you want to license your code permissively under the MIT license?",
-          "This means that any other developer or company will be legally allowed to use your code " \
-          "for free as long as they admit you created it. You can read more about the MIT license " \
-          "at choosealicense.com/licenses/mit."
-        )
-        config[:mit] = true
-        Bundler.ui.info "MIT License enabled in config"
-        templates.merge!("LICENSE.txt.tt" => "LICENSE.txt")
-      end
+      )
 
       if test_framework = ask_and_set_test_framework
         config[:test] = test_framework
+        config[:test_framework_version] = TEST_FRAMEWORK_VERSIONS[test_framework]
+
         templates.merge!(".travis.yml.tt" => ".travis.yml")
 
         case test_framework
-        when 'rspec'
+        when "rspec"
           templates.merge!(
             "rspec.tt" => ".rspec",
             "spec/spec_helper.rb.tt" => "spec/spec_helper.rb",
             "spec/newgem_spec.rb.tt" => "spec/#{namespaced_path}_spec.rb"
           )
-        when 'minitest'
+        when "minitest"
           templates.merge!(
             "test/test_helper.rb.tt" => "test/test_helper.rb",
             "test/newgem_test.rb.tt" => "test/#{namespaced_path}_test.rb"
@@ -100,6 +87,28 @@ module Bundler
         end
       end
 
+      if ask_and_set(:mit, "Do you want to license your code permissively under the MIT license?",
+        "This means that any other developer or company will be legally allowed to use your code " \
+        "for free as long as they admit you created it. You can read more about the MIT license " \
+        "at http://choosealicense.com/licenses/mit.")
+        config[:mit] = true
+        Bundler.ui.info "MIT License enabled in config"
+        templates.merge!("LICENSE.txt.tt" => "LICENSE.txt")
+      end
+
+      if ask_and_set(:coc, "Do you want to include a code of conduct in gems you generate?",
+        "Codes of conduct can increase contributions to your project by contributors who " \
+        "prefer collaborative, safe spaces. You can read more about the code of conduct at " \
+        "contributor-covenant.org. Having a code of conduct means agreeing to the responsibility " \
+        "of enforcing it, so be sure that you are prepared to do that. Be sure that your email " \
+        "address is specified as a contact in the generated code of conduct so that people know " \
+        "who to contact in case of a violation. For suggestions about " \
+        "how to enforce codes of conduct, see http://bit.ly/coc-enforcement.")
+        config[:coc] = true
+        Bundler.ui.info "Code of conduct enabled in config"
+        templates.merge!("CODE_OF_CONDUCT.md.tt" => "CODE_OF_CONDUCT.md")
+      end
+
       templates.merge!("exe/newgem.tt" => "exe/#{name}") if options[:bin]
 
       if options[:ext]
@@ -121,7 +130,10 @@ module Bundler
       end
 
       Bundler.ui.info "Initializing git repo in #{target}"
-      Dir.chdir(target) { `git init`; `git add .` }
+      Dir.chdir(target) do
+        `git init`
+        `git add .`
+      end
 
       if options[:edit]
         # Open gemspec in editor
@@ -129,14 +141,15 @@ module Bundler
       end
     end
 
-    private
+  private
 
     def resolve_name(name)
-      Pathname.pwd.join(name).basename.to_s
+      SharedHelpers.pwd.join(name).basename.to_s
     end
 
     def ask_and_set(key, header, message)
-      choice = options[key] || Bundler.settings["gem.#{key}"]
+      choice = options[key]
+      choice = Bundler.settings["gem.#{key}"] if choice.nil?
 
       if choice.nil?
         Bundler.ui.confirm header
@@ -148,7 +161,7 @@ module Bundler
     end
 
     def validate_ext_name
-      return unless gem_name.index('-')
+      return unless gem_name.index("-")
 
       Bundler.ui.error "You have specified a gem name which does not conform to the \n" \
                        "naming guidelines for C extensions. For more information, \n" \
@@ -181,11 +194,11 @@ module Bundler
     def bundler_dependency_version
       v = Gem::Version.new(Bundler::VERSION)
       req = v.segments[0..1]
-      req << 'a' if v.prerelease?
+      req << "a" if v.prerelease?
       req.join(".")
     end
 
-    def ensure_safe_gem_name name, constant_array
+    def ensure_safe_gem_name(name, constant_array)
       if name =~ /^\d/
         Bundler.ui.error "Invalid gem name #{name} Please give a name which does not start with numbers."
         exit 1
@@ -194,6 +207,5 @@ module Bundler
         exit 1
       end
     end
-
   end
 end

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