bundler 1.1.rc.5 → 1.1.rc.6

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.1.rc.6 (Dec 22, 2011)
+
+Bugfixes:
+
+  - Fix performance regression from 1.0 (@spastorino, #1511, #1591, #1592)
+  - Load gems correctly when GEM_HOME is blank
+  - Refresh gems so Bundler works from inside a bundle
+  - Handle empty .bundle/config files without an error
+
 ## 1.1.rc.5 (Dec 14, 2011)
 
 Bugfixes:

data/lib/bundler.rb

@@ -77,10 +77,7 @@ module Bundler
     attr_writer :ui, :bundle_path
 
     def configure
-      @configured ||= begin
-        configure_gem_home_and_path
-        true
-      end
+      @configured ||= configure_gem_home_and_path
     end
 
     def ui
@@ -295,23 +292,28 @@ module Bundler
   private
 
     def configure_gem_home_and_path
+      blank_home = ENV['GEM_HOME'].nil? || ENV['GEM_HOME'].empty?
+
       if settings[:disable_shared_gems]
         ENV['GEM_PATH'] = ''
-        ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
-        # 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
-
-        Bundler.rubygems.clear_paths
-      elsif Bundler.rubygems.gem_dir != bundle_path.to_s
+        configure_gem_home
+      elsif blank_home || Bundler.rubygems.gem_dir != bundle_path.to_s
         possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
         paths = possibles.flatten.compact.uniq.reject { |p| p.empty? }
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
-        ENV["GEM_HOME"] = 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
-
-        Bundler.rubygems.clear_paths
+        configure_gem_home
       end
+
+      Bundler.rubygems.refresh
+      bundle_path
+    end
+
+    def configure_gem_home
+      # 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
+
+      ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
+      Bundler.rubygems.clear_paths
     end
 
     def upgrade_lockfile

data/lib/bundler/cli.rb

@@ -395,7 +395,7 @@ module Bundler
     def exec(*)
       ARGV.shift # remove "exec"
 
-      Bundler.setup
+      Bundler.load.setup_environment
 
       begin
         # Run
@@ -408,7 +408,7 @@ module Bundler
         Bundler.ui.warn  "Install missing gem executables with `bundle install`"
         exit 127
       rescue ArgumentError
-        Bundler.ui.error "bundle exec needs a command to run"
+        Bundler.ui.error "bundler: exec needs a command to run"
         exit 128
       end
     end

data/lib/bundler/dsl.rb

@@ -6,6 +6,11 @@ module Bundler
       builder = new
       builder.instance_eval(Bundler.read_file(gemfile.to_s), gemfile.to_s, 1)
       builder.to_definition(lockfile, unlock)
+    rescue ScriptError, RegexpError, NameError, ArgumentError => e
+      e.backtrace[0] = "#{e.backtrace[0]}: #{e.message} (#{e.class})"
+      Bundler.ui.info e.backtrace.join("\n       ")
+      raise GemfileError, "There was an error in your Gemfile," \
+        " and Bundler cannot continue."
     end
 
     VALID_PLATFORMS = Bundler::Dependency::PLATFORM_MAP.keys.freeze

data/lib/bundler/resolver.rb

@@ -156,6 +156,7 @@ module Bundler
 
     def start(reqs)
       activated = {}
+      @gems_size = Hash[reqs.map { |r| [r, gems_size(r)] }]
 
       resolve(reqs, activated)
     end
@@ -176,7 +177,7 @@ module Bundler
         [ activated[a.name] ? 0 : 1,
           a.requirement.prerelease? ? 0 : 1,
           @errors[a.name]   ? 0 : 1,
-          activated[a.name] ? 0 : gems_size(a) ]
+          activated[a.name] ? 0 : @gems_size[a] ]
       end
 
       debug { "Activated:\n" + activated.values.map {|a| "  #{a}" }.join("\n") }
@@ -210,7 +211,13 @@ module Bundler
           # I have no idea if this is the right way to do it, but let's see if it works
           # The current requirement might activate some other platforms, so let's try
           # adding those requirements here.
-          reqs.concat existing.activate_platform(current.__platform)
+          dependencies = existing.activate_platform(current.__platform)
+          reqs.concat dependencies
+
+          dependencies.each do |dep|
+            next if dep.type == :development
+            @gems_size[dep] ||= gems_size(dep)
+          end
 
           resolve(reqs, activated)
         else
@@ -325,6 +332,7 @@ module Bundler
         debug { "    * #{dep.name} (#{dep.requirement})" }
         dep.required_by.replace(requirement.required_by)
         dep.required_by << requirement
+        @gems_size[dep] ||= gems_size(dep)
         reqs << dep
       end
 

data/lib/bundler/rubygems_integration.rb

@@ -73,6 +73,10 @@ module Bundler
       Gem.bin_path(gem, bin, ver)
     end
 
+    def refresh
+      Gem.refresh
+    end
+
     def preserve_paths
       # this is a no-op outside of Rubygems 1.8
       yield
@@ -229,7 +233,7 @@ module Bundler
     end
 
     # Because Bundler has a static view of what specs are available,
-    # we don't #reflesh, so stub it out.
+    # we don't #refresh, so stub it out.
     def replace_refresh
       gem_class = (class << Gem ; self ; end)
       gem_class.send(:remove_method, :refresh)

data/lib/bundler/runtime.rb

@@ -200,12 +200,6 @@ module Bundler
       output
     end
 
-  private
-
-    def cache_path
-      root.join("vendor/cache")
-    end
-
     def setup_environment
       begin
         ENV["BUNDLE_BIN_PATH"] = Bundler.rubygems.bin_path("bundler", "bundle", VERSION)
@@ -229,5 +223,11 @@ module Bundler
         ENV["RUBYOPT"] = rubyopt.join(' ')
       end
     end
+
+  private
+
+    def cache_path
+      root.join("vendor/cache")
+    end
   end
 end

data/lib/bundler/settings.rb

@@ -1,9 +1,9 @@
 module Bundler
   class Settings
     def initialize(root)
-      @root   = root
-      @local_config = File.exist?(local_config_file) ? YAML.load_file(local_config_file) : {}
-      @global_config = File.exist?(global_config_file) ? YAML.load_file(global_config_file) : {}
+      @root          = root
+      @local_config  = (File.exist?(local_config_file) && yaml = YAML.load_file(local_config_file)) ? yaml : {}
+      @global_config = (File.exist?(global_config_file) && yaml = YAML.load_file(global_config_file)) ? yaml : {}
     end
 
     def [](key)

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.1.rc.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.rc.6" unless defined?(::Bundler::VERSION)
 end

data/spec/bundler/dsl_spec.rb

@@ -19,4 +19,12 @@ describe Bundler::Dsl do
       subject.dependencies.first.source.uri.should == github_uri
     end
   end
+
+  describe "syntax errors" do
+    it "should raise a Bundler::GemfileError" do
+      gemfile "gem 'foo', :path => /unquoted/string/syntax/error"
+      lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
+        should raise_error(Bundler::GemfileError)
+    end
+  end
 end

data/spec/install/gems/simple_case_spec.rb

@@ -313,6 +313,30 @@ describe "bundle install with gem sources" do
       out.should include("Could not reach http://localhost:9384/")
       out.should_not include("file://")
     end
+
+    it "doesn't blow up when the local .bundle/config is empty" do
+      FileUtils.mkdir_p(bundled_app(".bundle"))
+      FileUtils.touch(bundled_app(".bundle/config"))
+
+      install_gemfile(<<-G, :exitstatus => true)
+        source "file://#{gem_repo1}"
+
+        gem 'foo'
+      G
+      exitstatus.should == 0
+    end
+
+    it "doesn't blow up when the global .bundle/config is empty" do
+      FileUtils.mkdir_p("#{Bundler.rubygems.user_home}/.bundle")
+      FileUtils.touch("#{Bundler.rubygems.user_home}/.bundle/config")
+
+      install_gemfile(<<-G, :exitstatus => true)
+        source "file://#{gem_repo1}"
+
+        gem 'foo'
+      G
+      exitstatus.should == 0
+    end
   end
 
   describe "when prerelease gems are available" do

data/spec/other/exec_spec.rb

@@ -128,7 +128,7 @@ describe "bundle exec" do
 
     bundle "exec", :exitstatus => true
     # exitstatus.should eq(128)
-    out.should include("bundle exec needs a command to run")
+    out.should include("bundler: exec needs a command to run")
   end
 
   describe "with gem executables" do

data/spec/other/show_spec.rb

@@ -16,7 +16,7 @@ describe "bundle show" do
     bundled_app("Gemfile.lock").should exist
   end
 
-  it "creates a Gemfile.lock if one did not exist and we're doing bundle show rails" do
+  it "creates a Gemfile.lock when invoked with a gem name" do
     FileUtils.rm("Gemfile.lock")
 
     bundle "show rails"

data/spec/support/helpers.rb

@@ -35,14 +35,14 @@ module Spec
       @out = ruby(setup + cmd, :expect_err => expect_err, :env => env)
     end
 
-    def load_error_run(ruby, gem, *args)
-      cmd = <<-R
+    def load_error_run(ruby, name, *args)
+      cmd = <<-RUBY
         begin
           #{ruby}
         rescue LoadError => e
-          $stderr.puts "ZOMG LOAD ERROR" if e.message.include?("-- #{gem}")
+          $stderr.puts "ZOMG LOAD ERROR" if e.message.include?("-- #{name}")
         end
-      R
+      RUBY
       opts = args.last.is_a?(Hash) ? args.pop : {}
       opts.merge!(:expect_err => true)
       args += [opts]
@@ -87,12 +87,12 @@ module Spec
       sys_exec(%{#{env}#{Gem.ruby}#{lib_option} -e "#{ruby}"}, expect_err)
     end
 
-    def load_error_ruby(ruby, gem, opts = {})
+    def load_error_ruby(ruby, name, opts = {})
       cmd = <<-R
         begin
           #{ruby}
         rescue LoadError => e
-          $stderr.puts "ZOMG LOAD ERROR"# if e.message.include?("-- #{gem}")
+          $stderr.puts "ZOMG LOAD ERROR"# if e.message.include?("-- #{name}")
         end
       R
       ruby(cmd, opts.merge(:expect_err => true))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 15424247
+  hash: 15424241
   prerelease: true
   segments: 
   - 1
   - 1
   - rc
-  - 5
-  version: 1.1.rc.5
+  - 6
+  version: 1.1.rc.6
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -05:00
+date: 2011-12-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -235,20 +235,20 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle-exec
 - lib/bundler/man/bundle
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
+- lib/bundler/man/bundle-exec
+- lib/bundler/man/bundle-exec.txt
 - lib/bundler/man/bundle-install
-- lib/bundler/man/gemfile.5
+- lib/bundler/man/bundle-install.txt
 - lib/bundler/man/bundle-package
+- lib/bundler/man/bundle-package.txt
 - lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/gemfile.5.txt
 has_rdoc: true
 homepage: http://gembundler.com
 licenses: []
@@ -285,5 +285,81 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: []
-
+test_files: 
+- spec/bundler/dsl_spec.rb
+- spec/bundler/gem_helper_spec.rb
+- spec/bundler/source_spec.rb
+- spec/cache/gems_spec.rb
+- spec/cache/git_spec.rb
+- spec/cache/path_spec.rb
+- spec/cache/platform_spec.rb
+- spec/install/deploy_spec.rb
+- spec/install/deprecated_spec.rb
+- spec/install/gems/c_ext_spec.rb
+- spec/install/gems/dependency_api_spec.rb
+- spec/install/gems/env_spec.rb
+- spec/install/gems/flex_spec.rb
+- spec/install/gems/groups_spec.rb
+- spec/install/gems/packed_spec.rb
+- spec/install/gems/platform_spec.rb
+- spec/install/gems/post_install_spec.rb
+- spec/install/gems/resolving_spec.rb
+- spec/install/gems/simple_case_spec.rb
+- spec/install/gems/standalone_spec.rb
+- spec/install/gems/sudo_spec.rb
+- spec/install/gems/win32_spec.rb
+- spec/install/gemspec_spec.rb
+- spec/install/git_spec.rb
+- spec/install/invalid_spec.rb
+- spec/install/path_spec.rb
+- spec/install/upgrade_spec.rb
+- spec/lock/git_spec.rb
+- spec/lock/lockfile_spec.rb
+- spec/other/check_spec.rb
+- spec/other/clean_spec.rb
+- spec/other/config_spec.rb
+- spec/other/console_spec.rb
+- spec/other/exec_spec.rb
+- spec/other/ext_spec.rb
+- spec/other/help_spec.rb
+- spec/other/init_spec.rb
+- spec/other/newgem_spec.rb
+- spec/other/open_spec.rb
+- spec/other/outdated_spec.rb
+- spec/other/show_spec.rb
+- spec/quality_spec.rb
+- spec/realworld/edgecases_spec.rb
+- spec/resolver/basic_spec.rb
+- spec/resolver/platform_spec.rb
+- spec/runtime/executable_spec.rb
+- spec/runtime/load_spec.rb
+- spec/runtime/platform_spec.rb
+- spec/runtime/require_spec.rb
+- spec/runtime/setup_spec.rb
+- spec/runtime/with_clean_env_spec.rb
+- spec/spec_helper.rb
+- spec/support/artifice/endopint_marshal_fail_basic_authentication.rb
+- spec/support/artifice/endpoint.rb
+- spec/support/artifice/endpoint_500.rb
+- spec/support/artifice/endpoint_api_missing.rb
+- spec/support/artifice/endpoint_basic_authentication.rb
+- spec/support/artifice/endpoint_extra.rb
+- spec/support/artifice/endpoint_extra_missing.rb
+- spec/support/artifice/endpoint_fallback.rb
+- spec/support/artifice/endpoint_marshal_fail.rb
+- spec/support/artifice/endpoint_redirect.rb
+- spec/support/builders.rb
+- spec/support/fakeweb/rack-1.0.0.marshal
+- spec/support/fakeweb/windows.rb
+- spec/support/helpers.rb
+- spec/support/indexes.rb
+- spec/support/matchers.rb
+- spec/support/path.rb
+- spec/support/platforms.rb
+- spec/support/ruby_ext.rb
+- spec/support/rubygems_ext.rb
+- spec/support/rubygems_hax/platform.rb
+- spec/support/sudo.rb
+- spec/update/gems_spec.rb
+- spec/update/git_spec.rb
+- spec/update/source_spec.rb