bundler 1.0.22 → 1.1.pre

data/lib/bundler/vendor/thor/parser/arguments.rb

@@ -28,7 +28,7 @@ class Thor
       @switches = arguments
 
       arguments.each do |argument|
-        if argument.default != nil
+        if argument.default
           @assigns[argument.human_name] = argument.default
         elsif argument.required?
           @non_assigned_required << argument
@@ -94,7 +94,7 @@ class Thor
         hash = {}
 
         while current_is_value? && peek.include?(?:)
-          key, value = shift.split(':',2)
+          key, value = shift.split(':')
           hash[key] = value
         end
         hash

data/lib/bundler/vendor/thor/parser/option.rb

@@ -37,7 +37,7 @@ class Thor
     # string (--foo=value) or booleans (just --foo).
     #
     # By default all options are optional, unless :required is given.
-    #
+    # 
     def self.parse(key, value)
       if key.is_a?(Array)
         name, *aliases = key

data/lib/bundler/vendor/thor/parser/options.rb

@@ -53,9 +53,7 @@ class Thor
       @pile = args.dup
 
       while peek
-        match, is_switch = current_is_switch?
-
-        if is_switch
+        if current_is_switch?
           case shift
             when SHORT_SQ_RE
               unshift($1.split('').map { |f| "-#{f}" })
@@ -70,7 +68,7 @@ class Thor
           switch = normalize_switch(switch)
           option = switch_option(switch)
           @assigns[option.human_name] = parse_peek(switch, option)
-        elsif match
+        elsif current_is_switch_formatted?
           @unknown << shift
         else
           shift
@@ -85,9 +83,7 @@ class Thor
     end
 
     def check_unknown!
-      unless ARGV.include?("exec") || ARGV.include?("config")
-        raise UnknownArgumentError, "Unknown switches '#{@unknown.join(', ')}'" unless @unknown.empty?
-      end
+      raise UnknownArgumentError, "Unknown switches '#{@unknown.join(', ')}'" unless @unknown.empty?
     end
 
     protected
@@ -96,17 +92,15 @@ class Thor
       #
       def current_is_switch?
         case peek
-        when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM
-          [true, switch?($1)]
-        when SHORT_SQ_RE
-          [true, $1.split('').any? { |f| switch?("-#{f}") }]
-        else
-          [false, false]
+          when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM
+            switch?($1)
+          when SHORT_SQ_RE
+            $1.split('').any? { |f| switch?("-#{f}") }
         end
       end
 
-      def current_is_switch_formatted?
-        case peek
+      def switch_formatted?(arg)
+        case arg
         when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM, SHORT_SQ_RE
           true
         else
@@ -114,8 +108,12 @@ class Thor
         end
       end
 
+      def current_is_switch_formatted?
+        switch_formatted? peek
+      end
+
       def switch?(arg)
-        switch_option(normalize_switch(arg))
+        switch_option(arg) || @shorts.key?(arg)
       end
 
       def switch_option(arg)
@@ -129,7 +127,7 @@ class Thor
       # Check if the given argument is actually a shortcut.
       #
       def normalize_switch(arg)
-        (@shorts[arg] || arg).tr('_', '-')
+        @shorts.key?(arg) ? @shorts[arg] : arg
       end
 
       # Parse boolean values which can be given as --foo=true, --foo or --no-foo.
@@ -171,5 +169,6 @@ class Thor
         @non_assigned_required.delete(option)
         send(:"parse_#{option.type}", switch)
       end
+
   end
 end

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

@@ -11,21 +11,6 @@ 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)
@@ -39,7 +24,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
@@ -56,11 +41,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
@@ -76,15 +61,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
@@ -128,7 +113,7 @@ class Thor
           end
 
           sentence = truncate(sentence, options[:truncate]) if options[:truncate]
-          stdout.puts sentence
+          $stdout.puts sentence
         end
       end
 
@@ -154,9 +139,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
 
@@ -195,12 +180,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 something went
+      # internally and should not be used inside your scripts. If someone 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
@@ -212,18 +197,6 @@ class Thor
 
       protected
 
-        def stdout
-          $stdout
-        end
-
-        def stdin
-          $stdin
-        end
-
-        def stderr
-          $stderr
-        end
-
         def is?(value) #:nodoc:
           value = value.to_s
 
@@ -256,7 +229,7 @@ HELP
         end
 
         def quiet? #:nodoc:
-          mute? || (base && base.options[:quiet])
+          base && base.options[:quiet]
         end
 
         # This code was copied from Rake, available under MIT-LICENSE

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

@@ -65,9 +65,10 @@ 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 a public method.
+    # Given a target, checks if this class name is not a private/protected method.
     def public_method?(instance) #:nodoc:
-      !(instance.public_methods & [name.to_s, name.to_sym]).empty?
+      collection = instance.private_methods + instance.protected_methods
+      (collection & [name.to_s, name.to_sym]).empty?
     end
 
     def sans_backtrace(backtrace, caller) #:nodoc:
@@ -110,4 +111,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::Util.namespace_from_thor_class(Foo::Bar::Baz) #=> "foo:bar:baz"
+  #   Thor::Utils.namespace_from_thor_class(Foo::Bar::Baz) #=> "foo:bar:baz"
   #
   # 2) Loading thor files and sandboxing:
   #
-  #   Thor::Util.load_thorfile("~/.thor/foo")
+  #   Thor::Utils.load_thorfile("~/.thor/foo")
   #
   module Util
 

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

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

data/lib/bundler/vlad.rb

@@ -4,8 +4,6 @@
 # include the vlad:bundle:install task in your vlad:deploy task.
 require 'bundler/deployment'
 
-include Rake::DSL if defined? Rake::DSL
-
 namespace :vlad do
   Bundler::Deployment.define_task(Rake::RemoteTask, :remote_task, :roles => :app)
 end

data/man/bundle-install.ronn

@@ -54,13 +54,12 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--local`:
   Do not attempt to connect to `rubygems.org`, instead using just
-  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.
+  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.
 
 * `--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
@@ -73,8 +72,6 @@ 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/man/gemfile.5.ronn

@@ -55,9 +55,6 @@ 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
@@ -123,8 +120,6 @@ There are a number of `Gemfile` platforms:
     _mri_ `AND` version 1.8
   * `mri_19`:
     _mri_ `AND` version 1.9
-  * `rbx`:
-    Same as _ruby_, but only Rubinius (not MRI)
   * `jruby`:
     JRuby
   * `mswin`:
@@ -280,5 +275,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`, searching each source in your `Gemfile`
-     from last added to first added.
+  3. The sources specified via `source`, in the order in which they were
+     declared in the `Gemfile`.

data/spec/cache/gems_spec.rb

@@ -214,17 +214,6 @@ describe "bundle cache" do
       bundle "install"
       out.should_not =~ /removing/i
     end
-
-    it "should install gems with the name bundler in them (that aren't bundler)" do
-      build_gem "foo-bundler", "1.0",
-        :path => bundled_app('vendor/cache')
-
-      install_gemfile <<-G
-        gem "foo-bundler"
-      G
-
-      should_be_installed "foo-bundler 1.0"
-    end
   end
 
 end

data/spec/cache/git_spec.rb

@@ -4,9 +4,6 @@ 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/deploy_spec.rb

@@ -21,7 +21,7 @@ describe "install with --deployment or --frozen" do
   it "works after you try to deploy without a lock" do
     bundle "install --deployment"
     bundle :install, :exitstatus => true
-    exitstatus.should eq(0)
+    check exitstatus.should == 0
     should_be_installed "rack 1.0"
   end
 
@@ -76,7 +76,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("deployment mode")
+      out.should include("You have modified your Gemfile")
       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("deployment mode")
+      out.should include("You have modified your Gemfile")
       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("deployment mode")
+      out.should include("You have modified your Gemfile")
       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("deployment mode")
+      out.should include("You have modified your Gemfile")
       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("deployment mode")
+      out.should include("You have modified your Gemfile")
       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("deployment mode")
+      out.should include("You have modified your Gemfile")
       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("deployment mode")
+      out.should include("You have modified your Gemfile")
       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")