josevalim-thor 0.10.0 → 0.10.1

data/lib/thor/actions/directory.rb

@@ -4,7 +4,27 @@ class Thor
   module Actions
 
     # Copies interactively the files from source directory to root directory.
-    # Use it just to copy static files.
+    # If any of the files finishes with .tt, it's considered to be a template
+    # and is placed in the destination without the extension .tt. Remember that
+    # file paths can also be encoded, let's suppose a doc directory with the
+    # following files:
+    #
+    #   doc/
+    #     README
+    #     rdoc.rb.tt
+    #     %app_name%.rb
+    #
+    # When invoked as:
+    #
+    #   directory "doc"
+    #
+    # It will create a doc directory in the destination with the following
+    # files (assuming that the app_name is "blog"):
+    #
+    #   doc/
+    #     README
+    #     rdoc.rb
+    #     blog.rb
     #
     # ==== Parameters
     # source<String>:: the relative path to the source root
@@ -22,12 +42,17 @@ class Thor
     class Directory < Templater #:nodoc:
 
       def invoke!
-        files = Dir[File.join(source, '**', '*')].select{ |f| !File.directory?(f) }
+        Dir[File.join(source, '**', '*')].each do |file_source|
+          next if File.directory?(file_source)
 
-        files.each do |file_source|
           file_destination = File.join(relative_destination, file_source.gsub(source, ''))
           file_source.gsub!(base.source_root, '.')
-          base.copy_file(file_source, file_destination, @log_status)
+
+          if file_source =~ /.tt$/
+            base.template(file_source, file_destination[0..-4], @log_status)
+          else
+            base.copy_file(file_source, file_destination, @log_status)
+          end
         end
       end
 

data/lib/thor/actions/template.rb

@@ -6,7 +6,7 @@ class Thor
 
     # Gets an ERB template at the relative source, executes it and makes a copy
     # at the relative destination. If the destination is not given it's assumed
-    # to be equal to the source.
+    # to be equal to the source removing .tt from the filename.
     #
     # ==== Parameters
     # source<String>:: the relative path to the source root
@@ -20,7 +20,8 @@ class Thor
     #   template "doc/README"
     #
     def template(source, destination=nil, log_status=true)
-      action Template.new(self, source, destination || source, log_status)
+      destination ||= source.gsub('.tt$', '')
+      action Template.new(self, source, destination, log_status)
     end
 
     class Template < Templater #:nodoc:

data/lib/thor/actions/templater.rb

@@ -97,11 +97,26 @@ class Thor
         #
         def destination=(destination)
           if destination
-            @destination = ::File.expand_path(destination.to_s, base.destination_root)
+            @destination = ::File.expand_path(convert_encoded_instructions(destination.to_s), base.destination_root)
             @relative_destination = base.relative_to_absolute_root(@destination)
           end
         end
 
+        # Filenames in the encoded form are converted. If you have a file:
+        #
+        #   %class_name%.rb
+        #
+        # It gets the class name from the base and replace it:
+        #
+        #   user.rb
+        #
+        def convert_encoded_instructions(filename)
+          filename.gsub(/%(.*?)%/) do |string|
+            instruction = $1.strip
+            base.respond_to?(instruction) ? base.send(instruction) : string
+          end
+        end
+
         # Receives a hash of options and just execute the block if some
         # conditions are met.
         #
@@ -118,6 +133,8 @@ class Thor
             say_status :create, :green
             block.call unless pretend?
           end
+
+          destination
         end
 
         # If force is true, run the action, otherwise check if it's not being
@@ -148,16 +165,6 @@ class Thor
           base.shell.say_status status, relative_destination, color if @log_status
         end
 
-        # TODO Add this behavior to all actions.
-        #
-        def after_invoke
-          # Optionally change permissions.
-          FileUtils.chmod(base.options[:chmod], destination) if base.options[:chmod]
-
-          # Optionally add file to subversion or git
-          system("git add -v #{relative_destination}") if options[:git]
-        end
-
     end
   end
 end

data/lib/thor/actions.rb

@@ -13,25 +13,17 @@ class Thor
     def self.included(base) #:nodoc:
       return unless base.respond_to?(:class_option)
 
-      base.class_option :pretend, :type => :boolean, :aliases => "-p",
+      base.class_option :pretend, :type => :boolean, :aliases => "-p", :group => :runtime,
                                   :desc => "Run but do not make any changes"
 
-      base.class_option :force, :type => :boolean, :aliases => "-f",
+      base.class_option :force, :type => :boolean, :aliases => "-f", :group => :runtime,
                                 :desc => "Overwrite files that already exist"
 
-      base.class_option :skip, :type => :boolean, :aliases => "-s",
+      base.class_option :skip, :type => :boolean, :aliases => "-s", :group => :runtime,
                                :desc => "Skip files that already exist"
 
-      base.class_option :quiet, :type => :boolean, :aliases => "-q",
+      base.class_option :quiet, :type => :boolean, :aliases => "-q", :group => :runtime,
                                 :desc => "Supress status output"
-
-      # TODO Add git support
-      base.class_option :git, :type => :boolean, :aliases => "-g",
-                              :desc => "Modify files with git (note: git must be on the path)"
-
-      # TODO Add chmod support
-      base.class_option :chmod, :type => :string, :aliases => "-c",
-                                :desc => "Set the mode of added/copied files"
     end
 
     # Extends initializer to add more configuration options.
@@ -136,6 +128,154 @@ class Thor
       inside(@root_stack.first) { yield }
     end
 
+    # Changes the mode of the given file or directory.
+    #
+    # ==== Parameters
+    # mode<Integer>:: the file mode
+    # path<String>:: the name of the file to change mode
+    # log_status<Boolean>:: if false, does not log the status. True by default.
+    #                       If a symbol is given, uses it as the output color.
+    #
+    # ==== Example
+    #
+    #   chmod "script/*", 0755
+    #
+    def chmod(mode, path, log_status=true)
+      path = File.expand_path(path, root)
+      say_status_if_log :chmod, relative_to_absolute_root(path), log_status
+      FileUtils.chmod_R(mode, path) unless options[:pretend]
+    end
+
+    # Executes a command.
+    #
+    # ==== Parameters
+    # command<String>:: the command to be executed.
+    # log_status<Boolean>:: if false, does not log the status. True by default.
+    #                       If a symbol is given, uses it as the output color.
+    #
+    # ==== Example
+    #
+    #   inside('vendor') do
+    #     run('ln -s ~/edge rails')
+    #   end
+    #
+    def run(command, log_status=true)
+      say_status_if_log :run, "#{command} from #{relative_to_absolute_root(root, false)}", log_status
+      `#{command}` unless options[:pretend]
+    end
+
+    # Executes a ruby script (taking into account WIN32 platform quirks).
+    #
+    # ==== Parameters
+    # command<String>:: the command to be executed.
+    # log_status<Boolean>:: if false, does not log the status. True by default.
+    #                       If a symbol is given, uses it as the output color.
+    #
+    def run_ruby_script(command, log_status=true)
+      run("ruby #{command}", log_status)
+    end
+
+    # Run a thor command. A hash of options can be given and it's converted to 
+    # switches.
+    #
+    # ==== Parameters
+    # task<String>:: the task to be invoked
+    # args<Array>:: arguments to the task
+    # options<Hash>:: a hash with options used on invocation
+    # log_status<Boolean>:: if false, does not log the status. True by default.
+    #                       If a symbol is given, uses it as the output color.
+    #
+    # ==== Examples
+    #
+    #   thor :install, "http://gist.github.com/103208"
+    #   #=> thor install http://gist.github.com/103208
+    #
+    #   thor :list, :all => true, :substring => 'rails'
+    #   #=> thor list --all --substring=rails
+    #
+    def thor(task, *args)
+      log_status = args.last.is_a?(Symbol) || [true, false].include?(args.last) ? args.pop : true
+      options = args.last.is_a?(Hash) ? args.pop : {}
+
+      in_root do
+        args.unshift "thor #{task}"
+        args.push Thor::Options.to_switches(options)
+        run args.join(' ').strip, log_status
+      end
+    end
+
+    # Run a regular expression replacement on a file.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # flag<Regexp|String>:: the regexp or string to be replaced
+    # replacement<String>:: the replacement, can be also given as a block
+    # log_status<Boolean>:: if false, does not log the status. True by default.
+    #                       If a symbol is given, uses it as the output color.
+    #
+    # ==== Example
+    #
+    #   gsub_file 'app/controllers/application_controller.rb', /#\s*(filter_parameter_logging :password)/, '\1'
+    #
+    #   gsub_file 'README', /rake/, :green do |match|
+    #     match << " no more. Use thor!"
+    #   end
+    #
+    def gsub_file(path, flag, *args, &block)
+      log_status = args.last.is_a?(Symbol) || [ true, false ].include?(args.last) ? args.pop : true
+
+      path = File.expand_path(path, root)
+      say_status_if_log :gsub, relative_to_absolute_root(path), log_status
+
+      unless options[:pretend]
+        content = File.read(path)
+        content.gsub!(flag, *args, &block)
+        File.open(path, 'wb') { |file| file.write(content) }
+      end
+    end
+
+    # Append text to a file.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # data<String>:: the data to append to the file, can be also given as a block.
+    # log_status<Boolean>:: if false, does not log the status. True by default.
+    #                       If a symbol is given, uses it as the output color.
+    #
+    # ==== Example
+    #
+    #   append_file 'config/environments/test.rb', 'config.gem "rspec"'
+    #
+    def append_file(path, data=nil, log_status=true, &block)
+      path = File.expand_path(path, root)
+      say_status_if_log :append, relative_to_absolute_root(path), log_status
+
+      File.open(path, 'ab') { |file| file.write(data || block.call) } unless options[:pretend]
+    end
+
+    # Prepend text to a file.
+    #
+    # ==== Parameters
+    # path<String>:: path of the file to be changed
+    # data<String>:: the data to prepend to the file, can be also given as a block.
+    # log_status<Boolean>:: if false, does not log the status. True by default.
+    #                       If a symbol is given, uses it as the output color.
+    #
+    # ==== Example
+    #
+    #   prepend_file 'config/environments/test.rb', 'config.gem "rspec"'
+    #
+    def prepend_file(path, data=nil, log_status=true, &block)
+      path = File.expand_path(path, root)
+      say_status_if_log :prepend, relative_to_absolute_root(path), log_status
+
+      unless options[:pretend]
+        content = data || block.call
+        content << File.read(path)
+        File.open(path, 'wb') { |file| file.write(content) }
+      end
+    end
+
     protected
 
       def say_status_if_log(status, message, log_status)

data/lib/thor/base.rb

@@ -83,8 +83,14 @@ class Thor
       #
       # ==== Parameters
       # name<Symbol>:: The name of the argument.
-      # options<Hash>:: The description, type, default value for this argument.
-      #                 The type can be :string, :numeric, :hash or :array. If none, string is assumed.
+      # options<Hash>:: Described below.
+      #
+      # ==== Options
+      # :desc     - Description for the argument.
+      # :required - If the argument is required or not.
+      # :optional - If the argument is optional or not.
+      # :type     - The type of the argument, can be :string, :hash, :array, :numeric.
+      # :default  - Default value for this argument. It cannot be required and have default values.
       #
       # ==== Errors
       # ArgumentError:: Raised if you supply a required argument after a non required one.
@@ -138,9 +144,16 @@ class Thor
       #
       # ==== Parameters
       # name<Symbol>:: The name of the argument.
-      # options<Hash>:: The description, type, default value, aliases and if this option is required or not.
-      #                 The type can be :string, :boolean, :numeric, :hash or :array. If none is given
-      #                 a default type which accepts both (--name and --name=NAME) entries is assumed.
+      # options<Hash>:: Described below.
+      #
+      # ==== Options
+      # :desc     - Description for the argument.
+      # :required - If the argument is required or not.
+      # :default  - Default value for this argument. It cannot be required and have default values.
+      # :group    - The group for this options. Use by class options to output options in different levels.
+      # :aliases  - Aliases for this option.
+      # :type     - The type of the argument, can be :string, :hash, :array, :numeric, :boolean or :default.
+      #             Default accepts arguments as booleans (--switch) or as strings (--switch=VALUE).
       #
       def class_option(name, options)
         build_option(name, options, class_options)
@@ -277,17 +290,53 @@ class Thor
 
       protected
 
+        # Prints the class optins per group. If a class options does not belong
+        # to any group, it's grouped as "Class options" in Thor classes and as
+        # "Options" in Thor::Group (since Thor::Group does not have method
+        # options, there is not need to add "Class" frist).
+        #
+        def class_options_help(shell, ungrouped_name=nil) #:nodoc:
+          unless self.class_options.empty?
+            groups = self.class_options.group_values_by { |o| o.group }
+
+            printer = lambda do |group_name, options|
+              unless options.empty?
+                options.map! do |option|
+                  next if option.argument?
+                  [ option.usage, option.description || '' ]
+                end
+
+                options.compact!
+
+                if group_name
+                  shell.say "#{group_name} options:"
+                else
+                  shell.say "Options:"
+                end
+
+                shell.print_table(options, :emphasize_last => true, :ident => 2)
+                shell.say ""
+              end
+            end
+
+            # Deal with default group
+            global_options = groups.delete(nil)
+            printer.call(ungrouped_name, global_options) if global_options
+
+            # Print all others
+            groups.each(&printer)
+          end
+        end
+
         # Build an option and adds it to the given scope.
         #
         # ==== Parameters
         # name<Symbol>:: The name of the argument.
-        # options<Hash>:: The desc, type, default value and aliases for this option.
-        #                 The type can be :string, :boolean, :numeric, :hash or :array. If none is given
-        #                 a default type which accepts both (--name and --name=NAME) entries is assumed.
+        # options<Hash>:: Described in both class_option and method_option.
         #
         def build_option(name, options, scope)
-          scope[name] = Thor::Option.new(name, options[:desc], options[:required],
-                                         options[:type], options[:default], options[:aliases])
+          scope[name] = Thor::Option.new(name, options[:desc], options[:required], options[:type],
+                                               options[:default], options[:aliases], options[:group])
         end
 
         # Receives a hash of options, parse them and add to the scope. This is a

data/lib/thor/core_ext/hash_with_indifferent_access.rb

@@ -43,12 +43,18 @@ class Thor
 
         # Magic predicates. For instance:
         #
-        #   options.force? # => !!options['force']
+        #   options.force?                  # => !!options['force']
+        #   options.shebang                 # => "/usr/lib/local/ruby"
+        #   options.test_framework?(:rspec) # => options[:test_framework] == :rspec
         #
         def method_missing(method, *args, &block)
           method = method.to_s
           if method =~ /^(\w+)\?$/
-            !!self[$1]
+            if args.empty?
+              !!self[$1]
+            else
+              self[$1] == args.first
+            end
           else 
             self[method]
           end

data/lib/thor/core_ext/ordered_hash.rb

@@ -7,9 +7,10 @@ class Thor #:nodoc:
     # while also keeping track of the order in which elements were set.
     #
     class OrderedHash #:nodoc:
-      Node = Struct.new(:key, :value, :next, :prev)
       include Enumerable
 
+      Node = Struct.new(:key, :value, :next, :prev)
+
       def initialize
         @hash = {}
       end
@@ -82,6 +83,14 @@ class Thor #:nodoc:
         value
       end
 
+      def keys
+        self.map { |k, v| k }
+      end
+
+      def values
+        self.map { |k, v| v }
+      end
+
       def each
         return unless @first
         yield [@first.key, @first.value]
@@ -90,12 +99,14 @@ class Thor #:nodoc:
         self
       end
 
-      def keys
-        self.map { |k, v| k }
-      end
-
-      def values
-        self.map { |k, v| v }
+      def group_values_by
+        assoc = self.class.new
+        each do |_, element|
+          key = yield(element)
+          assoc[key] ||= []
+          assoc[key] << element
+        end
+        assoc
       end
 
       def merge(other)
@@ -118,10 +129,9 @@ class Thor #:nodoc:
       end
 
       def to_a
-        inject([]) do |array, (key, value)|
-          array << [key, value]
-          array
-        end
+        array = []
+        each { |k, v| array << [k, v] }
+        array
       end
 
       def to_s

data/lib/thor/group.rb

@@ -44,23 +44,12 @@ class Thor::Group
     #
     def help(shell, options={})
       if options[:short]
-        shell.say "#{self.namespace} #{self.class_options.map {|_,o| o.usage}.join(' ')}"
+        shell.say "#{self.namespace} #{self.arguments.map {|o| o.usage }.join(' ')}"
       else
         shell.say "Usage:"
-        shell.say "  #{self.namespace} #{self.arguments.map{|o| o.usage}.join(' ')}"
+        shell.say "  #{self.namespace} #{self.arguments.map {|o| o.usage }.join(' ')}"
         shell.say
-
-        list = self.class_options.map do |_, option|
-          next if option.argument?
-          [ option.usage, option.description || '' ]
-        end.compact
-
-        unless list.empty?
-          shell.say "Global options:"
-          shell.print_table(list, :emphasize_last => true, :ident => 2)
-          shell.say
-        end
-
+        class_options_help(shell)
         shell.say self.desc if self.desc
       end
     end

data/lib/thor/option.rb

@@ -1,10 +1,10 @@
 class Thor
   class Option
-    attr_reader :name, :description, :required, :type, :default, :aliases
+    attr_reader :name, :description, :required, :type, :default, :aliases, :group
 
     VALID_TYPES = [:boolean, :numeric, :hash, :array, :string, :default]
 
-    def initialize(name, description=nil, required=nil, type=nil, default=nil, aliases=nil)
+    def initialize(name, description=nil, required=nil, type=nil, default=nil, aliases=nil, group=nil)
       raise ArgumentError, "Option name can't be nil."                          if name.nil?
       raise ArgumentError, "Option cannot be required and have default values." if required && !default.nil?
       raise ArgumentError, "Type :#{type} is not valid for options."            if type && !VALID_TYPES.include?(type.to_sym)
@@ -15,6 +15,7 @@ class Thor
       @type        = (type || :default).to_sym
       @default     = default
       @aliases     = [*aliases].compact
+      @group       = group.to_s.capitalize if group
     end
 
     # This parse quick options given as method_options. It makes several
@@ -196,7 +197,7 @@ class Thor
       raise ArgumentError, "Argument name can't be nil."               if name.nil?
       raise ArgumentError, "Type :#{type} is not valid for arguments." if type && !VALID_TYPES.include?(type.to_sym)
 
-      super(name, description, required, type || :string, default, [])
+      super(name, description, required, type || :string, default)
     end
 
     def argument?

data/lib/thor/shell/basic.rb

@@ -22,10 +22,10 @@ class Thor
       # ==== Example
       # say("I know you knew that.")
       #
-      def say(statement="", color=nil)
+      def say(statement="", color=nil, force_new_line=false)
         statement = statement.to_s
 
-        if statement[-1, 1] == " " || statement[-1, 1] == "\t"
+        if !force_new_line && (statement[-1, 1] == " " || statement[-1, 1] == "\t")
           $stdout.print(statement)
           $stdout.flush
         else
@@ -40,7 +40,7 @@ class Thor
         return if base && base.options[:quiet]
 
         status_flag = "[#{status.to_s.upcase}]".rjust(12)
-        say "#{status_flag} #{message}"
+        say "#{status_flag} #{message}", color, true
       end
 
       # Make a question the to user and returns true if the user replies "y" or

data/lib/thor/task.rb

@@ -29,7 +29,7 @@ class Thor
       backtrace = sans_backtrace(e.backtrace, caller)
 
       if instance.is_a?(Thor) && backtrace.empty?
-        raise InvocationError, "'#{name}' was called incorrectly. Call as '#{formatted_usage(instance.class)}'"
+        raise InvocationError, "'#{name}' was called incorrectly. Call as '#{formatted_usage(instance.class, true)}'"
       else
         raise e
       end
@@ -47,18 +47,30 @@ class Thor
       description.split("\n").first if description
     end
 
-    # Returns the formatted usage. If a klass is given, the klass default options
-    # are merged with the task options providinf a full description.
+    # Returns the formatted usage. If a klass is given, the klass arguments are
+    # injected in the usage.
     #
-    def formatted_usage(klass=nil)
+    def formatted_usage(klass=nil, namespace=false)
       formatted = ''
-      formatted << "#{klass.namespace.gsub(/^default/,'')}:" if klass
-      formatted << usage.to_s
+      formatted << "#{klass.namespace.gsub(/^default/,'')}:" if klass && namespace
+      formatted << formatted_arguments(klass)
       formatted << " #{formatted_options}"
       formatted.strip!
       formatted
     end
 
+    # Injects the klass arguments into the defined usage.
+    #
+    def formatted_arguments(klass)
+      if klass && !klass.arguments.empty?
+        usage.to_s.gsub(/^#{name}/) do |match|
+          match << " " << klass.arguments.map{ |a| a.usage }.join(' ')
+        end
+      else
+        usage.to_s
+      end
+    end
+
     # Returns the options usage for this task.
     #
     def formatted_options

data/lib/thor/tasks.rb

@@ -1,3 +1,4 @@
+# This only loads all tasks inside tasks.
 Dir[File.join(File.dirname(__FILE__), "tasks", "*.rb")].each do |task|
   require task
 end

data/lib/thor.rb

@@ -95,9 +95,15 @@ class Thor
     #
     # ==== Parameters
     # name<Symbol>:: The name of the argument.
-    # options<Hash>:: The description, type, default value, aliases and if this option is required or not.
-    #                 The type can be :string, :boolean, :numeric, :hash or :array. If none is given
-    #                 a default type which accepts both (--name and --name=NAME) entries is assumed.
+    # options<Hash>:: Described below.
+    #
+    # ==== Options
+    # :desc     - Description for the argument.
+    # :required - If the argument is required or not.
+    # :default  - Default value for this argument. It cannot be required and have default values.
+    # :aliases  - Aliases for this option.
+    # :type     - The type of the argument, can be :string, :hash, :array, :numeric, :boolean or :default.
+    #             Default accepts arguments as booleans (--switch) or as strings (--switch=VALUE).
     #
     def method_option(name, options)
       scope = if options[:for]
@@ -145,33 +151,29 @@ class Thor
     #
     def help(shell, meth=nil, options={})
       meth, options = nil, meth if meth.is_a?(Hash)
-      namespace = options[:namespace] ? self : nil
 
       if meth
         task = self.all_tasks[meth]
         raise UndefinedTaskError, "task '#{meth}' could not be found in namespace '#{self.namespace}'" unless task
 
         shell.say "Usage:"
-        shell.say "  #{task.formatted_usage(namespace)}"
+        shell.say "  #{task.formatted_usage(self, options[:namespace])}"
         shell.say
-        options_help(shell)
+        class_options_help(shell, "Class")
         shell.say task.description
       else
-        if options[:short]
-          list = self.tasks.map do |_, task|
-            [ task.formatted_usage(namespace), task.short_description || '' ]
-          end
+        list = (options[:short] ? tasks : all_tasks).map do |_, task|
+          [ task.formatted_usage(self, options[:namespace]), task.short_description || '' ]
+        end
 
+        if options[:short]
           shell.print_table(list, :emphasize_last => true)
         else
-          options_help(shell)
-
-          list = self.all_tasks.map do |_, task|
-            [ task.formatted_usage(namespace), task.short_description || '' ]
-          end
-
           shell.say "Tasks:"
           shell.print_table(list, :ident => 2, :emphasize_last => true)
+          shell.say
+
+          class_options_help(shell, "Class")
         end
       end
     end
@@ -205,17 +207,6 @@ class Thor
         meth.to_s.gsub('-','_') # treat foo-bar > foo_bar
       end
 
-      def options_help(shell) #:nodoc:
-        unless self.class_options.empty?
-          list = self.class_options.map do |_, option|
-            [ option.usage, option.description || '' ]
-          end
-
-          shell.say "Global arguments:"
-          shell.print_table(list, :emphasize_last => true, :ident => 2)
-          shell.say ""
-        end
-      end
   end
 
   include Thor::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-14 00:00:00 -07:00
+date: 2009-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -42,10 +42,8 @@ files:
 - lib/thor/actions/inject_into_file.rb
 - lib/thor/actions/directory.rb
 - lib/thor/actions/template.rb
-- lib/thor/actions/gsub_file.rb
 - lib/thor/actions/get.rb
 - lib/thor/actions/create_file.rb
-- lib/thor/actions/commands.rb
 - lib/thor/actions/empty_directory.rb
 - lib/thor/util.rb
 - lib/thor/runner.rb

data/lib/thor/actions/commands.rb

@@ -1,61 +0,0 @@
-class Thor
-  module Actions
-    # Executes a command.
-    #
-    # ==== Parameters
-    # command<String>:: the command to be executed.
-    # log_status<Boolean>:: if false, does not log the status. True by default.
-    #                       If a symbol is given, uses it as the output color.
-    #
-    # ==== Example
-    #
-    #   inside('vendor') do
-    #     run('ln -s ~/edge rails')
-    #   end
-    #
-    def run(command, log_status=true)
-      say_status_if_log :run, "#{command} from #{relative_to_absolute_root(root, false)}", log_status
-      `#{command}` unless options[:pretend]
-    end
-
-    # Executes a ruby script (taking into account WIN32 platform quirks).
-    #
-    # ==== Parameters
-    # command<String>:: the command to be executed.
-    # log_status<Boolean>:: if false, does not log the status. True by default.
-    #                       If a symbol is given, uses it as the output color.
-    #
-    def run_ruby_script(command, log_status=true)
-      run("ruby #{command}", log_status)
-    end
-
-    # Run a thor command. A hash of options can be given and it's converted to 
-    # switches.
-    #
-    # ==== Parameters
-    # task<String>:: the task to be invoked
-    # args<Array>:: arguments to the task
-    # options<Hash>:: a hash with options used on invocation
-    # log_status<Boolean>:: if false, does not log the status. True by default.
-    #                       If a symbol is given, uses it as the output color.
-    #
-    # ==== Examples
-    #
-    #   thor :install, "http://gist.github.com/103208"
-    #   #=> thor install http://gist.github.com/103208
-    #
-    #   thor :list, :all => true, :substring => 'rails'
-    #   #=> thor list --all --substring=rails
-    #
-    def thor(task, *args)
-      log_status = args.last.is_a?(Symbol) || [true, false].include?(args.last) ? args.pop : true
-      options = args.last.is_a?(Hash) ? args.pop : {}
-
-      in_root do
-        args.unshift "thor #{task}"
-        args.push Thor::Options.to_switches(options)
-        run args.join(' ').strip, log_status
-      end
-    end
-  end
-end

data/lib/thor/actions/gsub_file.rb

@@ -1,77 +0,0 @@
-class Thor
-  module Actions
-
-    # Run a regular expression replacement on a file.
-    #
-    # ==== Parameters
-    # path<String>:: path of the file to be changed
-    # flag<Regexp|String>:: the regexp or string to be replaced
-    # replacement<String>:: the replacement, can be also given as a block
-    # log_status<Boolean>:: if false, does not log the status. True by default.
-    #                       If a symbol is given, uses it as the output color.
-    #
-    # ==== Example
-    #
-    #   gsub_file 'app/controllers/application_controller.rb', /#\s*(filter_parameter_logging :password)/, '\1'
-    #
-    #   gsub_file 'README', /rake/, :green do |match|
-    #     match << " no more. Use thor!"
-    #   end
-    #
-    def gsub_file(path, flag, *args, &block)
-      log_status = args.last.is_a?(Symbol) || [ true, false ].include?(args.last) ? args.pop : true
-
-      path = File.expand_path(path, root)
-      say_status_if_log :gsub, relative_to_absolute_root(path), log_status
-
-      unless options[:pretend]
-        content = File.read(path)
-        content.gsub!(flag, *args, &block)
-        File.open(path, 'wb') { |file| file.write(content) }
-      end
-    end
-
-    # Append text to a file.
-    #
-    # ==== Parameters
-    # path<String>:: path of the file to be changed
-    # data<String>:: the data to append to the file, can be also given as a block.
-    # log_status<Boolean>:: if false, does not log the status. True by default.
-    #                       If a symbol is given, uses it as the output color.
-    #
-    # ==== Example
-    #
-    #   append_file 'config/environments/test.rb', 'config.gem "rspec"'
-    #
-    def append_file(path, data=nil, log_status=true, &block)
-      path = File.expand_path(path, root)
-      say_status_if_log :append, relative_to_absolute_root(path), log_status
-
-      File.open(path, 'ab') { |file| file.write(data || block.call) } unless options[:pretend]
-    end
-
-    # Prepend text to a file.
-    #
-    # ==== Parameters
-    # path<String>:: path of the file to be changed
-    # data<String>:: the data to prepend to the file, can be also given as a block.
-    # log_status<Boolean>:: if false, does not log the status. True by default.
-    #                       If a symbol is given, uses it as the output color.
-    #
-    # ==== Example
-    #
-    #   prepend_file 'config/environments/test.rb', 'config.gem "rspec"'
-    #
-    def prepend_file(path, data=nil, log_status=true, &block)
-      path = File.expand_path(path, root)
-      say_status_if_log :prepend, relative_to_absolute_root(path), log_status
-
-      unless options[:pretend]
-        content = data || block.call
-        content << File.read(path)
-        File.open(path, 'wb') { |file| file.write(content) }
-      end
-    end
-
-  end
-end