bundler 1.0.15 → 1.0.17

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/vendored_thor.rb

@@ -0,0 +1,7 @@
+if defined?(Thor)
+  Bundler.ui.warn "Thor has already been required. " +
+    "This may cause Bundler to malfunction in unexpected ways."
+end
+$:.unshift File.expand_path('../vendor', __FILE__)
+require 'thor'
+require 'thor/actions'

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.15" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.17" 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/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

data/spec/other/exec_spec.rb

@@ -101,7 +101,7 @@ describe "bundle exec" do
     bundle "exec foobarbaz", :exitstatus => true
     exitstatus.should eq(127)
     out.should include("bundler: command not found: foobarbaz")
-    out.should include("Install missing gem binaries with `bundle install`")
+    out.should include("Install missing gem executables with `bundle install`")
   end
 
   it "errors nicely when the argument is not executable" do
@@ -115,7 +115,7 @@ describe "bundle exec" do
     out.should include("bundler: not executable: ./foo")
   end
 
-  describe "with gem binaries" do
+  describe "with gem executables" do
     describe "run from a random directory" do
       before(:each) do
         install_gemfile <<-G

data/spec/other/gem_helper_spec.rb

@@ -118,7 +118,7 @@ describe "Bundler::GemHelper tasks" do
           `git config user.name "name"`
           `git remote add origin file://#{gem_repo1}`
           `git commit -a -m "initial commit"`
-          Open3.popen3("git push origin master") # use popen3 to silence output...
+          sys_exec("git push origin master", true)
           `git commit -a -m "another commit"`
         }
         @helper.release_gem

data/spec/quality_spec.rb

@@ -1,5 +1,9 @@
 require "spec_helper"
 
+if defined?(Encoding)
+  Encoding.default_external = "UTF-8"
+end
+
 describe "The library itself" do
   def check_for_tab_characters(filename)
     failing_lines = []

data/spec/runtime/setup_spec.rb

@@ -214,7 +214,7 @@ describe "Bundler.setup" do
         out.should == "WIN"
       end
 
-      it "version_requirement is now deprecated in rubygesm 1.4.0+  when the version is wrong" do
+      it "version_requirement is now deprecated in rubygems 1.4.0+ when the version is wrong" do
         run <<-R, :expect_err => true
           begin
             gem "rack", "1.0.0"

data/spec/support/helpers.rb

@@ -13,7 +13,7 @@ module Spec
       FileUtils.mkdir_p(tmp)
       FileUtils.mkdir_p(home)
       Gem.sources = ["file://#{gem_repo1}/"]
-      Gem.configuration.write
+      # Gem.configuration.write
     end
 
     attr_reader :out, :err, :exitstatus

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 0
-  - 15
-  version: 1.0.15
+  - 17
+  version: 1.0.17
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -07:00
+date: 2011-08-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - lib/bundler/vendor/thor.rb
 - lib/bundler/vendor/thor/actions.rb
 - lib/bundler/vendor/thor/actions/create_file.rb
+- lib/bundler/vendor/thor/actions/create_link.rb
 - lib/bundler/vendor/thor/actions/directory.rb
 - lib/bundler/vendor/thor/actions/empty_directory.rb
 - lib/bundler/vendor/thor/actions/file_manipulation.rb
@@ -115,12 +116,15 @@ files:
 - lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb
 - lib/bundler/vendor/thor/core_ext/ordered_hash.rb
 - lib/bundler/vendor/thor/error.rb
+- lib/bundler/vendor/thor/group.rb
 - lib/bundler/vendor/thor/invocation.rb
 - lib/bundler/vendor/thor/parser.rb
 - lib/bundler/vendor/thor/parser/argument.rb
 - lib/bundler/vendor/thor/parser/arguments.rb
 - lib/bundler/vendor/thor/parser/option.rb
 - lib/bundler/vendor/thor/parser/options.rb
+- lib/bundler/vendor/thor/rake_compat.rb
+- lib/bundler/vendor/thor/runner.rb
 - lib/bundler/vendor/thor/shell.rb
 - lib/bundler/vendor/thor/shell/basic.rb
 - lib/bundler/vendor/thor/shell/color.rb
@@ -128,6 +132,7 @@ files:
 - lib/bundler/vendor/thor/task.rb
 - lib/bundler/vendor/thor/util.rb
 - lib/bundler/vendor/thor/version.rb
+- lib/bundler/vendored_thor.rb
 - lib/bundler/version.rb
 - lib/bundler/vlad.rb
 - man/bundle-config.ronn
@@ -172,7 +177,6 @@ files:
 - spec/other/newgem_spec.rb
 - spec/other/open_spec.rb
 - spec/other/show_spec.rb
-- spec/pack/gems_spec.rb
 - spec/quality_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
@@ -196,22 +200,22 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-benchmark
-- lib/bundler/man/bundle-benchmark.txt
-- 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
 - lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/bundle-benchmark
 - 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-benchmark.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-install.txt
 has_rdoc: true
 homepage: http://gembundler.com
 licenses: []
@@ -248,62 +252,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: 
-- 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/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/resolving_spec.rb
-- spec/install/gems/simple_case_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/config_spec.rb
-- spec/other/console_spec.rb
-- spec/other/exec_spec.rb
-- spec/other/ext_spec.rb
-- spec/other/gem_helper_spec.rb
-- spec/other/help_spec.rb
-- spec/other/init_spec.rb
-- spec/other/newgem_spec.rb
-- spec/other/open_spec.rb
-- spec/other/show_spec.rb
-- spec/pack/gems_spec.rb
-- spec/quality_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/builders.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
+test_files: []
+

data/spec/pack/gems_spec.rb

@@ -1,22 +0,0 @@
-require "spec_helper"
-
-describe "bundle pack with gems" do
-  describe "when there are only gemsources" do
-    before :each do
-      gemfile <<-G
-        gem 'rack'
-      G
-
-      system_gems "rack-1.0.0"
-      bundle :pack
-    end
-
-    it "locks the gemfile" do
-      bundled_app("Gemfile.lock").should exist
-    end
-
-    it "caches the gems" do
-      bundled_app("vendor/cache/rack-1.0.0.gem").should exist
-    end
-  end
-end