bundler 1.9.10 → 1.10.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7ba9a5f037fd8b2267e68e4e626430415af1bad
-  data.tar.gz: d8a8a8c16b072a11b045ee0aa8a552ceafcc6efc
+  metadata.gz: a4128a621db3d926d6579de067a966664457734f
+  data.tar.gz: b0629f20a391f86092ce149087566e1f16ed7991
 SHA512:
-  metadata.gz: eff7b83bdb98b930a813a883b342040eee62223128c873b183923cdfcaaf9e3686ff07cf0a3472899e3fea03e884cc188049a7f37bab9d001f4dfc25675c6728
-  data.tar.gz: 876a966f750690227641524d8cd6bf4dc4d0b72c1ff6b3a92ba8514ab858e53d828de7da19c7fcfffff6fe0adef0af37105c838483514a974858c31a89412ee9
+  metadata.gz: 7000dfc488e2c0c88fd3e195803b2ba301004f97a91c1ab7c8d56a4b06391a7000a78f4b9cd429ede5be1d50d34e1e727cd363253ebae4478ef44fd922191d1b
+  data.tar.gz: e4da7e38155cc47bb60b9727445d36974c19faee89bdaa596dc0d195a57cd69ca9aeb4002b2712e9009c05f7ce6c8061bac5cc271b87bcab016ed21ca249f12f

data/.travis.yml

@@ -33,6 +33,7 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.8.7
+  - rbx-2
 
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:66 for the list of possible RGV values

data/CHANGELOG.md

@@ -1,26 +1,33 @@
-## 1.9.10 (2015-06-22)
+## 1.10.0.pre (2015-05-03)
 
 Features:
 
-  - the `BUNDLED WITH` section of lockfiles generated by 1.10+ will be preserved (@segiddins)
-
-## 1.9.9 (2015-05-16)
+  - support gem extensions built into any directory on RubyGems 2.2+ (#3582, @voxik)
+  - add 'bundler/inline' which provides a `gemfile` method (#3440, @segiddins)
+  - improved error reports for Gemfile errors (#3480, @segiddins)
+  - `lock` command (#3437, @segiddins)
+  - add `ignore_messages` config to suppress post-install text (#3510, @pducks32)
+  - improve `gem` minitest template (#3513, #3515, @arthurnn)
+  - add `install --force` to re-install installed gems (#3519, @segiddins)
+  - show more `outdated` information, including groups (@smlance, @indirect)
+  - add optional groups to the Gemfile (#3531, @jhass)
+  - accept glob argument to `gemspec` in Gemfile (#3464, @pjump)
+  - make timeouts and retries configurable via `config` (#3601, @pducks32)
+  - add `install_if` Gemfile method for conditional installs (#3611, @segiddins)
 
 Bugfixes:
 
-  - read mirror and credential settings from older versions (#3557, @Strech)
-
-## 1.9.8 (2015-05-12)
-
-Bugfixes:
+  - standalone mode now uses builtin gems correctly (#3610, @segiddins)
+  - fix `rake spec:deps` on MinGW Ruby 2.0+ (#3487, @marutosi)
+  - remember all y/n answers when generating gems (#3579, @pducks32)
 
-  - fix regression in sudo mode introduced by 1.9.7 (#3642, @segiddins)
+Performance:
 
-## 1.9.7 (2015-05-11)
+  - use RubyGems stub specifications when possible (#3580, @segiddins)
 
-Bugfixes:
+Deprecations:
 
-  - always clean up tmp dirs (#3277, @hone, @indirect, @segiddins)
+  - deprecated the (never enabled) `bundle_ruby` binary (@smlance)
 
 ## 1.9.6 (2015-05-02)
 
@@ -76,6 +83,7 @@ Bugfixes:
 
   - make Bundler.which stop finding directories (@nohoho)
   - handle Bundler prereleases correctly (#3470, @segiddins)
+  - add before_install to .travis.yml template for new gems (@kodnin)
 
 ## 1.9.0.pre.1 (2015-03-11)
 

data/Rakefile

@@ -98,8 +98,8 @@ namespace :spec do
     end
 
     deps.sort_by{|name, _| name }.each do |name, version|
-      sh "#{Gem.ruby} -S gem list -i '^#{name}$' -v '#{version}' || " \
-         "#{Gem.ruby} -S gem install #{name} -v '#{version}' --no-ri --no-rdoc"
+      sh %{#{Gem.ruby} -S gem list -i "^#{name}$" -v "#{version}" || } +
+         %{#{Gem.ruby} -S gem install #{name} -v "#{version}" --no-ri --no-rdoc}
     end
 
     # Download and install gems used inside tests

data/bin/bundle_ruby

@@ -41,6 +41,8 @@ module Bundler
   end
 end
 
+STDERR.puts "Warning: bundle_ruby will be deprecated in Bundler 2.0.0."
+
 dsl = Bundler::Dsl.new
 begin
   dsl.eval_gemfile(Bundler::SharedHelpers.default_gemfile)

data/bin/bundler

@@ -6,7 +6,7 @@ Signal.trap("INT") { exit 1 }
 require 'bundler'
 # Check if an older version of bundler is installed
 $LOAD_PATH.each do |path|
-  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
+  if path =~ %r'/bundler-0\.(\d+)' && $1.to_i < 9
     err = "Looks like you have a version of bundler that's older than 0.9.\n"
     err << "Please remove your old versions.\n"
     err << "An easy way to do this is by running `gem cleanup bundler`."

data/lib/bundler.rb

@@ -12,7 +12,6 @@ module Bundler
   preserve_gem_path
   ORIGINAL_ENV = ENV.to_hash
 
-  autoload :AnonymizableURI,       'bundler/anonymizable_uri'
   autoload :Definition,            'bundler/definition'
   autoload :Dependency,            'bundler/dependency'
   autoload :DepProxy,              'bundler/dep_proxy'
@@ -121,12 +120,7 @@ module Bundler
         # Load all groups, but only once
         @setup = load.setup
       else
-        @completed_groups ||= []
-        # Figure out which groups haven't been loaded yet
-        unloaded = groups - @completed_groups
-        # Record groups that are now loaded
-        @completed_groups = groups
-        unloaded.any? ? load.setup(*groups) : load
+        load.setup(*groups)
       end
     end
 
@@ -212,11 +206,13 @@ module Bundler
     end
 
     def tmp(name = Process.pid.to_s)
-      Pathname.new(Dir.mktmpdir(["bundler", name]))
+      @tmp ||= Pathname.new Dir.mktmpdir("bundler")
+      @tmp.join(name)
     end
 
-    def rm_rf(path)
-      FileUtils.remove_entry_secure(path) if path && File.exist?(path)
+    def cleanup
+      FileUtils.remove_entry_secure(@tmp) if defined?(@tmp) && @tmp
+    rescue
     end
 
     def settings

data/lib/bundler/cli.rb

@@ -11,6 +11,8 @@ module Bundler
     rescue Exception => e
       Bundler.ui = UI::Shell.new
       raise e
+    ensure
+      Bundler.cleanup
     end
 
     def initialize(*args)
@@ -18,7 +20,7 @@ module Bundler
       current_cmd = args.last[:current_command].name
       custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
       ENV['BUNDLE_GEMFILE']   = File.expand_path(custom_gemfile) if custom_gemfile
-      Bundler::Retry.attempts = options[:retry] || Bundler.settings[:retry] || Bundler::Retry::DEFAULT_ATTEMPTS
+      Bundler.settings[:retry] = options[:retry] if options[:retry]
       Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
       auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
     rescue UnknownArgumentError => e
@@ -132,6 +134,8 @@ module Bundler
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     method_option "no-cache", :type => :boolean, :banner =>
       "Don't update the existing gem cache."
+    method_option "force", :type => :boolean, :banner =>
+      "Force downloading every gem."
     method_option "no-prune", :type => :boolean, :banner =>
       "Don't remove stale gems from the cache."
     method_option "path", :type => :string, :banner =>
@@ -149,6 +153,8 @@ module Bundler
         Bundler.rubygems.security_policy_keys.join('|')
     method_option "without", :type => :array, :banner =>
       "Exclude gems that are part of the specified named group."
+    method_option "with", :type => :array, :banner =>
+      "Include gems that are part of the specified named group."
 
     def install
       require 'bundler/cli/install'
@@ -173,6 +179,8 @@ module Bundler
       "Only output warnings and errors."
     method_option "source", :type => :array, :banner =>
       "Update a specific source (and all gems associated with it)"
+    method_option "force", :type => :boolean, :banner =>
+      "Force downloading every gem."
     def update(*gems)
       require 'bundler/cli/update'
       Update.new(options, gems).run
@@ -377,6 +385,20 @@ module Bundler
       Inject.new(options, name, version, gems).run
     end
 
+    desc "lock", "Creates a lockfile without installing"
+    method_option "update", :type => :boolean, :default => false, :banner =>
+      "ignore the existing lockfile"
+    method_option "local", :type => :boolean, :default => false, :banner =>
+      "do not attempt to fetch remote gemspecs and use the local gem cache only"
+    method_option "print", :type => :boolean, :default => false, :banner =>
+      "print the lockfile to STDOUT instead of writing to the file system"
+    method_option "lockfile", :type => :string, :default => nil, :banner =>
+      "the path the lockfile should be written to"
+    def lock
+      require 'bundler/cli/lock'
+      Lock.new(options).run
+    end
+
     desc "env", "Print information about the environment Bundler is running under"
     def env
       Env.new.write($stdout)

data/lib/bundler/cli/gem.rb

@@ -66,6 +66,7 @@ module Bundler
           "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."
         )
+        Bundler.ui.info "Code of conduct enabled in config"
         templates.merge!("CODE_OF_CONDUCT.md.tt" => "CODE_OF_CONDUCT.md")
       end
 
@@ -75,10 +76,12 @@ module Bundler
           "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
         templates.merge!(".travis.yml.tt" => ".travis.yml")
 
         case test_framework
@@ -90,8 +93,8 @@ module Bundler
           )
         when 'minitest'
           templates.merge!(
-            "test/minitest_helper.rb.tt" => "test/minitest_helper.rb",
-            "test/test_newgem.rb.tt" => "test/test_#{namespaced_path}.rb"
+            "test/test_helper.rb.tt" => "test/test_helper.rb",
+            "test/newgem_test.rb.tt" => "test/#{namespaced_path}_test.rb"
           )
         end
       end

data/lib/bundler/cli/install.rb

@@ -10,10 +10,35 @@ module Bundler
 
       warn_if_root
 
-      if options[:without]
-        options[:without] = options[:without].map{|g| g.tr(' ', ':') }
+      [:with, :without].each do |option|
+        if options[option]
+          options[option] = options[option].join(":").tr(" ", ":").split(":")
+        end
+      end
+
+      if options[:without] && options[:with]
+        conflicting_groups = options[:without] & options[:with]
+        unless conflicting_groups.empty?
+          Bundler.ui.error "You can't list a group in both, --with and --without." \
+          "The offending groups are: #{conflicting_groups.join(", ")}."
+          exit 1
+        end
       end
 
+      Bundler.settings.with    = [] if options[:with] && options[:with].empty?
+      Bundler.settings.without = [] if options[:without] && options[:without].empty?
+
+      with = options.fetch("with", [])
+      with |= Bundler.settings.with.map {|group| group.to_s }
+      with -= options[:without] if options[:without]
+
+      without = options.fetch("without", [])
+      without |= Bundler.settings.without.map {|group| group.to_s }
+      without -= options[:with] if options[:with]
+
+      options[:with]    = with
+      options[:without] = without
+
       ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
 
       # Just disable color in deployment mode
@@ -69,6 +94,7 @@ module Bundler
       Bundler.settings[:no_install] = true if options["no-install"]
       Bundler.settings[:clean]    = options["clean"] if options["clean"]
       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
 
@@ -91,9 +117,10 @@ module Bundler
         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
+      unless Bundler.settings["ignore_messages"]
+        Installer.post_install_messages.to_a.each do |name, msg|
+          print_post_install_message(name, msg) unless Bundler.settings["ignore_messages.#{name}"]
+        end
       end
 
       Installer.ambiguous_gems.to_a.each do |name, installed_from_uri, *also_found_in_uris|
@@ -152,5 +179,10 @@ module Bundler
       "#{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

@@ -0,0 +1,36 @@
+module Bundler
+  class CLI::Lock
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      unless Bundler.default_gemfile
+        Bundler.ui.error "Unable to find a Gemfile to lock"
+        exit 1
+      end
+
+      print = options[:print]
+      ui = Bundler.ui
+      Bundler.ui = UI::Silent.new if print
+
+      unlock = options[:update]
+      definition = Bundler.definition(unlock)
+      definition.resolve_remotely! unless options[:local]
+
+      if print
+        puts definition.to_lock
+      else
+        file = options[:lockfile]
+        file = file ? File.expand_path(file) : Bundler.default_lockfile
+        puts "Writing lockfile to #{file}"
+        definition.lock(file)
+      end
+
+      Bundler.ui = ui
+    end
+
+  end
+end

data/lib/bundler/cli/outdated.rb

@@ -62,8 +62,15 @@ module Bundler
 
           spec_version    = "#{active_spec.version}#{active_spec.git_version}"
           current_version = "#{current_spec.version}#{current_spec.git_version}"
-          dependency_version = %|Gemfile specifies "#{dependency.requirement}"| if dependency && dependency.specific?
-          Bundler.ui.info "  * #{active_spec.name} (#{spec_version} > #{current_version}) #{dependency_version}".rstrip
+          dependency_version = %|, requested #{dependency.requirement}| if dependency && dependency.specific?
+
+          if dependency
+            groups = dependency.groups.join(", ")
+            pl = (dependency.groups.length > 1) ? "s" : ""
+            groups = " in group#{pl} \"#{groups}\""
+          end
+
+          Bundler.ui.info "  * #{active_spec.name} (newest #{spec_version}, installed #{current_version}#{dependency_version})#{groups}".rstrip
           out_count += 1
         end
         Bundler.ui.debug "from #{active_spec.loaded_from}"

data/lib/bundler/definition.rb

@@ -43,10 +43,11 @@ module Bundler
     # @param unlock [Hash, Boolean, nil] Gems that have been requested
     #   to be updated or true if all gems should be updated
     # @param ruby_version [Bundler::RubyVersion, nil] Requested Ruby Version
-    def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil)
+    # @param optional_groups [Array(String)] A list of optional groups
+    def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, optional_groups = [])
       @unlocking = unlock == true || !unlock.empty?
 
-      @dependencies, @sources, @unlock = dependencies, sources, unlock
+      @dependencies, @sources, @unlock, @optional_groups = dependencies, sources, unlock, optional_groups
       @remote            = false
       @specs             = nil
       @lockfile_contents = ""
@@ -56,6 +57,7 @@ module Bundler
         @lockfile_contents = Bundler.read_file(lockfile)
         locked = LockfileParser.new(@lockfile_contents)
         @platforms      = locked.platforms
+        @locked_bundler_version = locked.bundler_version
 
         if unlock != true
           @locked_deps    = locked.dependencies
@@ -161,7 +163,7 @@ module Bundler
 
     def requested_specs
       @requested_specs ||= begin
-        groups = self.groups - Bundler.settings.without
+        groups = requested_groups
         groups.map! { |g| g.to_sym }
         specs_for(groups)
       end
@@ -255,6 +257,16 @@ module Bundler
         "#{File.expand_path(file)}"
     end
 
+    # Returns the version of Bundler that is creating or has created
+    # Gemfile.lock. Used in #to_lock.
+    def lock_version
+      if @locked_bundler_version && @locked_bundler_version < Gem::Version.new(Bundler::VERSION)
+        new_version = Bundler::VERSION
+      end
+
+      new_version || @locked_bundler_version || Bundler::VERSION
+    end
+
     def to_lock
       out = ""
 
@@ -293,9 +305,9 @@ module Bundler
           handled << dep.name
       end
 
-      if @lockfile_contents =~ /^BUNDLED WITH[\r]?\n(\s{2,}#{Gem::Version::VERSION_PATTERN})[\r]?\n\Z/
-        out << "\nBUNDLED WITH\n" << $1 << "\n"
-      end
+      # Record the version of Bundler that was used to create the lockfile
+      out << "\nBUNDLED WITH\n"
+      out << "  #{lock_version}\n"
 
       out
     end
@@ -594,7 +606,7 @@ module Bundler
     end
 
     def requested_dependencies
-      groups = self.groups - Bundler.settings.without
+      groups = requested_groups
       groups.map! { |g| g.to_sym }
       dependencies.reject { |d| !d.should_include? || (d.groups & groups).empty? }
     end
@@ -628,5 +640,8 @@ module Bundler
       names
     end
 
+    def requested_groups
+      self.groups - Bundler.settings.without - @optional_groups + Bundler.settings.with
+    end
   end
 end

data/lib/bundler/dependency.rb

@@ -50,11 +50,12 @@ module Bundler
       type = options["type"] || :runtime
       super(name, version, type)
 
-      @autorequire = nil
-      @groups      = Array(options["group"] || :default).map { |g| g.to_sym }
-      @source      = options["source"]
-      @platforms   = Array(options["platforms"])
-      @env         = options["env"]
+      @autorequire    = nil
+      @groups         = Array(options["group"] || :default).map { |g| g.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'] || [])
@@ -74,7 +75,7 @@ module Bundler
     end
 
     def should_include?
-      current_env? && current_platform?
+      @should_include && current_env? && current_platform?
     end
 
     def current_env?