bundler 1.7.15 → 1.8.0.pre

data/lib/bundler/cli/clean.rb

@@ -7,10 +7,17 @@ module Bundler
     end
 
     def run
-      if Bundler.settings[:path] || options[:force]
-        Bundler.load.clean(options[:"dry-run"])
-      else
-        Bundler.ui.error "Can only use bundle clean when --path is set or --force is set"
+      require_path_or_force
+      Bundler.load.clean(options[:"dry-run"])
+    end
+
+  protected
+
+    def require_path_or_force
+      if !Bundler.settings[:path] && !options[:force]
+        Bundler.ui.error "Cleaning all the gems on your system is dangerous! " \
+          "If you're sure you want to remove every system gem not in this " \
+          "bundle, run `bundle clean --force`."
         exit 1
       end
     end

data/lib/bundler/cli/common.rb

@@ -25,6 +25,8 @@ module Bundler
       else
         ask_for_spec_from(specs)
       end
+    rescue RegexpError
+      raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
     end
 
     def self.ask_for_spec_from(specs)

data/lib/bundler/cli/console.rb

@@ -1,41 +1,37 @@
 module Bundler
   class CLI::Console
-    attr_reader :options, :group, :consoles
-    def initialize(options, group, consoles)
+    attr_reader :options, :group
+    def initialize(options, group)
       @options = options
       @group = group
-      @consoles = consoles
     end
 
     def run
       group ? Bundler.require(:default, *(group.split.map! {|g| g.to_sym })) : Bundler.require
       ARGV.clear
 
-      preferred = Bundler.settings[:console] || 'irb'
-
-      # See if console is available
-      begin
-        require preferred || true
-      rescue LoadError
-        # Is it in Gemfile?
-        Bundler.ui.error "Could not load the #{preferred} console"
-        Bundler.ui.info "Falling back on IRB..."
-
-        require 'irb'
-        preferred = 'irb'
-      end
-
-      constant = consoles[preferred]
+      console = get_console(Bundler.settings[:console] || 'irb')
+      console.start
+    end
 
-      console = begin
-                  Object.const_get(constant)
-                rescue NameError => e
-                  Bundler.ui.error e.inspect
-                  Bundler.ui.error "Could not load the #{constant} console"
-                  return
-                end
+    def get_console(name)
+      require name
+      get_constant(name)
+    rescue LoadError
+      Bundler.ui.error "Couldn't load console #{name}"
+      get_constant('irb')
+    end
 
-      console.start
+    def get_constant(name)
+      const_name = {
+        '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

data/lib/bundler/cli/exec.rb

@@ -1,36 +1,43 @@
 module Bundler
   class CLI::Exec
-    attr_reader :options, :args
+    attr_reader :options, :args, :cmd
 
     def initialize(options, args)
       @options = options
+      @cmd = args.shift
       @args = args
+
+      if RUBY_VERSION >= "2.0"
+        @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."
+      end
     end
 
     def run
-      Bundler.definition.validate_ruby!
-      Bundler.load.setup_environment
+      raise ArgumentError if cmd.nil?
 
-      begin
-        if RUBY_VERSION >= "2.0"
-          @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."
-        end
-
-        # Run
-        Kernel.exec(*args)
-      rescue Errno::EACCES
-        Bundler.ui.error "bundler: not executable: #{args.first}"
-        exit 126
-      rescue Errno::ENOENT
-        Bundler.ui.error "bundler: command not found: #{args.first}"
-        Bundler.ui.warn  "Install missing gem executables with `bundle install`"
-        exit 127
-      rescue ArgumentError
-        Bundler.ui.error "bundler: exec needs a command to run"
-        exit 128
+      # First, try to exec directly to something in PATH
+      SharedHelpers.set_bundle_environment
+      bin_path = Bundler.which(@cmd)
+      if bin_path
+        Kernel.exec(bin_path, *args)
       end
+
+      # If that didn't work, set up the whole bundle
+      Bundler.definition.validate_ruby!
+      Bundler.load.setup_environment
+      Kernel.exec(@cmd, *args)
+    rescue Errno::EACCES
+      Bundler.ui.error "bundler: not executable: #{cmd}"
+      exit 126
+    rescue Errno::ENOENT
+      Bundler.ui.error "bundler: command not found: #{cmd}"
+      Bundler.ui.warn  "Install missing gem executables with `bundle install`"
+      exit 127
+    rescue ArgumentError
+      Bundler.ui.error "bundler: exec needs a command to run"
+      exit 128
     end
 
   end

data/lib/bundler/cli/gem.rb

@@ -1,30 +1,31 @@
+require 'pathname'
+
 module Bundler
   class CLI::Gem
-    attr_reader :options, :gem_name, :thor
+    attr_reader :options, :gem_name, :thor, :name, :target
+
     def initialize(options, gem_name, thor)
       @options = options
-      @gem_name = gem_name
+      @gem_name = resolve_name(gem_name)
       @thor = thor
+
+      @name = @gem_name
+      @target = Pathname.pwd.join(gem_name)
+
+      validate_ext_name if options[:ext]
     end
 
     def run
-      if options[:ext] && 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" \
-                         "see the 'Extension Naming' section at the following URL:\n" \
-                         "http://guides.rubygems.org/gems-with-extensions/\n"
-        exit 1
-      end
+      Bundler.ui.confirm "Creating gem '#{name}'..."
 
-      name = gem_name.chomp("/") # remove trailing slash if present
       underscored_name = name.tr('-', '_')
       namespaced_path = name.tr('-', '/')
-      target = File.join(Dir.pwd, name)
       constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
       constant_name = constant_name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
       constant_array = constant_name.split('::')
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
+
       opts = {
         :name             => name,
         :underscored_name => underscored_name,
@@ -35,44 +36,131 @@ 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],
-        :ext              => options[:ext]
+        :ext              => options[:ext],
+        :bin              => options[:bin]
+      }
+
+      templates = {
+        "Gemfile.tt" => "Gemfile",
+        "gitignore.tt" => ".gitignore",
+        "lib/newgem.rb.tt" => "lib/#{namespaced_path}.rb",
+        "lib/newgem/version.rb.tt" => "lib/#{namespaced_path}/version.rb",
+        "newgem.gemspec.tt" => "#{name}.gemspec",
+        "Rakefile.tt" => "Rakefile",
+        "README.md.tt" => "README.md",
+        "bin/console.tt" => "bin/console",
+        "bin/setup.tt" => "bin/setup"
       }
-      gemspec_dest = File.join(target, "#{name}.gemspec")
-      thor.template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                             opts)
-      thor.template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),                            opts)
-      thor.template(File.join("newgem/LICENSE.txt.tt"),           File.join(target, "LICENSE.txt"),                         opts)
-      thor.template(File.join("newgem/README.md.tt"),             File.join(target, "README.md"),                           opts)
-      thor.template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),                          opts)
-      thor.template(File.join("newgem/newgem.gemspec.tt"),        gemspec_dest,                                             opts)
-      thor.template(File.join("newgem/lib/newgem.rb.tt"),         File.join(target, "lib/#{namespaced_path}.rb"),           opts)
-      thor.template(File.join("newgem/lib/newgem/version.rb.tt"), File.join(target, "lib/#{namespaced_path}/version.rb"),   opts)
-      if options[:bin]
-        thor.template(File.join("newgem/bin/newgem.tt"),          File.join(target, 'bin', name),                           opts)
+
+      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."
+        )
+        templates.merge!("CODE_OF_CONDUCT.md.tt" => "CODE_OF_CONDUCT.md")
       end
-      case options[:test]
-      when 'rspec'
-        thor.template(File.join("newgem/rspec.tt"),               File.join(target, ".rspec"),                              opts)
-        thor.template(File.join("newgem/spec/spec_helper.rb.tt"), File.join(target, "spec/spec_helper.rb"),                 opts)
-        thor.template(File.join("newgem/spec/newgem_spec.rb.tt"), File.join(target, "spec/#{namespaced_path}_spec.rb"),     opts)
-      when 'minitest'
-        thor.template(File.join("newgem/test/minitest_helper.rb.tt"), File.join(target, "test/minitest_helper.rb"),         opts)
-        thor.template(File.join("newgem/test/test_newgem.rb.tt"),     File.join(target, "test/test_#{namespaced_path}.rb"), opts)
+
+      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."
+        )
+        templates.merge!("LICENSE.txt.tt" => "LICENSE.txt")
       end
-      if options[:test]
-        thor.template(File.join("newgem/.travis.yml.tt"),         File.join(target, ".travis.yml"),            opts)
+
+      if test_framework = ask_and_set_test_framework
+        templates.merge!(".travis.yml.tt" => ".travis.yml")
+
+        case test_framework
+        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'
+          templates.merge!(
+            "test/minitest_helper.rb.tt" => "test/minitest_helper.rb",
+            "test/test_newgem.rb.tt" => "test/test_#{namespaced_path}.rb"
+          )
+        end
       end
+
+      templates.merge!("exe/newgem.tt" => "exe/#{name}") if options[:bin]
+
       if options[:ext]
-        thor.template(File.join("newgem/ext/newgem/extconf.rb.tt"), File.join(target, "ext/#{name}/extconf.rb"), opts)
-        thor.template(File.join("newgem/ext/newgem/newgem.h.tt"), File.join(target, "ext/#{name}/#{underscored_name}.h"), opts)
-        thor.template(File.join("newgem/ext/newgem/newgem.c.tt"), File.join(target, "ext/#{name}/#{underscored_name}.c"), opts)
+        templates.merge!(
+          "ext/newgem/extconf.rb.tt" => "ext/#{name}/extconf.rb",
+          "ext/newgem/newgem.h.tt" => "ext/#{name}/#{underscored_name}.h",
+          "ext/newgem/newgem.c.tt" => "ext/#{name}/#{underscored_name}.c"
+        )
+      end
+
+      templates.each do |src, dst|
+        thor.template("newgem/#{src}", target.join(dst), opts)
       end
+
       Bundler.ui.info "Initializing git repo in #{target}"
       Dir.chdir(target) { `git init`; `git add .` }
 
       if options[:edit]
-        thor.run("#{options["edit"]} \"#{gemspec_dest}\"")  # Open gemspec in editor
+        # Open gemspec in editor
+        thor.run("#{options["edit"]} \"#{target.join("#{name}.gemspec")}\"")
       end
     end
 
+    private
+
+    def resolve_name(name)
+      Pathname.pwd.join(name).basename.to_s
+    end
+
+    def ask_and_set(key, header, message)
+      result = options[key]
+      if !Bundler.settings.all.include?("gem.#{key}")
+        if result.nil?
+          Bundler.ui.confirm header
+          result = Bundler.ui.ask("#{message} y/(n):") == "y"
+        end
+
+        Bundler.settings.set_global("gem.#{key}", result)
+      end
+
+      result || Bundler.settings["gem.#{key}"]
+    end
+
+    def validate_ext_name
+      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" \
+                       "see the 'Extension Naming' section at the following URL:\n" \
+                       "http://guides.rubygems.org/gems-with-extensions/\n"
+      exit 1
+    end
+
+    def ask_and_set_test_framework
+      test_framework = options[:test] || Bundler.settings["gem.test"]
+      if test_framework.nil?
+        Bundler.ui.confirm "Do you want to generate tests with your gem?"
+        result = Bundler.ui.ask "Type 'rspec' or 'minitest' to generate those test files now and " \
+          "in the future. rspec/minitest/(none):"
+        if result =~ /rspec|minitest/
+          test_framework = result
+        else
+          test_framework = "false"
+        end
+      end
+
+      if Bundler.settings["gem.test"].nil?
+        Bundler.settings.set_global("gem.test", test_framework)
+      end
+
+      return if test_framework == "false"
+      test_framework
+    end
+
   end
 end

data/lib/bundler/cli/install.rb

@@ -44,7 +44,7 @@ module Bundler
                                  "before deploying."
         end
 
-        if Bundler.root.join("vendor/cache").exist?
+        if Bundler.app_cache.exist?
           options[:local] = true
         end
 
@@ -66,6 +66,7 @@ module Bundler
       Bundler.settings[:shebang]  = options["shebang"] if options["shebang"]
       Bundler.settings[:jobs]     = options["jobs"] if options["jobs"]
       Bundler.settings[:no_prune] = true if options["no-prune"]
+      Bundler.settings[:no_install] = true if options["no-install"]
       Bundler.settings[:clean]    = options["clean"] if options["clean"]
       Bundler.settings.without    = options[:without]
       Bundler::Fetcher.disable_endpoint = options["full-index"]
@@ -77,23 +78,24 @@ module Bundler
       definition = Bundler.definition
       definition.validate_ruby!
       Installer.install(Bundler.root, definition, options)
-      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"] && !Bundler.settings[:frozen]
+      Bundler.load.cache if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.settings[:frozen]
+
+      Bundler.ui.confirm "Bundle complete! #{dependencies_count_for(definition)}, #{gems_installed_for(definition)}."
+      confirm_without_groups
 
       if Bundler.settings[:path]
         absolute_path = File.expand_path(Bundler.settings[:path])
         relative_path = absolute_path.sub(File.expand_path('.'), '.')
-        Bundler.ui.confirm "Your bundle is complete!"
-        without_groups_messages
-        Bundler.ui.confirm "It was installed into #{relative_path}"
+        Bundler.ui.confirm "Bundled gems are installed into #{relative_path}."
       else
-        Bundler.ui.confirm "Your bundle is complete!"
-        without_groups_messages
         Bundler.ui.confirm "Use `bundle show [gemname]` to see where a bundled gem is installed."
       end
+
       Installer.post_install_messages.to_a.each do |name, msg|
         Bundler.ui.confirm "Post-install message from #{name}:"
         Bundler.ui.info msg
       end
+
       Installer.ambiguous_gems.to_a.each do |name, installed_from_uri, *also_found_in_uris|
         Bundler.ui.error "Warning: the gem '#{name}' was found in multiple sources."
         Bundler.ui.error "Installed from: #{installed_from_uri}"
@@ -111,7 +113,7 @@ module Bundler
       end
     rescue GemNotFound, VersionConflict => e
       if options[:local] && Bundler.app_cache.exist?
-        Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
+        Bundler.ui.warn "Some gems seem to be missing from your #{Bundler.settings.app_cache_path} directory."
       end
 
       unless Bundler.definition.has_rubygems_remotes?
@@ -133,11 +135,22 @@ module Bundler
         "application for all non-root users on this machine.", :wrap => true
     end
 
-    def without_groups_messages
+    def confirm_without_groups
       if Bundler.settings.without.any?
         require "bundler/cli/common"
         Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
       end
     end
+
+    def dependencies_count_for(definition)
+      count = definition.dependencies.count
+      "#{count} Gemfile #{count == 1 ? 'dependency' : 'dependencies'}"
+    end
+
+    def gems_installed_for(definition)
+      count = definition.specs.count
+      "#{count} #{count == 1 ? 'gem' : 'gems'} now installed"
+    end
+
   end
 end

data/lib/bundler/cli/outdated.rb

@@ -70,7 +70,7 @@ module Bundler
       end
 
       if out_count.zero?
-        Bundler.ui.info "Your bundle is up to date!\n"
+        Bundler.ui.info "Bundle up to date!\n"
       else
         exit 1
       end