bundler 1.0.22 → 1.1.pre

data/lib/bundler/vendor/thor.rb

@@ -18,23 +18,6 @@ class Thor
       end
     end
 
-    # Registers another Thor subclass as a command.
-    #
-    # ==== Parameters
-    # klass<Class>:: Thor subclass to register
-    # command<String>:: Subcommand name to use
-    # usage<String>:: Short usage for the subcommand
-    # description<String>:: Description for the subcommand
-    def register(klass, subcommand_name, usage, description, options={})
-      if klass <= Thor::Group
-        desc usage, description, options
-        define_method(subcommand_name) { invoke klass }
-      else
-        desc usage, description, options
-        subcommand subcommand_name, klass
-      end
-    end
-
     # Defines the usage and the description of the next task.
     #
     # ==== Parameters
@@ -269,7 +252,8 @@ class Thor
       # the namespace should be displayed as arguments.
       #
       def banner(task, namespace = nil, subcommand = false)
-        "#{basename} #{task.formatted_usage(self, $thor_runner, subcommand)}"
+        base = File.basename($0).split(" ").first
+        "#{base} #{task.formatted_usage(self, $thor_runner, subcommand)}"
       end
 
       def baseclass #:nodoc:
@@ -311,40 +295,17 @@ class Thor
       # Receives a task name (can be nil), and try to get a map from it.
       # If a map can't be found use the sent name or the default task.
       def normalize_task_name(meth) #:nodoc:
-        meth = map[meth.to_s] || find_subcommand_and_update_argv(meth) || meth || default_task
+        meth = map[meth.to_s] || meth || default_task
         meth.to_s.gsub('-','_') # treat foo-bar > foo_bar
       end
 
-      # terrible hack that overwrites ARGV
-      def find_subcommand_and_update_argv(subcmd_name) #:nodoc:
-        return unless subcmd_name
-        cmd = find_subcommand(subcmd_name)
-        ARGV[0] = cmd if cmd
-        cmd
-      end
-
-      def find_subcommand(subcmd_name)
-        possibilities = find_subcommand_possibilities subcmd_name
-        if possibilities.size > 1
-          raise "Ambiguous subcommand #{subcmd_name} matches [#{possibilities.join(', ')}]"
-        elsif possibilities.size < 1
-          return nil
-        end
-
-        possibilities.first
-      end
-
-      def find_subcommand_possibilities(subcmd_name)
-        len = subcmd_name.length
-        all_tasks.map {|t| t.first}.select { |n| subcmd_name == n[0, len] }
-      end
-
       def subcommand_help(cmd)
         desc "help [COMMAND]", "Describe subcommands or one specific subcommand"
         class_eval <<-RUBY
           def help(task = nil, subcommand = true); super; end
         RUBY
       end
+
   end
 
   include Thor::Base

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

@@ -1,12 +1,10 @@
 require 'fileutils'
 require 'uri'
 require 'thor/core_ext/file_binary_read'
-require 'thor/actions/create_file'
-require 'thor/actions/create_link'
-require 'thor/actions/directory'
-require 'thor/actions/empty_directory'
-require 'thor/actions/file_manipulation'
-require 'thor/actions/inject_into_file'
+
+Dir[File.join(File.dirname(__FILE__), "actions", "*.rb")].each do |action|
+  require action
+end
 
 class Thor
   module Actions
@@ -160,23 +158,13 @@ class Thor
     #
     def inside(dir='', config={}, &block)
       verbose = config.fetch(:verbose, false)
-      pretend = options[:pretend]
 
       say_status :inside, dir, verbose
       shell.padding += 1 if verbose
       @destination_stack.push File.expand_path(dir, destination_root)
 
-      # If the directory doesnt exist and we're not pretending
-      if !File.exist?(destination_root) && !pretend
-        FileUtils.mkdir_p(destination_root)
-      end
-
-      if pretend
-        # In pretend mode, just yield down to the block
-        block.arity == 1 ? yield(destination_root) : yield
-      else
-        FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
-      end
+      FileUtils.mkdir_p(destination_root) unless File.exist?(destination_root)
+      FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
 
       @destination_stack.pop
       shell.padding -= 1 if verbose
@@ -222,7 +210,7 @@ class Thor
     #
     # ==== Parameters
     # command<String>:: the command to be executed.
-    # config<Hash>:: give :verbose => false to not log the status, :capture => true to hide to output. Specify :with
+    # config<Hash>:: give :verbose => false to not log the status. Specify :with
     #                to append an executable to command executation.
     #
     # ==== Example
@@ -243,10 +231,7 @@ class Thor
       end
 
       say_status :run, desc, config.fetch(:verbose, true)
-
-      unless options[:pretend]
-        config[:capture] ? `#{command}` : system("#{command}")
-      end
+      `#{command}` unless options[:pretend]
     end
 
     # Executes a ruby script (taking into account WIN32 platform quirks).
@@ -266,9 +251,8 @@ class Thor
     # ==== Parameters
     # task<String>:: the task to be invoked
     # args<Array>:: arguments to the task
-    # config<Hash>:: give :verbose => false to not log the status, :capture => true to hide to output.
-    #                Other options are given as parameter to Thor.
-    #
+    # config<Hash>:: give :verbose => false to not log the status. Other options
+    #                are given as parameter to Thor.
     #
     # ==== Examples
     #
@@ -282,13 +266,12 @@ class Thor
       config  = args.last.is_a?(Hash) ? args.pop : {}
       verbose = config.key?(:verbose) ? config.delete(:verbose) : true
       pretend = config.key?(:pretend) ? config.delete(:pretend) : false
-      capture = config.key?(:capture) ? config.delete(:capture) : false
 
       args.unshift task
       args.push Thor::Options.to_switches(config)
       command = args.join(' ').strip
 
-      run command, :with => :thor, :verbose => verbose, :pretend => pretend, :capture => capture
+      run command, :with => :thor, :verbose => verbose, :pretend => pretend
     end
 
     protected

data/lib/bundler/vendor/thor/actions/create_file.rb

@@ -18,7 +18,7 @@ class Thor
     #     "vhost.name = #{hostname}"
     #   end
     #
-    #   create_file "config/apache.conf", "your apache config"
+    #   create_file "config/apach.conf", "your apache config"
     #
     def create_file(destination, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
@@ -27,7 +27,7 @@ class Thor
     end
     alias :add_file :create_file
 
-    # CreateFile is a subset of Template, which instead of rendering a file with
+    # AddFile is a subset of Template, which instead of rendering a file with
     # ERB, it gets the content from the user.
     #
     class CreateFile < EmptyDirectory #:nodoc:

data/lib/bundler/vendor/thor/actions/directory.rb

@@ -21,7 +21,7 @@ class Thor
     #   directory "doc"
     #
     # It will create a doc directory in the destination with the following
-    # files (assuming that the `app_name` method returns the value "blog"):
+    # files (assuming that the app_name is "blog"):
     #
     #   doc/
     #     components/
@@ -70,7 +70,7 @@ class Thor
           lookup = config[:recursive] ? File.join(source, '**') : source
           lookup = File.join(lookup, '{*,.[a-z]*}')
 
-          Dir[lookup].sort.each do |file_source|
+          Dir[lookup].each do |file_source|
             next if File.directory?(file_source)
             file_destination = File.join(given_destination, file_source.gsub(source, '.'))
             file_destination.gsub!('/./', '/')

data/lib/bundler/vendor/thor/actions/file_manipulation.rb

@@ -30,28 +30,6 @@ class Thor
       end
     end
 
-    # Links the file from the relative source to the relative destination. If
-    # the destination is not given it's assumed to be equal to the source.
-    #
-    # ==== Parameters
-    # source<String>:: the relative path to the source root.
-    # destination<String>:: the relative path to the destination root.
-    # config<Hash>:: give :verbose => false to not log the status.
-    #
-    # ==== Examples
-    #
-    #   link_file "README", "doc/README"
-    #
-    #   link_file "doc/README"
-    #
-    def link_file(source, *args, &block)
-      config = args.last.is_a?(Hash) ? args.pop : {}
-      destination = args.first || source
-      source = File.expand_path(find_in_source_paths(source.to_s))
-
-      create_link destination, source, config
-    end
-
     # Gets the content at the given address and places it at the given relative
     # destination. If a block is given instead of destination, the content of
     # the url is yielded and used as location.
@@ -73,7 +51,7 @@ class Thor
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first
 
-      source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^https?\:\/\//
+      source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^http\:\/\//
       render = open(source) {|input| input.binmode.read }
 
       destination ||= if block_given?
@@ -102,13 +80,13 @@ class Thor
     #
     def template(source, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
-      destination = args.first || source.sub(/\.tt$/, '')
+      destination = args.first || source
 
       source  = File.expand_path(find_in_source_paths(source.to_s))
       context = instance_eval('binding')
 
       create_file destination, nil, config do
-        content = ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
+        content = ERB.new(::File.binread(source), nil, '-').result(context)
         content = block.call(content) if block
         content
       end
@@ -132,7 +110,7 @@ class Thor
       FileUtils.chmod_R(mode, path) unless options[:pretend]
     end
 
-    # Prepend text to a file. Since it depends on insert_into_file, it's reversible.
+    # Prepend text to a file. Since it depends on inject_into_file, it's reversible.
     #
     # ==== Parameters
     # path<String>:: path of the file to be changed
@@ -141,20 +119,19 @@ class Thor
     #
     # ==== Example
     #
-    #   prepend_to_file 'config/environments/test.rb', 'config.gem "rspec"'
+    #   prepend_file 'config/environments/test.rb', 'config.gem "rspec"'
     #
-    #   prepend_to_file 'config/environments/test.rb' do
+    #   prepend_file 'config/environments/test.rb' do
     #     'config.gem "rspec"'
     #   end
     #
-    def prepend_to_file(path, *args, &block)
+    def prepend_file(path, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
       config.merge!(:after => /\A/)
-      insert_into_file(path, *(args << config), &block)
+      inject_into_file(path, *(args << config), &block)
     end
-    alias_method :prepend_file, :prepend_to_file
 
-    # Append text to a file. Since it depends on insert_into_file, it's reversible.
+    # Append text to a file. Since it depends on inject_into_file, it's reversible.
     #
     # ==== Parameters
     # path<String>:: path of the file to be changed
@@ -163,21 +140,20 @@ class Thor
     #
     # ==== Example
     #
-    #   append_to_file 'config/environments/test.rb', 'config.gem "rspec"'
+    #   append_file 'config/environments/test.rb', 'config.gem "rspec"'
     #
-    #   append_to_file 'config/environments/test.rb' do
+    #   append_file 'config/environments/test.rb' do
     #     'config.gem "rspec"'
     #   end
     #
-    def append_to_file(path, *args, &block)
+    def append_file(path, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
       config.merge!(:before => /\z/)
-      insert_into_file(path, *(args << config), &block)
+      inject_into_file(path, *(args << config), &block)
     end
-    alias_method :append_file, :append_to_file
 
     # Injects text right after the class definition. Since it depends on
-    # insert_into_file, it's reversible.
+    # inject_into_file, it's reversible.
     #
     # ==== Parameters
     # path<String>:: path of the file to be changed
@@ -196,7 +172,7 @@ class Thor
     def inject_into_class(path, klass, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
       config.merge!(:after => /class #{klass}\n|class #{klass} .*\n/)
-      insert_into_file(path, *(args << config), &block)
+      inject_into_file(path, *(args << config), &block)
     end
 
     # Run a regular expression replacement on a file.
@@ -249,22 +225,5 @@ class Thor
     end
     alias :remove_dir :remove_file
 
-  private
-    attr_accessor :output_buffer
-    def concat(string)
-      @output_buffer.concat(string)
-    end
-
-    def capture(*args, &block)
-      with_output_buffer { block.call(*args) }
-    end
-
-    def with_output_buffer(buf = '') #:nodoc:
-      self.output_buffer, old_buffer = buf, output_buffer
-      yield
-      output_buffer
-    ensure
-      self.output_buffer = old_buffer
-    end
   end
 end

data/lib/bundler/vendor/thor/actions/inject_into_file.rb

@@ -10,19 +10,19 @@ class Thor
     # destination<String>:: Relative path to the destination root
     # data<String>:: Data to add to the file. Can be given as a block.
     # config<Hash>:: give :verbose => false to not log the status and the flag
-    #                for injection (:after or :before) or :force => true for
+    #                for injection (:after or :before) or :force => true for 
     #                insert two or more times the same content.
-    #
+    # 
     # ==== Examples
     #
-    #   insert_into_file "config/environment.rb", "config.gem :thor", :after => "Rails::Initializer.run do |config|\n"
+    #   inject_into_file "config/environment.rb", "config.gem :thor", :after => "Rails::Initializer.run do |config|\n"
     #
-    #   insert_into_file "config/environment.rb", :after => "Rails::Initializer.run do |config|\n" do
+    #   inject_into_file "config/environment.rb", :after => "Rails::Initializer.run do |config|\n" do
     #     gems = ask "Which gems would you like to add?"
     #     gems.split(" ").map{ |gem| "  config.gem :#{gem}" }.join("\n")
     #   end
     #
-    def insert_into_file(destination, *args, &block)
+    def inject_into_file(destination, *args, &block)
       if block_given?
         data, config = block, args.shift
       else
@@ -30,7 +30,6 @@ class Thor
       end
       action InjectIntoFile.new(self, destination, data, config)
     end
-    alias_method :inject_into_file, :insert_into_file
 
     class InjectIntoFile < EmptyDirectory #:nodoc:
       attr_reader :replacement, :flag, :behavior
@@ -77,16 +76,12 @@ class Thor
       protected
 
         def say_status(behavior)
-          status = if behavior == :invoke
-            if flag == /\A/
-               :prepend
-            elsif flag == /\z/
-              :append
-            else
-              :insert
-            end
+          status = if flag == /\A/
+            behavior == :invoke ? :prepend : :unprepend
+          elsif flag == /\z/
+            behavior == :invoke ? :append : :unappend
           else
-            :subtract
+            behavior == :invoke ? :inject : :deinject
           end
 
           super(status, config[:verbose])

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

@@ -94,6 +94,8 @@ class Thor
     end
 
     module ClassMethods
+      attr_accessor :debugging
+
       def attr_reader(*) #:nodoc:
         no_tasks { super }
       end
@@ -382,29 +384,14 @@ class Thor
       #   script.invoke(:task, first_arg, second_arg, third_arg)
       #
       def start(given_args=ARGV, config={})
+        self.debugging = given_args.delete("--debug")
         config[:shell] ||= Thor::Base.shell.new
         dispatch(nil, given_args.dup, nil, config)
       rescue Thor::Error => e
-        ENV["THOR_DEBUG"] == "1" ? (raise e) : config[:shell].error(e.message)
+        debugging ? (raise e) : config[:shell].error(e.message)
         exit(1) if exit_on_failure?
       end
 
-      # Allows to use private methods from parent in child classes as tasks.
-      #
-      # ==== Paremeters
-      #   names<Array>:: Method names to be used as tasks
-      #
-      # ==== Examples
-      #
-      #   public_task :foo
-      #   public_task :foo, :bar, :baz
-      #
-      def public_task(*names)
-        names.each do |name|
-          class_eval "def #{name}(*); super end"
-        end
-      end
-
       def handle_no_task_error(task) #:nodoc:
         if $thor_runner
           raise UndefinedTaskError, "Could not find task #{task.inspect} in #{namespace.inspect} namespace."
@@ -544,13 +531,6 @@ class Thor
           false
         end
 
-        #
-        # The basename of the program invoking the thor class.
-        #
-        def basename
-          File.basename($0).split(' ').first
-        end
-
         # SIGNATURE: Sets the baseclass. This is where the superclass lookup
         # finishes.
         def baseclass #:nodoc: