bundler 1.1.pre.8 → 1.1.pre.9

data/lib/bundler/settings.rb

@@ -62,9 +62,7 @@ module Bundler
     end
 
     def without=(array)
-      unless array.empty?
-        self[:without] = array.join(":")
-      end
+      self[:without] = (array.empty? ? nil : array.join(":")) if array
     end
 
     def without

data/lib/bundler/source.rb

@@ -78,18 +78,16 @@ module Bundler
 
         Bundler.ui.info "Installing #{spec.name} (#{spec.version}) "
         path = cached_gem(spec)
+        install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
 
         Bundler.rubygems.preserve_paths do
-
-          install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
-          options = { :install_dir         => install_path,
-                      :ignore_dependencies => true,
-                      :wrappers            => true,
-                      :env_shebang         => true }
-          options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty?
-
-          installer = Gem::Installer.new path, options
-          installer.install
+          Bundler::GemInstaller.new(path,
+            :install_dir         => install_path,
+            :ignore_dependencies => true,
+            :wrappers            => true,
+            :env_shebang         => true,
+            :bin_dir => "#{install_path}/bin"
+          ).install
         end
 
         if spec.post_install_message
@@ -237,7 +235,9 @@ module Bundler
           if api_fetchers.any? && modern_index_fetchers.all? {|fetcher| sources[fetcher] < FORCE_MODERN_INDEX_LIMIT }
             # this will fetch all the specifications on the rubygems repo
             unmet_dependency_names = idx.unmet_dependency_names
+            unmet_dependency_names -= ['bundler'] # bundler will always be unmet
 
+            Bundler.ui.debug "Unmet Dependencies: #{unmet_dependency_names}"
             if unmet_dependency_names.any?
               api_fetchers.each do |fetcher|
                 idx.use fetcher.specs(unmet_dependency_names, self)
@@ -361,7 +361,7 @@ module Bundler
         @local_specs ||= load_spec_files
       end
 
-      class Installer < Gem::Installer
+      class Installer < Bundler::GemInstaller
         def initialize(spec, options = {})
           @spec              = spec
           @bin_dir           = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Bundler.rubygems.gem_dir}/bin"
@@ -481,6 +481,7 @@ module Bundler
         @revision   = options["revision"]
         @submodules = options["submodules"]
         @update     = false
+        @installed  = nil
       end
 
       def self.from_lock(options)
@@ -562,6 +563,17 @@ module Bundler
         raise GitError, "#{to_s} is not checked out. Please run `bundle install`"
       end
 
+      def cache_path
+        @cache_path ||= begin
+          git_scope = "#{base_name}-#{uri_hash}"
+
+          if Bundler.requires_sudo?
+            Bundler.user_bundle_path.join("cache/git", git_scope)
+          else
+            Bundler.cache.join("git", git_scope)
+          end
+        end
+      end
     private
 
       def git(command)
@@ -618,18 +630,6 @@ module Bundler
         end
       end
 
-      def cache_path
-        @cache_path ||= begin
-          git_scope = "#{base_name}-#{uri_hash}"
-
-          if Bundler.requires_sudo?
-            Bundler.user_bundle_path.join("cache/git", git_scope)
-          else
-            Bundler.cache.join("git", git_scope)
-          end
-        end
-      end
-
       def cache
         if cached?
           return if has_revision_cached?

data/lib/bundler/ui.rb

@@ -30,14 +30,6 @@ module Bundler
         @debug = ENV['DEBUG']
       end
 
-      def debug(msg, newline = nil)
-        tell_me(msg, nil, newline) if debugging?
-      end
-
-      def debugging?
-        @debug && !@quiet
-      end
-
       def info(msg, newline = nil)
         tell_me(msg, nil, newline) if !@quiet
       end
@@ -58,14 +50,22 @@ module Bundler
         @quiet = true
       end
 
+      def debugging?
+        @debug && !@quiet
+      end
+
       def debug!
         @debug = true
       end
 
+      def debug(msg, newline = nil)
+        tell_me(msg, nil, newline) if debugging?
+      end
+
       private
       # valimism
       def tell_me(msg, color = nil, newline = nil)
-        newline.nil? ? @shell.say(msg) : @shell.say(msg, nil, newline)
+        newline.nil? ? @shell.say(msg, color) : @shell.say(msg, color, newline)
       end
     end
 

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.pre.8" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.pre.9" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -55,9 +55,9 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--local`:
   Do not attempt to connect to `rubygems.org`, instead using just
-  the gems located in `vendor/cache`. Note that if a more
-  appropriate platform-specific gem exists on `rubygems.org`,
-  this will bypass the normal lookup.
+  the gems already present in Rubygems' cache or in `vendor/cache`.
+  Note that if a more appropriate platform-specific gem exists on
+  `rubygems.org`, it will not be found.
 
 * `--deployment`:
   Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].

data/man/bundle.ronn

@@ -66,12 +66,6 @@ We divide `bundle` subcommands into primary commands and utilities.
 
 * `bundle viz(1)`:
   Generate a visual representation of your dependencies
-<<<<<<< HEAD
-
-* `bundle benchmark(1)`:
-  Display the time taken for each each gem to be loaded into the environment
-=======
->>>>>>> parent of e547c86... Add documentation for the benchmark CLI utility
 
 * `bundle init(1)`:
   Generate a simple `Gemfile`, placed in the current directory

data/man/gemfile.5.ronn

@@ -280,5 +280,5 @@ bundler uses the following priority order:
      repository otherwise declared. This results in bundler prioritizing the
      ActiveSupport gem from the Rails git repository over ones from
      `rubygems.org`
-  3. The sources specified via `source`, in the order in which they were
-     declared in the `Gemfile`.
+  3. The sources specified via `source`, searching each source in your `Gemfile`
+     from last added to first added.

data/spec/bundler/dsl_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Bundler::Dsl do
+  describe '#_normalize_options' do
+    before do
+      @rubygems = mock("rubygems")
+      Bundler::Source::Rubygems.stub(:new){ @rubygems }
+    end
+
+    it "should convert :github to :git" do
+      subject.gem("sparks", :github => "indirect/sparks")
+      github_uri = "git://github.com/indirect/sparks.git"
+      subject.dependencies.first.source.uri.should == github_uri
+    end
+
+    it "should convert 'rails' to 'rails/rails'" do
+      subject.gem("rails", :github => "rails")
+      github_uri = "git://github.com/rails/rails.git"
+      subject.dependencies.first.source.uri.should == github_uri
+    end
+  end
+end

data/spec/{other → bundler}/gem_helper_spec.rb

@@ -31,6 +31,13 @@ describe "Bundler::GemHelper tasks" do
       File.open(File.join(app.to_s, 'test2.gemspec'), 'w') {|f| f << ''}
       proc { Bundler::GemHelper.new(app.to_s) }.should raise_error(/Unable to determine name/)
     end
+
+    it "handles namespaces and converting to CamelCase" do
+      bundle 'gem test-foo_bar'
+      lib = bundled_app('test-foo_bar').join('lib/test-foo_bar.rb').read
+      lib.should include("module Test")
+      lib.should include("module FooBar")
+    end
   end
 
   context "gem management" do

data/spec/install/deprecated_spec.rb

@@ -5,8 +5,7 @@ describe "bundle install with deprecated features" do
     in_app_root
   end
 
-  %w( only except disable_system_gems disable_rubygems
-      clear_sources bundle_path bin_path ).each do |deprecated|
+  %w().each do |deprecated|
 
     it "reports that #{deprecated} is deprecated" do
       gemfile <<-G
@@ -21,7 +20,7 @@ describe "bundle install with deprecated features" do
   end
 
 
-  %w( require_as vendored_at only except ).each do |deprecated|
+  %w().each do |deprecated|
 
     it "reports that :#{deprecated} is deprecated" do
       gemfile <<-G

data/spec/install/gems/dependency_api_spec.rb

@@ -247,13 +247,24 @@ describe "gemcutter's dependency API" do
     should_be_installed "back_deps 1.0"
   end
 
+  it "does not refetch if the only unmet dependency is bundler" do
+    gemfile <<-G
+      source "#{source_uri}"
+
+      gem "bundler_dep"
+    G
+
+    bundle :install, :artifice => "endpoint"
+    out.scan(/Fetching dependency information from the API/).size.should == 1
+  end
+
   it "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
     sys_exec "mkdir -p #{system_gem_path("bin")}"
     sudo "chown -R root #{system_gem_path("bin")}"
 
     gemfile <<-G
-        source "#{source_uri}"
-        gem "rails"
+      source "#{source_uri}"
+      gem "rails"
     G
     bundle :install, :artifice => "endpoint"
     should_be_installed "rails 2.3.2"

data/spec/install/gems/groups_spec.rb

@@ -136,6 +136,20 @@ describe "bundle install with gem sources" do
 
           ENV["BUNDLE_WITHOUT"] = nil
         end
+
+        it "clears without when passed an empty list" do
+          bundle :install, :without => "emo"
+
+          bundle 'install --without ""'
+          should_be_installed "activesupport 2.3.5"
+        end
+
+        it "doesn't clear without when nothing is passed" do
+          bundle :install, :without => "emo"
+
+          bundle :install
+          should_not_be_installed "activesupport 2.3.5"
+        end
       end
 
       describe "with gems assigned to multiple groups" do

data/spec/install/gems/simple_case_spec.rb

@@ -300,6 +300,19 @@ describe "bundle install with gem sources" do
 
       File.exists?(bundled_app("Gemfile.lock")).should be_true
     end
+
+    it "gracefully handles error when rubygems server is unavailable" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        source "http://localhost:9384"
+
+        gem 'foo'
+      G
+
+      bundle :install
+      out.should include("Could not reach http://localhost:9384/")
+      out.should_not include("file://")
+    end
   end
 
   describe "when prerelease gems are available" do
@@ -593,7 +606,7 @@ describe "bundle install with gem sources" do
           Current Bundler version:
             bundler (#{Bundler::VERSION})
         E
-      out.should == nice_error
+      out.should include(nice_error)
     end
 
     it "works for gems with multiple versions in its dependencies" do
@@ -719,4 +732,24 @@ describe "bundle install with gem sources" do
       err.should be_empty
     end
   end
+
+  describe "when Gem.bindir is hardcoded to a root-owned directory" do
+    # On OS X, Gem.bindir is hardcoded to /usr/bin. :(
+    it "installs binstubs into Gem.dir+'/bin' instead" do
+      Pathname.new("/usr/bin").should_not be_writable
+
+      gemfile <<-G
+        require 'rubygems'
+        def Gem.bindir(dir=Gem.dir); "/usr/bin"; end
+
+        source "file://#{gem_repo1}"
+        gem "rack"
+      G
+
+      bundle :install
+      should_be_installed "rack 1.0.0"
+      system_gem_path("bin/rackup").should exist
+    end
+  end
+
 end

data/spec/install/gems/standalone_spec.rb

@@ -26,7 +26,7 @@ describe "bundle install --standalone" do
         puts ACTIONPACK
       RUBY
 
-      out.should == "2.3.2"
+      out.should be == "2.3.2"
     end
 
     it "works on a different system" do
@@ -41,7 +41,7 @@ describe "bundle install --standalone" do
         puts ACTIONPACK
       RUBY
 
-      out.should == "2.3.2"
+      out.should be == "2.3.2"
     end
   end
 
@@ -75,7 +75,7 @@ describe "bundle install --standalone" do
         puts ACTIONPACK
       RUBY
 
-      out.should == "1.0\n2.3.2"
+      out.should be == "1.0\n2.3.2"
     end
   end
 
@@ -107,7 +107,7 @@ describe "bundle install --standalone" do
         puts RACK_TEST
       RUBY
 
-      out.should == "2.3.2\n1.2.7\n1.0"
+      out.should be == "2.3.2\n1.2.7\n1.0"
     end
 
     it "allows creating a standalone file with limited groups" do
@@ -122,7 +122,7 @@ describe "bundle install --standalone" do
         require "spec"
       RUBY
 
-      out.should == "2.3.2"
+      out.should be == "2.3.2"
       err.should =~ /no such file to load.*spec/
     end
 
@@ -138,10 +138,24 @@ describe "bundle install --standalone" do
         require "spec"
       RUBY
 
-      out.should == "2.3.2"
+      out.should be == "2.3.2"
       err.should =~ /no such file to load.*spec/
     end
 
+    it "allows --path to change the location of the standalone bundle" do
+      bundle "install --standalone --path path/to/bundle"
+
+      ruby <<-RUBY, :no_lib => true, :expect_err => false
+        $:.unshift File.expand_path("path/to/bundle")
+        require "bundler/setup"
+
+        require "actionpack"
+        puts ACTIONPACK
+      RUBY
+
+      out.should == "2.3.2"
+    end
+
     it "allows remembered --without to limit the groups used in a standalone" do
       bundle "install --without test"
       bundle "install --standalone"
@@ -155,7 +169,7 @@ describe "bundle install --standalone" do
         require "spec"
       RUBY
 
-      out.should == "2.3.2"
+      out.should be == "2.3.2"
       err.should =~ /no such file to load.*spec/
     end
   end
@@ -174,7 +188,7 @@ describe "bundle install --standalone" do
       it "should run without errors" do
         bundle "install --standalone", :artifice => "endpoint", :exitstatus => true
 
-        @exitstatus.should == 0
+        @exitstatus.should be == 0
       end
 
       it "still makes the gems available to normal bundler" do
@@ -200,7 +214,7 @@ describe "bundle install --standalone" do
           puts ACTIONPACK
         RUBY
 
-        out.should == "2.3.2"
+        out.should be == "2.3.2"
       end
 
       it "works on a different system" do
@@ -217,7 +231,7 @@ describe "bundle install --standalone" do
           puts ACTIONPACK
         RUBY
 
-        out.should == "2.3.2"
+        out.should be == "2.3.2"
       end
     end
   end