bundler 1.1.pre.5 → 1.1.pre.7

data/lib/bundler/vendor/thor/shell/basic.rb

@@ -11,6 +11,21 @@ class Thor
         @base, @padding = nil, 0
       end
 
+      # Mute everything that's inside given block
+      #
+      def mute
+        @mute = true
+        yield
+      ensure
+        @mute = false
+      end
+
+      # Check if base is muted
+      #
+      def mute?
+        @mute
+      end
+
       # Sets the output padding, not allowing less than zero values.
       #
       def padding=(value)
@@ -24,7 +39,7 @@ class Thor
       #
       def ask(statement, color=nil)
         say("#{statement} ", color)
-        $stdin.gets.strip
+        stdin.gets.strip
       end
 
       # Say (print) something to the user. If the sentence ends with a whitespace
@@ -41,11 +56,11 @@ class Thor
         spaces = "  " * padding
 
         if force_new_line
-          $stdout.puts(spaces + message)
+          stdout.puts(spaces + message)
         else
-      $stdout.print(spaces + message)
+          stdout.print(spaces + message)
         end
-        $stdout.flush
+        stdout.flush
       end
 
       # Say a status with the given color and appends the message. Since this
@@ -61,15 +76,15 @@ class Thor
         status = status.to_s.rjust(12)
         status = set_color status, color, true if color
 
-        $stdout.puts "#{status}#{spaces}#{message}"
-        $stdout.flush
+        stdout.puts "#{status}#{spaces}#{message}"
+        stdout.flush
       end
 
       # Make a question the to user and returns true if the user replies "y" or
       # "yes".
       #
       def yes?(statement, color=nil)
-        ask(statement, color) =~ is?(:yes)
+        !!(ask(statement, color) =~ is?(:yes))
       end
 
       # Make a question the to user and returns true if the user replies "n" or
@@ -113,7 +128,7 @@ class Thor
           end
 
           sentence = truncate(sentence, options[:truncate]) if options[:truncate]
-          $stdout.puts sentence
+          stdout.puts sentence
         end
       end
 
@@ -139,9 +154,9 @@ class Thor
 
         paras.each do |para|
           para.split("\n").each do |line|
-            $stdout.puts line.insert(0, " " * ident)
+            stdout.puts line.insert(0, " " * ident)
           end
-          $stdout.puts unless para == paras.last
+          stdout.puts unless para == paras.last
         end
       end
 
@@ -180,12 +195,12 @@ class Thor
       end
 
       # Called if something goes wrong during the execution. This is used by Thor
-      # internally and should not be used inside your scripts. If someone went
+      # internally and should not be used inside your scripts. If something went
       # wrong, you can always raise an exception. If you raise a Thor::Error, it
       # will be rescued and wrapped in the method below.
       #
       def error(statement)
-        $stderr.puts statement
+        stderr.puts statement
       end
 
       # Apply color to the given string with optional bold. Disabled in the
@@ -197,6 +212,18 @@ class Thor
 
       protected
 
+        def stdout
+          $stdout
+        end
+
+        def stdin
+          $stdin
+        end
+
+        def stderr
+          $stderr
+        end
+
         def is?(value) #:nodoc:
           value = value.to_s
 
@@ -229,7 +256,7 @@ HELP
         end
 
         def quiet? #:nodoc:
-          base && base.options[:quiet]
+          mute? || (base && base.options[:quiet])
         end
 
         # This code was copied from Rake, available under MIT-LICENSE

data/lib/bundler/vendor/thor/task.rb

@@ -65,10 +65,9 @@ class Thor
       @required_options ||= options.map{ |_, o| o.usage if o.required? }.compact.sort.join(" ")
     end
 
-    # Given a target, checks if this class name is not a private/protected method.
+    # Given a target, checks if this class name is a public method.
     def public_method?(instance) #:nodoc:
-      collection = instance.private_methods + instance.protected_methods
-      (collection & [name.to_s, name.to_sym]).empty?
+      !(instance.public_methods & [name.to_s, name.to_sym]).empty?
     end
 
     def sans_backtrace(backtrace, caller) #:nodoc:
@@ -111,4 +110,4 @@ class Thor
       end
     end
   end
-end
+end

data/lib/bundler/vendor/thor/util.rb

@@ -8,11 +8,11 @@ class Thor
   #
   # 1) Methods to convert thor namespaces to constants and vice-versa.
   #
-  #   Thor::Utils.namespace_from_thor_class(Foo::Bar::Baz) #=> "foo:bar:baz"
+  #   Thor::Util.namespace_from_thor_class(Foo::Bar::Baz) #=> "foo:bar:baz"
   #
   # 2) Loading thor files and sandboxing:
   #
-  #   Thor::Utils.load_thorfile("~/.thor/foo")
+  #   Thor::Util.load_thorfile("~/.thor/foo")
   #
   module Util
 

data/lib/bundler/vendor/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.14.0".freeze
+  VERSION = "0.14.6".freeze
 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.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.pre.7" unless defined?(::Bundler::VERSION)
 end

data/man/gemfile.5.ronn

@@ -55,6 +55,9 @@ This defaults to the name of the gem itself. For instance, these are identical:
     gem "nokogiri"
     gem "nokogiri", :require => "nokogiri"
 
+Specify `:require => false` to prevent bundler from requiring the gem, but still
+install it and maintain dependencies.
+
 ### GROUPS (:group or :groups)
 
 Each _gem_ `MAY` specify membership in one or more groups. Any _gem_ that does

data/spec/cache/git_spec.rb

@@ -4,6 +4,9 @@ describe "bundle cache with git" do
     source  = Bundler::Source::Git.new("uri" => "git@github.com:bundler.git")
     source.send(:base_name).should == "bundler"
   end
-end
-
 
+  it "base_name should strip network share paths" do
+    source = Bundler::Source::Git.new("uri" => "//MachineName/ShareFolder")
+    source.send(:base_name).should == "ShareFolder"
+  end
+ end

data/spec/install/gems/dependency_api_spec.rb

@@ -68,6 +68,22 @@ describe "gemcutter's dependency API" do
     should_be_installed "rack 1.0.0"
   end
 
+  it "handles git dependencies that are in rubygems" do
+      build_git "foo" do |s|
+        s.executables = "foobar"
+        s.add_dependency "rails", "2.3.2"
+      end
+
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        git "#{lib_path('foo-1.0')}" do
+          gem 'foo'
+        end
+      G
+
+      should_be_installed("rails 2.3.2")
+  end
+
   it "falls back when the API errors out" do
     simulate_platform mswin
 
@@ -137,4 +153,57 @@ describe "gemcutter's dependency API" do
     out.should include("Fetching source index for #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
+
+  it "fetches again when more dependencies are found in subsequent sources" do
+    build_repo2 do
+      build_gem "back_deps" do |s|
+        s.add_dependency "foo"
+      end
+      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      source "#{source_uri}/extra"
+      gem "back_deps"
+    G
+
+    bundle :install, :artifice => "endpoint_extra"
+    should_be_installed "back_deps 1.0"
+  end
+
+  it "does not fetch every specs if the index of gems is large when doing back deps" do
+    build_repo2 do
+      build_gem "back_deps" do |s|
+        s.add_dependency "foo"
+      end
+      build_gem "missing"
+      # need to hit the limit
+      1.upto(Bundler::Source::Rubygems::FORCE_MODERN_INDEX_LIMIT) do |i|
+        build_gem "gem#{i}"
+      end
+
+      FileUtils.rm_rf Dir[gem_repo2("gems/foo-*.gem")]
+    end
+
+    gemfile <<-G
+      source "#{source_uri}"
+      source "#{source_uri}/extra"
+      gem "back_deps"
+    G
+
+    bundle :install, :artifice => "endpoint_extra_missing"
+    should_be_installed "back_deps 1.0"
+  end
+
+  it "uses the endpoint if all sources support it" do
+    gemfile <<-G
+      source "#{source_uri}"
+
+      gem 'foo'
+    G
+
+    bundle :install, :artifice => "endpoint_api_missing"
+    should_be_installed "foo 1.0"
+  end
 end

data/spec/install/gems/simple_case_spec.rb

@@ -293,6 +293,13 @@ describe "bundle install with gem sources" do
       bundle :install, :expect_err => true
       out.should =~ /Your Gemfile doesn't have any sources/i
     end
+
+    it "creates a Gemfile.lock on a blank Gemfile" do
+      install_gemfile <<-G
+      G
+
+      File.exists?(bundled_app("Gemfile.lock")).should be_true
+    end
   end
 
   describe "when prerelease gems are available" do

data/spec/install/gems/standalone_spec.rb

@@ -159,4 +159,66 @@ describe "bundle install --standalone" do
       err.should =~ /no such file to load.*spec/
     end
   end
+
+  describe "with gemcutter's dependency API" do
+    let(:source_uri) { "http://localgemserver.test" }
+
+    describe "simple gems" do
+      before do
+        gemfile <<-G
+          source "#{source_uri}"
+          gem "rails"
+        G
+      end
+
+      it "should run without errors" do
+        bundle "install --standalone", :artifice => "endpoint", :exitstatus => true
+
+        @exitstatus.should == 0
+      end
+
+      it "still makes the gems available to normal bundler" do
+        bundle "install --standalone", :artifice => "endpoint"
+
+        should_be_installed "actionpack 2.3.2", "rails 2.3.2"
+      end
+
+      it "generates a bundle/bundler/setup.rb" do
+        bundle "install --standalone", :artifice => "endpoint"
+
+        bundled_app("bundle/bundler/setup.rb").should exist
+      end
+
+      it "makes the gems available without bundler" do
+        bundle "install --standalone", :artifice => "endpoint"
+
+        ruby <<-RUBY, :no_lib => true
+          $:.unshift File.expand_path("bundle")
+          require "bundler/setup"
+
+          require "actionpack"
+          puts ACTIONPACK
+        RUBY
+
+        out.should == "2.3.2"
+      end
+
+      it "works on a different system" do
+        bundle "install --standalone", :artifice => "endpoint"
+
+        FileUtils.mv(bundled_app, "#{bundled_app}2")
+        Dir.chdir("#{bundled_app}2")
+
+        ruby <<-RUBY, :no_lib => true
+          $:.unshift File.expand_path("bundle")
+          require "bundler/setup"
+
+          require "actionpack"
+          puts ACTIONPACK
+        RUBY
+
+        out.should == "2.3.2"
+      end
+    end
+  end
 end

data/spec/install/git_spec.rb

@@ -403,7 +403,7 @@ describe "bundle install with git sources" do
         gem "has_submodule"
       end
     G
-    out.should =~ /Could not find gem 'submodule'/
+    out.should =~ /could not find gem 'submodule'/i
 
     should_not_be_installed "has_submodule 1.0", :expect_err => true
   end
@@ -567,4 +567,66 @@ describe "bundle install with git sources" do
       exitstatus.should == 0
     end
   end
+
+  describe "gem install hooks" do
+    it "runs pre-install hooks" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.pre_install_hooks << lambda do |inst|
+            STDERR.puts "Ran pre-install hook: \#{inst.spec.full_name}"
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      err.should == "Ran pre-install hook: foo-1.0"
+    end
+
+    it "runs post-install hooks" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.post_install_hooks << lambda do |inst|
+            STDERR.puts "Ran post-install hook: \#{inst.spec.full_name}"
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      err.should == "Ran post-install hook: foo-1.0"
+    end
+
+    it "complains if the install hook fails" do
+      build_git "foo"
+      gemfile <<-G
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      File.open(lib_path("install_hooks.rb"), "w") do |h|
+        h.write <<-H
+          require 'rubygems'
+          Gem.pre_install_hooks << lambda do |inst|
+            false
+          end
+        H
+      end
+
+      bundle :install, :expect_err => true,
+        :requires => [lib_path('install_hooks.rb')]
+      err.should include("failed for foo-1.0")
+    end
+  end
 end

data/spec/other/clean_spec.rb

@@ -1,6 +1,20 @@
 require "spec_helper"
 
 describe "bundle clean" do
+  def should_have_gems(*gems)
+    gems.each do |g|
+      vendored_gems("gems/#{g}").should exist
+      vendored_gems("specifications/#{g}.gemspec").should exist
+      vendored_gems("cache/#{g}.gem").should exist
+    end
+  end
+
+  def should_not_have_gem(rubygem)
+    vendored_gems("gems/#{rubygem}").should_not exist
+    vendored_gems("specifications/#{rubygem}.gemspec").should_not exist
+    vendored_gems("cache/#{rubygem}.gem").should_not exist
+  end
+
   it "removes unused gems that are different" do
     gemfile = <<-G
       source "file://#{gem_repo1}"
@@ -21,13 +35,8 @@ describe "bundle clean" do
 
     out.should == "Removing foo (1.0)"
 
-    vendored_gems("gems/thin-1.0").should exist
-    vendored_gems("gems/rack-1.0.0").should exist
-    vendored_gems("gems/foo-1.0").should_not exist
-
-    vendored_gems("specifications/thin-1.0.gemspec").should exist
-    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
-    vendored_gems("specifications/foo-1.0.gemspec").should_not exist
+    should_have_gems 'thin-1.0', 'rack-1.0.0'
+    should_not_have_gem 'foo-1.0'
 
     vendored_gems("bin/rackup").should exist
   end
@@ -53,13 +62,8 @@ describe "bundle clean" do
 
     out.should == "Removing rack (0.9.1)"
 
-    vendored_gems("gems/foo-1.0").should exist
-    vendored_gems("gems/rack-1.0.0").should exist
-    vendored_gems("gems/rack-0.9.1").should_not exist
-
-    vendored_gems("specifications/foo-1.0.gemspec").should exist
-    vendored_gems("specifications/rack-1.0.0.gemspec").should exist
-    vendored_gems("specifications/rack-0.9.1.gemspec").should_not exist
+    should_have_gems 'foo-1.0', 'rack-1.0.0'
+    should_not_have_gem 'rack-0.9.1'
 
     vendored_gems("bin/rackup").should exist
   end
@@ -85,13 +89,8 @@ describe "bundle clean" do
 
     out.should == "Removing rack (1.0.0)"
 
-    vendored_gems("gems/foo-1.0").should exist
-    vendored_gems("gems/rack-0.9.1").should exist
-    vendored_gems("gems/rack-1.0.0").should_not exist
-
-    vendored_gems("specifications/foo-1.0.gemspec").should exist
-    vendored_gems("specifications/rack-0.9.1.gemspec").should exist
-    vendored_gems("specifications/rack-1.0.0.gemspec").should_not exist
+    should_have_gems 'foo-1.0', 'rack-0.9.1'
+    should_not_have_gem 'rack-1.0.0'
 
     vendored_gems("bin/rackup").should exist
   end
@@ -113,11 +112,8 @@ describe "bundle clean" do
 
     out.should == "Removing rack (1.0.0)"
 
-    vendored_gems("gems/foo-1.0").should exist
-    vendored_gems("gems/rack-1.0.0").should_not exist
-
-    vendored_gems("specifications/foo-1.0.gemspec").should exist
-    vendored_gems("specifications/rack-1.0.0.gemspec").should_not exist
+    should_have_gems 'foo-1.0'
+    should_not_have_gem 'rack-1.0.0'
 
     vendored_gems("bin/rackup").should_not exist
   end