bundler 1.0.11 → 1.0.12

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.0.12 (April 8, 2011)
+
+Features:
+
+  - Add --no-deployment option to `install` for disabling it on dev machines
+  - Better error message when git fails and cache is present (@parndt)
+  - Honor :bundle_cmd in cap `rake` command (@voidlock, @cgriego)
+
+Bugfixes:
+
+  - Compatibility with Rubygems 1.7 and Rails 2.3 and vendored gems (@evan)
+  - Fix changing gem order in lock (@gucki)
+  - Remove color escape sequences when displaying man pages (@bgreenlee)
+  - Fix creating GEM_HOME on both JRuby 1.5 and 1.6 (@nickseiger)
+  - Fix gems without a gemspec and directories in bin/ (@epall)
+  - Fix --no-prune option for `bundle install` (@cmeiklejohn)
+
 ## 1.0.11 (April 1, 2011)
 
 Features:

data/Rakefile

@@ -60,7 +60,7 @@ begin
     namespace :rubygems do
       # Rubygems 1.3.5, 1.3.6, and HEAD specs
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.1).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.1 v1.7.2).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)

data/lib/bundler.rb

@@ -265,7 +265,9 @@ module Bundler
         ENV["GEM_HOME"] = bundle_path.to_s
       end
 
-      FileUtils.mkdir_p bundle_path.to_s
+      # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)
+      FileUtils.mkdir_p bundle_path.to_s rescue nil
+
       Gem.clear_paths
     end
 

data/lib/bundler/capistrano.rb

@@ -7,5 +7,5 @@ require 'bundler/deployment'
 Capistrano::Configuration.instance(:must_exist).load do
   after "deploy:update_code", "bundle:install"
   Bundler::Deployment.define_task(self, :task, :except => { :no_release => true })
-  set :rake, 'bundle exec rake'
+  set :rake, lambda { "#{fetch(:bundle_cmd, "bundle")} exec rake" }
 end

data/lib/bundler/cli.rb

@@ -46,7 +46,7 @@ module Bundler
 
         if have_groff? && root !~ %r{^file:/.+!/META-INF/jruby.home/.+}
           groff   = "groff -Wall -mtty-char -mandoc -Tascii"
-          pager   = ENV['MANPAGER'] || ENV['PAGER'] || 'less'
+          pager   = ENV['MANPAGER'] || ENV['PAGER'] || 'less -R'
 
           Kernel.exec "#{groff} #{root}/#{command} | #{pager}"
         else
@@ -153,8 +153,6 @@ module Bundler
       "Do not allow the Gemfile.lock to be updated after this install"
     method_option "deployment", :type => :boolean, :banner =>
       "Install using defaults tuned for deployment environments"
-    method_option "production", :type => :boolean, :banner =>
-      "Deprecated, please use --deployment instead"
     def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
@@ -170,12 +168,6 @@ module Bundler
       # Just disable color in deployment mode
       Bundler.ui.shell = Thor::Shell::Basic.new if opts[:deployment]
 
-      if opts[:production]
-        opts[:deployment] = true
-        Bundler.ui.warn "The --production option is deprecated, and will be removed in " \
-                        "the final release of Bundler 1.0. Please use --deployment instead."
-      end
-
       if (path || opts[:path] || opts[:deployment]) && opts[:system]
         Bundler.ui.error "You have specified both a path to install your gems to, \n" \
                          "as well as --system. Please choose."
@@ -213,13 +205,20 @@ module Bundler
         Bundler.settings[:frozen] = '1'
       end
 
+      # When install is called with --no-deployment, disable deployment mode
+      if opts[:deployment] == false
+        Bundler.settings.delete(:frozen)
+        opts[:system] = true
+      end
+
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
       Bundler.settings[:path] = nil if opts[:system]
       Bundler.settings[:path] = "vendor/bundle" if opts[:deployment]
       Bundler.settings[:path] = path if path
       Bundler.settings[:path] = opts[:path] if opts[:path]
       Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs]
-      Bundler.settings[:disable_shared_gems] = '1' if Bundler.settings[:path]
+      Bundler.settings[:no_prune] = true if opts["no-prune"]
+      Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
       Bundler.settings.without = opts[:without] unless opts[:without].empty?
       Bundler.ui.be_quiet! if opts[:quiet]
 
@@ -312,7 +311,7 @@ module Bundler
     def cache
       Bundler.definition.resolve_with_cache!
       Bundler.load.cache
-      Bundler.settings[:no_prune] = true if options[:no_prune]
+      Bundler.settings[:no_prune] = true if options["no-prune"]
       Bundler.load.lock
     rescue GemNotFound => e
       Bundler.ui.error(e.message)

data/lib/bundler/definition.rb

@@ -235,11 +235,17 @@ module Bundler
       out
     end
 
-    def ensure_equivalent_gemfile_and_lockfile
+    def ensure_equivalent_gemfile_and_lockfile(explicit_flag = false)
       changes = false
 
-      msg = "You have modified your Gemfile in development but did not check\n" \
-            "the resulting snapshot (Gemfile.lock) into version control"
+      msg = "You are trying to install in deployment mode after changing\n" \
+            "your Gemfile. Run `bundle install` elsewhere and add the\n" \
+            "updated Gemfile.lock to version control."
+
+      unless explicit_flag
+        msg += "\n\nIf this is a development machine, remove the Gemfile " \
+               "freeze \nby running `bundle install --no-deployment`."
+      end
 
       added =   []
       deleted = []
@@ -287,6 +293,7 @@ module Bundler
       msg << "\n\nYou have added to the Gemfile:\n"     << added.join("\n") if added.any?
       msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any?
       msg << "\n\nYou have changed in the Gemfile:\n"   << changed.join("\n") if changed.any?
+      msg << "\n"
 
       raise ProductionError, msg if added.any? || deleted.any? || changed.any?
     end

data/lib/bundler/installer.rb

@@ -11,7 +11,7 @@ module Bundler
 
     def run(options)
       if Bundler.settings[:frozen]
-        @definition.ensure_equivalent_gemfile_and_lockfile
+        @definition.ensure_equivalent_gemfile_and_lockfile(options[:deployment])
       end
 
       if dependencies.empty?

data/lib/bundler/lazy_specification.rb

@@ -36,7 +36,7 @@ module Bundler
         out = "    #{name} (#{version}-#{platform})\n"
       end
 
-      dependencies.sort_by {|d| d.name }.each do |dep|
+      dependencies.sort_by {|d| d.to_s }.each do |dep|
         next if dep.type == :development
         out << "    #{dep.to_lock}\n"
       end

data/lib/bundler/settings.rb

@@ -16,7 +16,7 @@ module Bundler
     end
 
     def delete(key)
-      @local_config
+      @local_config.delete(key_for(key))
     end
 
     def set_global(key, value)

data/lib/bundler/shared_helpers.rb

@@ -126,7 +126,7 @@ module Bundler
       if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.7.0')
         Gem::SourceIndex.send(:define_method, :initialize) do |*args|
           @gems = {}
-          spec_dirs = *args
+          self.spec_dirs = *args
           add_specs(*specs)
         end
       else

data/lib/bundler/source.rb

@@ -323,7 +323,7 @@ module Bundler
       alias == eql?
 
       def name
-        File.basename(@path.to_s)
+        File.basename(path.expand_path(Bundler.root).to_s)
       end
 
       def load_spec_files
@@ -350,8 +350,9 @@ module Bundler
               s.summary  = "Fake gemspec for #{@name}"
               s.relative_loaded_from = "#{@name}.gemspec"
               if expanded_path.join("bin").exist?
-                binaries = expanded_path.join("bin").children.map{|c| c.basename.to_s }
-                s.executables = binaries
+                binaries = expanded_path.join("bin").children
+                binaries.reject!{|p| File.directory?(p) }
+                s.executables = binaries.map{|c| c.basename.to_s }
               end
             end
           end
@@ -559,9 +560,8 @@ module Bundler
           out = %x{git #{command}}
 
           if $?.exitstatus != 0
-            msg = "Git error: " +
-              "command `git #{command}` in directory #{Dir.pwd} has failed.\n" +
-              "Cannot complete bundling."
+            msg = "Git error: command `git #{command}` in directory #{Dir.pwd} has failed."
+            msg << "\nIf this error persists you could try removing the cache directory '#{cache_path}'" if cached?
             raise GitError, msg
           end
           out

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.0.11" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.12" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -60,6 +60,7 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--deployment`:
   Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].
+  Do not use this flag on development machines.
 
 * `--binstubs[=<directory>]`:
   Create a directory (defaults to `bin`) containing an executable
@@ -72,6 +73,8 @@ update process below under [CONSERVATIVE UPDATING][].
 
 Bundler's defaults are optimized for development. To switch to
 defaults optimized for deployment, use the `--deployment` flag.
+Do not activate deployment mode on development machines, as it
+will cause in an error when the Gemfile is modified.
 
 1. A `Gemfile.lock` is required.
 

data/spec/install/deploy_spec.rb

@@ -76,7 +76,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile")
       out.should include("* rack-obama")
       out.should_not include("You have deleted from the Gemfile")
@@ -92,7 +92,7 @@ describe "install with --deployment or --frozen" do
 
       ENV['BUNDLE_FROZEN'] = '1'
       bundle "install"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile")
       out.should include("* rack-obama")
       out.should_not include("You have deleted from the Gemfile")
@@ -107,7 +107,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --frozen"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile")
       out.should include("* rack-obama")
       out.should_not include("You have deleted from the Gemfile")
@@ -121,7 +121,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile:\n* activesupport\n\n")
       out.should include("You have deleted from the Gemfile:\n* rack")
       out.should_not include("You have changed in the Gemfile")
@@ -134,7 +134,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile:\n* source: git://hubz.com (at master)")
       out.should_not include("You have changed in the Gemfile")
     end
@@ -153,7 +153,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")} (at master)")
       out.should_not include("You have added to the Gemfile")
       out.should_not include("You have changed in the Gemfile")
@@ -176,7 +176,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")} (at master)`")
       out.should_not include("You have added to the Gemfile")
       out.should_not include("You have deleted from the Gemfile")

data/spec/install/deprecated_spec.rb

@@ -34,10 +34,4 @@ describe "bundle install with deprecated features" do
 
   end
 
-  it "reports that --production is deprecated" do
-    gemfile %{gem "rack"}
-    bundle "install --production"
-    out.should =~ /--production option is deprecated/
-  end
-
 end

data/spec/install/path_spec.rb

@@ -223,6 +223,17 @@ describe "bundle install with explicit source paths" do
     out.should == "1.0"
   end
 
+  it "handles directories in bin/" do
+    build_lib "foo"
+    lib_path("foo-1.0").join("foo.gemspec").rmtree
+    lib_path("foo-1.0").join("bin/performance").mkpath
+
+    install_gemfile <<-G
+      gem 'foo', '1.0', :path => "#{lib_path('foo-1.0')}"
+    G
+    err.should == ""
+  end
+
   it "removes the .gem file after installing" do
     build_lib "foo"
 

data/spec/lock/lockfile_spec.rb

@@ -340,8 +340,8 @@ describe "the lockfile format" do
         remote: file:#{gem_repo1}/
         specs:
           double_deps (1.0)
-            net-ssh (>= 1.0.0)
             net-ssh
+            net-ssh (>= 1.0.0)
           net-ssh (1.0)
 
       PLATFORMS

data/spec/other/ext_spec.rb

@@ -14,3 +14,24 @@ describe "Bundler::GemHelpers#generic" do
     generic(pl('x86-darwin-10')).should == pl('ruby')
   end
 end
+
+describe "Gem::SourceIndex#refresh!" do
+  rubygems_1_7 = Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.7.0")
+
+  before do
+    install_gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rack"
+    G
+  end
+
+  it "does not explode when called", :if => rubygems_1_7 do
+    run "Gem.source_index.refresh!"
+    run "Gem::SourceIndex.new([]).refresh!"
+  end
+
+  it "does not explode when called", :unless => rubygems_1_7 do
+    run "Gem.source_index.refresh!"
+    run "Gem::SourceIndex.from_gems_in([]).refresh!"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -07:00
+date: 2011-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency