wycats-thor 0.11.0 → 0.11.1

data/lib/thor.rb

@@ -4,9 +4,7 @@ require 'thor/group'
 require 'thor/actions'
 
 class Thor
-
   class << self
-
     # Sets the default task when thor is executed without an explicit task to be called.
     #
     # ==== Parameters
@@ -108,7 +106,7 @@ class Thor
     # :group    - The group for this options. Use by class options to output options in different levels.
     # :banner   - String to show on usage notes.
     #
-    def method_option(name, options)
+    def method_option(name, options={})
       scope = if options[:for]
         find_and_refresh_task(options[:for]).options
       else
@@ -220,7 +218,6 @@ class Thor
         meth = mapping || meth || default_task
         meth.to_s.gsub('-','_') # treat foo-bar > foo_bar
       end
-
   end
 
   include Thor::Base

data/lib/thor/actions.rb

@@ -5,17 +5,13 @@ Dir[File.join(File.dirname(__FILE__), "actions", "*.rb")].each do |action|
 end
 
 class Thor
-  # Some actions require that a class method called source root is defined in
-  # the class. Remember to always cache the source root value, because Ruby
-  # __FILE__ always return the relative path, which may lead to mistakes if you
-  # are calling an action inside the "inside(path)" method.
-  #
   module Actions
     attr_accessor :behavior
 
     # On inclusion, add some options to base.
     #
     def self.included(base) #:nodoc:
+      base.extend ClassMethods
       return unless base.respond_to?(:class_option)
 
       base.class_option :pretend, :type => :boolean, :aliases => "-p", :group => :runtime,
@@ -31,6 +27,32 @@ class Thor
                                 :desc => "Supress status output"
     end
 
+    module ClassMethods
+      # Hold source paths for one Thor instance. source_paths_for_search is the
+      # method responsible to gather source_paths from this current class,
+      # inherited paths and the source root.
+      #
+      def source_paths
+        @source_paths ||= []
+      end
+
+      # Returns the source paths in the following order:
+      #
+      #   1) This class source paths
+      #   2) Source root
+      #   3) Parents source paths
+      #
+      def source_paths_for_search
+        @source_paths_for_search ||= begin
+          paths = []
+          paths += self.source_paths
+          paths << self.source_root if self.respond_to?(:source_root)
+          paths += from_superclass(:source_paths, [])
+          paths
+        end
+      end
+    end
+
     # Extends initializer to add more configuration options.
     #
     # ==== Configuration
@@ -38,8 +60,8 @@ class Thor
     #                    It also accepts :force, :skip and :pretend to set the behavior
     #                    and the respective option.
     #
-    # root<String>:: The root directory needed for some actions. It's also known
-    #                as destination root.
+    # destination_root<String>:: The root directory needed for some actions. It's also known
+    #                            as destination root.
     #
     def initialize(args=[], options={}, config={})
       self.behavior = case config[:behavior].to_s
@@ -53,7 +75,7 @@ class Thor
       end
 
       super
-      self.root = config[:root]
+      self.destination_root = config[:destination_root]
     end
 
     # Wraps an action object and call it accordingly to the thor class behavior.
@@ -68,44 +90,43 @@ class Thor
 
     # Returns the root for this thor class (also aliased as destination root).
     #
-    def root
-      @root_stack.last
+    def destination_root
+      @destination_stack.last
     end
-    alias :destination_root :root
 
     # Sets the root for this thor class. Relatives path are added to the
     # directory where the script was invoked and expanded.
     #
-    def root=(root)
-      @root_stack ||= []
-      @root_stack[0] = File.expand_path(root || '')
-    end
-
-    # Gets the current root relative to the absolute root.
-    #
-    #   inside "foo" do
-    #     relative_root #=> "foo"
-    #   end
-    #
-    def relative_root(remove_dot=true)
-      relative_to_absolute_root(root, remove_dot)
+    def destination_root=(root)
+      @destination_stack ||= []
+      @destination_stack[0] = File.expand_path(root || '')
     end
 
     # Returns the given path relative to the absolute root (ie, root where
     # the script started).
     #
-    def relative_to_absolute_root(path, remove_dot=true)
-      path = path.gsub(@root_stack[0], '.')
+    def relative_to_original_destination_root(path, remove_dot=true)
+      path = path.gsub(@destination_stack[0], '.')
       remove_dot ? (path[2..-1] || '') : path
     end
 
-    # Get the source root in the class. Raises an error if a source root is
-    # not specified in the thor class.
+    # Receives a file or directory and search for it in the source paths. 
     #
-    def source_root
-      self.class.source_root
-    rescue NoMethodError => e
-      raise NoMethodError, "You have to specify the class method source_root in your thor class."
+    def find_in_source_paths(file)
+      relative_root = relative_to_original_destination_root(destination_root, false)
+      paths = self.class.source_paths_for_search
+
+      paths.each do |source|
+        source_file = File.expand_path(file, File.join(source, relative_root))
+        return source_file if File.exists?(source_file)
+      end
+
+      if paths.empty?
+        raise Error, "You don't have any source path defined for class #{self.class.name}. To fix this, " <<
+                     "you can define a source_root in your class."
+      else
+        raise Error, "Could not find #{file.inspect} in source paths."
+      end
     end
 
     # Do something in the root or on a provided subfolder. If a relative path
@@ -117,16 +138,25 @@ class Thor
     # dir<String>:: the directory to move to.
     #
     def inside(dir='', &block)
-      @root_stack.push File.expand_path(dir, root)
-      FileUtils.mkdir_p(root) unless File.exist?(root)
-      FileUtils.cd(root) { block.arity == 1 ? yield(root) : yield }
-      @root_stack.pop
+      @destination_stack.push File.expand_path(dir, destination_root)
+      FileUtils.mkdir_p(destination_root) unless File.exist?(destination_root)
+      FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
+      @destination_stack.pop
+    end
+
+    # Same as inside, but log status and use padding.
+    #
+    def inside_with_padding(dir='', config={}, &block)
+      say_status :inside, dir, config.fetch(:verbose, true)
+      shell.padding += 1
+      inside(dir, &block)
+      shell.padding -= 1
     end
 
     # Goes to the root and execute the given block.
     #
     def in_root
-      inside(@root_stack.first) { yield }
+      inside(@destination_stack.first) { yield }
     end
 
     # Changes the mode of the given file or directory.
@@ -134,17 +164,16 @@ class Thor
     # ==== 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.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Example
     #
     #   chmod "script/*", 0755
     #
-    def chmod(path, mode, log_status=true)
+    def chmod(path, mode, config={})
       return unless behavior == :invoke
-      path = File.expand_path(path, root)
-      say_status :chmod, relative_to_absolute_root(path), log_status
+      path = File.expand_path(path, destination_root)
+      say_status :chmod, relative_to_original_destination_root(path), config.fetch(:verbose, true)
       FileUtils.chmod_R(mode, path) unless options[:pretend]
     end
 
@@ -152,8 +181,7 @@ class Thor
     #
     # ==== 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.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Example
     #
@@ -161,9 +189,10 @@ class Thor
     #     run('ln -s ~/edge rails')
     #   end
     #
-    def run(command, log_status=true)
+    def run(command, config={})
       return unless behavior == :invoke
-      say_status :run, "\"#{command}\" from #{relative_to_absolute_root(root, false)}", log_status
+      description = "#{command.inspect} from #{relative_to_original_destination_root(destination_root, false)}"
+      say_status :run, description, config.fetch(:verbose, true)
       `#{command}` unless options[:pretend]
     end
 
@@ -171,12 +200,11 @@ class Thor
     #
     # ==== 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.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
-    def run_ruby_script(command, log_status=true)
+    def run_ruby_script(command, config={})
       return unless behavior == :invoke
-      say_status File.basename(Thor::Util.ruby_command), command, log_status
+      say_status File.basename(Thor::Util.ruby_command), command, config.fetch(:verbose, true)
       `#{Thor::Util.ruby_command} #{command}` unless options[:pretend]
     end
 
@@ -186,9 +214,8 @@ class Thor
     # ==== 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.
+    # options<Hash>:: give :verbose => false to not log the status. Other options
+    #                 are given as parameter to Thor.
     #
     # ==== Examples
     #
@@ -199,35 +226,33 @@ class Thor
     #   #=> 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 : {}
+      config  = args.last.is_a?(Hash) ? args.pop : {}
+      verbose = config.key?(:verbose) ? config.delete(:verbose) : true
 
       args.unshift task
-      args.push Thor::Options.to_switches(options)
+      args.push Thor::Options.to_switches(config)
       command = args.join(' ').strip
 
-      say_status :thor, command, log_status
-      run "thor #{command}", false
+      say_status :thor, command, verbose
+      run "thor #{command}", :verbose => false
     end
 
     # Removes a file at the given location.
     #
     # ==== Parameters
     # path<String>:: path of the file to be changed
-    # log_status<Boolean>:: if false, does not log the status. True by default.
-    #                       If a symbol is given, uses it as the output color.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Example
     #
     #   remove_file 'README'
     #   remove_file 'app/controllers/application_controller.rb'
     #
-    def remove_file(path, log_status=true)
+    def remove_file(path, config={})
       return unless behavior == :invoke
-      path  = File.expand_path(path, root)
-      color = log_status.is_a?(Symbol) ? log_status : :red
+      path  = File.expand_path(path, destination_root)
 
-      say_status :remove, relative_to_absolute_root(path), log_status
+      say_status :remove, relative_to_original_destination_root(path), config.fetch(:verbose, true)
       ::FileUtils.rm_rf(path) if !options[:pretend] && File.exists?(path)
     end
 
@@ -237,8 +262,7 @@ class Thor
     # 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.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Example
     #
@@ -250,10 +274,10 @@ class Thor
     #
     def gsub_file(path, flag, *args, &block)
       return unless behavior == :invoke
-      log_status = args.last.is_a?(Symbol) || [ true, false ].include?(args.last) ? args.pop : true
+      config = args.last.is_a?(Hash) ? args.pop : {}
 
-      path = File.expand_path(path, root)
-      say_status :gsub, relative_to_absolute_root(path), log_status
+      path = File.expand_path(path, destination_root)
+      say_status :gsub, relative_to_original_destination_root(path), config.fetch(:verbose, true)
 
       unless options[:pretend]
         content = File.read(path)
@@ -267,17 +291,16 @@ class Thor
     # ==== 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.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Example
     #
     #   append_file 'config/environments/test.rb', 'config.gem "rspec"'
     #
-    def append_file(path, data=nil, log_status=true, &block)
+    def append_file(path, data=nil, config={}, &block)
       return unless behavior == :invoke
-      path = File.expand_path(path, root)
-      say_status :append, relative_to_absolute_root(path), log_status
+      path = File.expand_path(path, destination_root)
+      say_status :append, relative_to_original_destination_root(path), config.fetch(:verbose, true)
       File.open(path, 'ab') { |file| file.write(data || block.call) } unless options[:pretend]
     end
 
@@ -286,17 +309,16 @@ class Thor
     # ==== 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.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Example
     #
     #   prepend_file 'config/environments/test.rb', 'config.gem "rspec"'
     #
-    def prepend_file(path, data=nil, log_status=true, &block)
+    def prepend_file(path, data=nil, config={}, &block)
       return unless behavior == :invoke
-      path = File.expand_path(path, root)
-      say_status :prepend, relative_to_absolute_root(path), log_status
+      path = File.expand_path(path, destination_root)
+      say_status :prepend, relative_to_original_destination_root(path), config.fetch(:verbose, true)
 
       unless options[:pretend]
         content = data || block.call
@@ -310,7 +332,7 @@ class Thor
       # Allow current root to be shared between invocations.
       #
       def _shared_configuration #:nodoc:
-        super.merge!(:root => self.root)
+        super.merge!(:destination_root => self.destination_root)
       end
 
       def _cleanup_options_and_set(options, key) #:nodoc:

data/lib/thor/actions/copy_file.rb

@@ -7,9 +7,9 @@ class Thor
     # 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
-    # log_status<Boolean>:: if false, does not log the status. True by default.
+    # 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
     #
@@ -17,8 +17,8 @@ class Thor
     #
     #   copy_file "doc/README"
     #
-    def copy_file(source, destination=nil, log_status=true)
-      action CopyFile.new(self, source, destination || source, log_status)
+    def copy_file(source, destination=nil, config={})
+      action CopyFile.new(self, source, destination || source, config)
     end
 
     class CopyFile < Templater #:nodoc:

data/lib/thor/actions/create_file.rb

@@ -9,7 +9,7 @@ class Thor
     # ==== Parameters
     # destination<String>:: the relative path to the destination root.
     # data<String|NilClass>:: the data to append to the file.
-    # log_status<Boolean>:: if false, does not log the status. True by default.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Examples
     #
@@ -20,8 +20,8 @@ class Thor
     #
     #   create_file "config/apach.conf", "your apache config"
     #
-    def create_file(destination, data=nil, log_status=true, &block)
-      action CreateFile.new(self, destination, block || data.to_s, log_status)
+    def create_file(destination, data=nil, config={}, &block)
+      action CreateFile.new(self, destination, block || data.to_s, config)
     end
     alias :add_file :create_file
 
@@ -31,8 +31,8 @@ class Thor
     class CreateFile < Templater #:nodoc:
       attr_reader :data
 
-      def initialize(base, destination, data, log_status)
-        super(base, nil, destination, log_status)
+      def initialize(base, destination, data, config={})
+        super(base, nil, destination, config)
         @data = data
       end
 

data/lib/thor/actions/directory.rb

@@ -30,31 +30,27 @@ class Thor
     #     blog.rb
     #
     # ==== Parameters
-    # source<String>:: the relative path to the source root
-    # destination<String>:: the relative path to the destination root
-    # recursive<Boolean>:: if the directory must be copied recursively, true by default
-    # log_status<Boolean>:: if false, does not log the status. True by default.
+    # 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.
+    #                If :recursive => false, does not look for paths recursively.
     #
     # ==== Examples
     #
     #   directory "doc"
-    #   directory "doc", "docs", false
+    #   directory "doc", "docs", :recursive => false
     #
-    def directory(source, destination=nil, recursive=true, log_status=true)
-      action Directory.new(self, source, destination || source, recursive, log_status)
+    def directory(source, destination=nil, config={})
+      action Directory.new(self, source, destination || source, config)
     end
 
     class Directory < Templater #:nodoc:
-      attr_reader :recursive
-
-      def initialize(base, source, destination=nil, recursive=true, log_status=true)
-        @recursive = recursive
-        super(base, source, destination, log_status)
+      def initialize(base, source, destination=nil, config={})
+        super(base, source, destination, { :recursive => true }.merge(config))
       end
 
       def invoke!
-        raise "Source #{source.inspect} does not exist" unless File.exists?(source)
-        base.empty_directory given_destination, @log_status
+        base.empty_directory given_destination, config
         execute!
       end
 
@@ -65,20 +61,20 @@ class Thor
       protected
 
         def execute!
-          lookup = recursive ? File.join(source, '**') : source
+          lookup = config[:recursive] ? File.join(source, '**') : source
           lookup = File.join(lookup, '{*,.[a-z]*}')
 
           Dir[lookup].each do |file_source|
-            file_destination = File.join(given_destination, file_source.gsub(source, '.'))
             next if File.directory?(file_source)
+            file_destination = File.join(given_destination, file_source.gsub(source, '.'))
 
             case file_source
               when /\.empty_directory$/
-                base.empty_directory(File.dirname(file_destination), @log_status)
+                base.empty_directory(File.dirname(file_destination), config)
               when /\.tt$/
-                base.template(file_source, file_destination[0..-4], @log_status)
+                base.template(file_source, file_destination[0..-4], config)
               else
-                base.copy_file(file_source, file_destination, @log_status)
+                base.copy_file(file_source, file_destination, config)
             end
           end
         end

data/lib/thor/actions/empty_directory.rb

@@ -6,21 +6,21 @@ class Thor
     # Creates an empty directory.
     #
     # ==== Parameters
-    # destination<String>:: the relative path to the destination root
-    # log_status<Boolean>:: if false, does not log the status. True by default.
+    # destination<String>:: the relative path to the destination root.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Examples
     #
     #   empty_directory "doc"
     #
-    def empty_directory(destination, log_status=true)
-      action EmptyDirectory.new(self, nil, destination, log_status)
+    def empty_directory(destination, config={})
+      action EmptyDirectory.new(self, nil, destination, config)
     end
 
     class EmptyDirectory < Templater #:nodoc:
 
       def invoke!
-        invoke_with_options!(base.options) do
+        invoke_with_options!(base.options.merge(config)) do
           ::FileUtils.mkdir_p(destination)
         end
       end

data/lib/thor/actions/get.rb

@@ -9,9 +9,9 @@ class Thor
     # the url is yielded and used as location.
     #
     # ==== Parameters
-    # source<String>:: the address of the given content
-    # destination<String>:: the relative path to the destination root
-    # log_status<Boolean>:: if false, does not log the status. True by default.
+    # source<String>:: the address of the given content.
+    # destination<String>:: the relative path to the destination root.
+    # config<Hash>:: give :verbose => false to not log the status.
     #
     # ==== Examples
     #
@@ -21,8 +21,8 @@ class Thor
     #     content.split("\n").first
     #   end
     #
-    def get(source, destination=nil, log_status=true, &block)
-      action Get.new(self, source, block || destination, log_status)
+    def get(source, destination=nil, config={}, &block)
+      action Get.new(self, source, block || destination, config)
     end
 
     class Get < Templater #:nodoc:

data/lib/thor/actions/inject_into_file.rb

@@ -9,9 +9,8 @@ class Thor
     # ==== Parameters
     # destination<String>:: Relative path to the destination root
     # data<String>:: Data to add to the file. Can be given as a block.
-    # flag<String>:: Flag of where to add the changes.
-    # log_status<Boolean>:: If false, does not log the status. True by default.
-    #                       If a symbol is given, uses it as the output color.
+    # config<Hash>:: give :verbose => false to not log the status and the flag
+    #                for injection (:after or :before).
     # 
     # ==== Examples
     #
@@ -24,28 +23,29 @@ class Thor
     #
     def inject_into_file(destination, *args, &block)
       if block_given?
-        data, flag = block, args.shift
+        data, config = block, args.shift
       else
-        data, flag = args.shift, args.shift
+        data, config = args.shift, args.shift
       end
 
       log_status = args.empty? || args.pop
-      action InjectIntoFile.new(self, destination, data, flag, log_status)
+      action InjectIntoFile.new(self, destination, data, config)
     end
 
     class InjectIntoFile #:nodoc:
-      attr_reader :base, :destination, :relative_destination, :flag, :replacement
+      attr_reader :base, :destination, :relative_destination, :flag, :replacement, :config
 
-      def initialize(base, destination, data, flag, log_status=true)
-        @base, @log_status = base, log_status
-        behavior, @flag = flag.keys.first, flag.values.first
+      def initialize(base, destination, data, config)
+        @base, @config = base, { :verbose => true }.merge(config)
 
         self.destination = destination
         data = data.call if data.is_a?(Proc)
 
-        @replacement = if behavior == :after
+        @replacement = if @config.key?(:after)
+          @flag = @config.delete(:after)
           @flag + data
         else
+          @flag = @config.delete(:before)
           data + @flag
         end
       end
@@ -68,14 +68,14 @@ class Thor
         def destination=(destination)
           if destination
             @destination = ::File.expand_path(destination.to_s, base.destination_root)
-            @relative_destination = base.relative_to_absolute_root(@destination)
+            @relative_destination = base.relative_to_original_destination_root(@destination)
           end
         end
 
         # Shortcut to say_status shell method.
         #
         def say_status(status)
-          base.shell.say_status status, relative_destination, @log_status
+          base.shell.say_status status, relative_destination, config[:verbose]
         end
 
         # Adds the content to the file.

data/lib/thor/actions/template.rb

@@ -9,9 +9,9 @@ class Thor
     # to be equal to the source removing .tt from the filename.
     #
     # ==== Parameters
-    # source<String>:: the relative path to the source root
-    # destination<String>:: the relative path to the destination root
-    # log_status<Boolean>:: if false, does not log the status. True by default.
+    # 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
     #
@@ -19,9 +19,9 @@ class Thor
     #
     #   template "doc/README"
     #
-    def template(source, destination=nil, log_status=true)
+    def template(source, destination=nil, config={})
       destination ||= source.gsub(/.tt$/, '')
-      action Template.new(self, source, destination, log_status)
+      action Template.new(self, source, destination, config)
     end
 
     class Template < Templater #:nodoc:

data/lib/thor/actions/templater.rb

@@ -8,7 +8,7 @@ class Thor
     # by Jonas Nicklas and Michael S. Klishin under MIT LICENSE.
     #
     class Templater #:nodoc:
-      attr_reader :base, :source, :destination, :given_destination, :relative_destination
+      attr_reader :base, :source, :destination, :given_destination, :relative_destination, :config
 
       # Initializes given the source and destination.
       #
@@ -16,11 +16,10 @@ class Thor
       # base<Thor::Base>:: A Thor::Base instance
       # source<String>:: Relative path to the source of this file
       # destination<String>:: Relative path to the destination of this file
-      # log_status<Boolean>:: If false, does not log the status. True by default.
-      #                       Templater log status does not accept color.
+      # config<Hash>:: give :verbose => false to not log the status.
       #
-      def initialize(base, source, destination, log_status=true)
-        @base, @log_status = base, log_status
+      def initialize(base, source, destination, config={})
+        @base, @config = base, { :verbose => true }.merge(config)
         self.source = source
         self.destination = destination
       end
@@ -56,7 +55,7 @@ class Thor
       # but you can modify in the subclass.
       #
       def invoke!
-        invoke_with_options!(base.options) do
+        invoke_with_options!(base.options.merge(config)) do
           ::FileUtils.mkdir_p(::File.dirname(destination))
           ::File.open(destination, 'w'){ |f| f.write render }
         end
@@ -101,7 +100,7 @@ class Thor
         #
         def source=(source)
           if source
-            @source = ::File.expand_path(source.to_s, File.join(base.source_root, base.relative_root))
+            @source = ::File.expand_path(base.find_in_source_paths(source.to_s))
           end
         end
 
@@ -123,7 +122,7 @@ class Thor
           if destination
             @given_destination = convert_encoded_instructions(destination.to_s)
             @destination = ::File.expand_path(@given_destination, base.destination_root)
-            @relative_destination = base.relative_to_absolute_root(@destination)
+            @relative_destination = base.relative_to_original_destination_root(@destination)
           end
         end
 
@@ -187,7 +186,7 @@ class Thor
         # Shortcut to say_status shell method.
         #
         def say_status(status, color)
-          base.shell.say_status status, relative_destination, color if @log_status
+          base.shell.say_status status, relative_destination, color if config[:verbose]
         end
 
     end

data/lib/thor/base.rb

@@ -9,7 +9,7 @@ require 'thor/util'
 
 class Thor
   HELP_MAPPINGS       = %w(-h -? --help -D)
-  THOR_RESERVED_WORDS = %w(invoke shell options behavior root destination_root relative_root source_root)
+  THOR_RESERVED_WORDS = %w(invoke shell options behavior root destination_root relative_root)
 
   module Base
     attr_accessor :options
@@ -37,15 +37,17 @@ class Thor
 
       parse_options = self.class.class_options
 
-      options = if options.is_a?(Array)
+      if options.is_a?(Array)
         task_options  = config.delete(:task_options) # hook for start
         parse_options = parse_options.merge(task_options) if task_options
-        Thor::Options.parse(parse_options, options)
+        array_options, hash_options = options, {}
       else
-        Thor::Options.parse(parse_options, []).merge(options)
+        array_options, hash_options = [], options
       end
 
-      self.options = Thor::CoreExt::HashWithIndifferentAccess.new(options).freeze
+      options = Thor::Options.parse(parse_options, array_options)
+      self.options = Thor::CoreExt::HashWithIndifferentAccess.new(options).merge!(hash_options)
+      self.options.freeze
     end
 
     class << self
@@ -75,14 +77,10 @@ class Thor
 
       # Whenever a class inherits from Thor or Thor::Group, we should track the
       # class and the file on Thor::Base. This is the method responsable for it.
-      # Also invoke the source_root if the klass respond to it. This is needed
-      # to ensure that the source_root does not change after FileUtils#cd is
-      # called.
+      # Also adds the source root to the source paths if the klass respond to it.
       #
       def register_klass_file(klass) #:nodoc:
         file = caller[1].match(/(.*):\d+/)[1]
-
-        klass.source_root if klass.respond_to?(:source_root)
         Thor::Base.subclasses << klass unless Thor::Base.subclasses.include?(klass)
 
         file_subclasses = Thor::Base.subclass_files[File.expand_path(file)]
@@ -189,7 +187,7 @@ class Thor
       # :type     - The type of the argument, can be :string, :hash, :array, :numeric or :boolean.
       # :banner   - String to show on usage notes.
       #
-      def class_option(name, options)
+      def class_option(name, options={})
         build_option(name, options, class_options)
       end
 
@@ -359,51 +357,48 @@ class Thor
         # Prints the class options per group. If an option does not belong to
         # any group, it uses the ungrouped name value. This method provide to
         # hooks to add extra options, one of them if the third argument called
-        # extra_group that should be a Thor::CoreExt::OrderedHash in the format
-        # :group => Array[Options].
+        # extra_group that should be a hash in the format :group => Array[Options].
         #
         # The second is by returning a lamda used to print values. The lambda
         # requires two options: the group name and the array of options.
         #
         def class_options_help(shell, ungrouped_name=nil, extra_group=nil) #:nodoc:
-          unless self.class_options.empty?
-            groups = {}
-
-            class_options.each do |_, value|
-              groups[value.group] ||= []
-              groups[value.group] << value
-            end
+          groups = {}
 
-            printer = proc do |group_name, options|
-              list = []
-              padding = options.collect{ |o| o.aliases.size  }.max.to_i * 4
+          class_options.each do |_, value|
+            groups[value.group] ||= []
+            groups[value.group] << value
+          end
 
-              options.each do |option|
-                list << [ option.usage(padding), option.description || "" ]
-                list << [ "", "Default: #{option.default}" ] if option.show_default?
-              end
+          printer = proc do |group_name, options|
+            list = []
+            padding = options.collect{ |o| o.aliases.size  }.max.to_i * 4
 
-              unless list.empty?
-                if group_name
-                  shell.say "#{group_name} options:"
-                else
-                  shell.say "Options:"
-                end
+            options.each do |option|
+              list << [ option.usage(padding), option.description || "" ]
+              list << [ "", "Default: #{option.default}" ] if option.show_default?
+            end
 
-                shell.print_table(list, :emphasize_last => true, :ident => 2)
-                shell.say ""
+            unless list.empty?
+              if group_name
+                shell.say "#{group_name} options:"
+              else
+                shell.say "Options:"
               end
+
+              shell.print_table(list, :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
+          # Deal with default group
+          global_options = groups.delete(nil) || []
+          printer.call(ungrouped_name, global_options) if global_options
 
-            # Print all others
-            groups = extra_group.merge(groups) if extra_group
-            groups.each(&printer)
-            printer
-          end
+          # Print all others
+          groups = extra_group.merge(groups) if extra_group
+          groups.each(&printer)
+          printer
         end
 
         # Raises an error if the word given is a Thor reserved word.

data/lib/thor/group.rb

@@ -1,7 +1,10 @@
+# Thor has a special class called Thor::Group. The main difference to Thor class
+# is that it invokes all tasks at once. It also include some methods that allows
+# invocations to be done at the class method, which are not available to Thor
+# tasks.
+#
 class Thor::Group
-
   class << self
-
     # The descrition for this Thor::Group. If none is provided, but a source root
     # exists, tries to find the USAGE one folder above it, otherwise searches
     # in the superclass.
@@ -50,6 +53,171 @@ class Thor::Group
       end
     end
 
+    # Stores invocations for this class merging with superclass values.
+    #
+    def invocations #:nodoc:
+      @invocations ||= from_superclass(:invocations, {})
+    end
+
+    # Stores invocation blocks used on invoke_from_option.
+    #
+    def invocation_blocks #:nodoc:
+      @invocation_blocks ||= from_superclass(:invocation_blocks, {})
+    end
+
+    # Invoke the given namespace or class given. It adds an instance
+    # method that will invoke the klass and task. You can give a block to
+    # configure how it will be invoked.
+    #
+    # The namespace/class given will have its options showed on the help
+    # usage. Check invoke_from_option for more information.
+    #
+    def invoke(*names, &block)
+      options = names.last.is_a?(Hash) ? names.pop : {}
+      verbose = options.fetch(:verbose, :white)
+
+      names.each do |name|
+        invocations[name] = false
+        invocation_blocks[name] = block if block_given?
+
+        class_eval <<-METHOD, __FILE__, __LINE__
+          def _invoke_#{name.to_s.gsub(/\W/, '_')}
+            klass, task = self.class.prepare_for_invocation(nil, #{name.inspect})
+
+            if klass
+              say_status :invoke, #{name.inspect}, #{verbose.inspect}
+              block = self.class.invocation_blocks[#{name.inspect}]
+              invoke_with_padding klass, task, &block
+            else
+              say_status :error, %(#{name.inspect} [not found]), :red
+            end
+          end
+        METHOD
+      end
+    end
+
+    # Invoke a thor class based on the value supplied by the user to the
+    # given option named "name". A class option must be created before this
+    # method is invoked for each name given.
+    #
+    # ==== Examples
+    #
+    #   class GemGenerator < Thor::Group
+    #     class_option :test_framework, :type => :string
+    #     invoke_from_option :test_framework
+    #   end
+    #
+    # ==== Boolean options
+    #
+    # In some cases, you want to invoke a thor class if some option is true or
+    # false. This is automatically handled by invoke_from_option. Then the
+    # option name is used to invoke the generator.
+    #
+    # ==== Preparing for invocation
+    #
+    # In some cases you want to customize how a specified hook is going to be
+    # invoked. You can do that by overwriting the class method
+    # prepare_for_invocation. The class method must necessarily return a klass
+    # and an optional task.
+    #
+    # ==== Custom invocations
+    #
+    # You can also supply a block to customize how the option is giong to be
+    # invoked. The block receives two parameters, an instance of the current
+    # class and the klass to be invoked.
+    #
+    def invoke_from_option(*names, &block)
+      options = names.last.is_a?(Hash) ? names.pop : {}
+      verbose = options.fetch(:verbose, :white)
+
+      names.each do |name|
+        unless class_options.key?(name)
+          raise ArgumentError, "You have to define the option #{name.inspect} " << 
+                               "before setting invoke_from_option."
+        end
+
+        invocations[name] = true
+        invocation_blocks[name] = block if block_given?
+
+        class_eval <<-METHOD, __FILE__, __LINE__
+          def _invoke_from_option_#{name.to_s.gsub(/\W/, '_')}
+            return unless options[#{name.inspect}]
+
+            value = options[#{name.inspect}]
+            value = #{name.inspect} if TrueClass === value
+            klass, task = self.class.prepare_for_invocation(#{name.inspect}, value)
+
+            if klass
+              say_status :invoke, value, #{verbose.inspect}
+              block = self.class.invocation_blocks[#{name.inspect}]
+              invoke_with_padding klass, task, &block
+            else
+              say_status :error, %(\#{value} [not found]), :red
+            end
+          end
+        METHOD
+      end
+    end
+
+    # Remove a previously added invocation.
+    #
+    # ==== Examples
+    #
+    #   remove_invocation :test_framework
+    #
+    def remove_invocation(*names)
+      names.each do |name|
+        remove_task(name)
+        remove_class_option(name)
+        invocations.delete(name)
+        invocation_blocks.delete(name)
+      end
+    end
+
+    # Overwrite class options help to allow invoked generators options to be
+    # shown recursively when invoking a generator.
+    #
+    def class_options_help(shell, ungrouped_name=nil, extra_group=nil) #:nodoc:
+      group_options = {}
+
+      get_options_from_invocations(group_options, class_options) do |klass|
+        klass.send(:get_options_from_invocations, group_options, class_options)
+      end
+
+      group_options.merge!(extra_group) if extra_group
+      super(shell, ungrouped_name, group_options)
+    end
+
+    # Get invocations array and merge options from invocations. Those
+    # options are added to group_options hash. Options that already exists
+    # in base_options are not added twice.
+    #
+    def get_options_from_invocations(group_options, base_options) #:nodoc:
+      invocations.each do |name, from_option|
+        value = if from_option
+          option = class_options[name]
+          option.type == :boolean ? name : option.default
+        else
+          name
+        end
+        next unless value
+
+        klass, task = prepare_for_invocation(name, value)
+        next unless klass && klass.respond_to?(:class_options)
+
+        value = value.to_s
+        human_name = value.respond_to?(:classify) ? value.classify : value
+
+        group_options[human_name] ||= []
+        group_options[human_name] += klass.class_options.values.select do |option|
+          base_options[option.name.to_sym].nil? && option.group.nil? &&
+          !group_options.values.flatten.any? { |i| i.name == option.name }
+        end
+
+        yield klass if block_given?
+      end
+    end
+
     protected
 
       # The banner for this class. You can customize it if you are invoking the

data/lib/thor/invocation.rb

@@ -1,5 +1,22 @@
 class Thor
   module Invocation
+    def self.included(base) #:nodoc:
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      # Prepare for class methods invocations. This method must return a klass to
+      # have the invoked class options showed in help messages in generators.
+      #
+      def prepare_for_invocation(key, name) #:nodoc:
+        case name
+          when Symbol, String
+            Thor::Util.namespace_to_thor_class(name.to_s, false)
+          else
+            name
+        end
+      end
+    end
 
     # Make initializer aware of invocations and the initializer proc.
     #
@@ -79,7 +96,7 @@ class Thor
       task, args, opts, config = nil, task, args, opts if task.nil? || task.is_a?(Array)
       args, opts, config = nil, args, opts if args.is_a?(Hash)
 
-      object, task = _setup_for_invoke(name, task)
+      object, task = _prepare_for_invocation(name, task)
       if object.is_a?(Class)
         klass = object
 
@@ -113,6 +130,26 @@ class Thor
       end
     end
 
+    # Shortcut for invoke with padding and status handling. Used internally by
+    # class options invoke and invoke_from_option.
+    #
+    def invoke_with_padding(klass, task=nil, *args, &block)
+      shell.padding += 1
+
+      result = if block_given?
+        if block.arity == 2
+          block.call(self, klass)
+        else
+          block.call(self, klass, task)
+        end
+      else
+        invoke klass, task, *args
+      end
+
+      shell.padding -= 1
+      result
+    end
+
     protected
 
       # Configuration values that are shared between invocations.
@@ -121,23 +158,18 @@ class Thor
         { :invocations => @_invocations }
       end
 
-      # This is the method responsable for retrieving and setting up an
-      # instance to be used in invoke.
+      # Prepare for invocation in the instance level. In this case, we have to
+      # take into account that a just a task name from the current class was
+      # given or even a Thor::Task object.
       #
-      def _setup_for_invoke(name, sent_task=nil) #:nodoc:
-        case name
-          when Thor::Task
-            task = name
-          when Symbol, String
-            name = name.to_s
-
-            # If is not one of this class tasks, do a lookup.
-            unless task = self.class.all_tasks[name]
-              object, task = Thor::Util.namespace_to_thor_class(name, false)
-              task ||= sent_task
-            end
-          else
-            object, task = name, sent_task
+      def _prepare_for_invocation(name, sent_task=nil) #:nodoc:
+        if name.is_a?(Thor::Task)
+          task = name
+        elsif task = self.class.all_tasks[name.to_s]
+          object = self
+        else
+          object, task = self.class.prepare_for_invocation(nil, name)
+          task ||= sent_task
         end
 
         # If the object was not set, use self and use the name as task.
@@ -148,7 +180,7 @@ class Thor
       # Check if the object given is a Thor class object and get a task object
       # for it.
       #
-      def _validate_klass_and_task(object, task)
+      def _validate_klass_and_task(object, task) #:nodoc:
         klass = object.is_a?(Class) ? object : object.class
         raise "Expected Thor class, got #{klass}" unless klass <= Thor::Base
 
@@ -156,6 +188,5 @@ class Thor
         task = klass.all_tasks[task.to_s] || Task.dynamic(task) if task && !task.is_a?(Thor::Task)
         task
       end
-
   end
 end

data/lib/thor/parser/option.rb

@@ -95,14 +95,21 @@ class Thor
       end
     end
 
-    def input_required?
-      type != :boolean
+    # Allow some type predicates as: boolean?, string? and etc.
+    #
+    def method_missing(method, *args, &block)
+      given = method.to_s.sub(/\?$/, '').to_sym
+      if valid_type?(given)
+        self.type == given
+      else
+        super
+      end
     end
 
     protected
 
       def validate!
-        raise ArgumentError, "An option cannot be boolean and required." if type == :boolean && required?
+        raise ArgumentError, "An option cannot be boolean and required." if boolean? && required?
       end
 
       def valid_type?(type)

data/lib/thor/parser/options.rb

@@ -122,9 +122,16 @@ class Thor
       # Parse the value at the peek analyzing if it requires an input or not.
       #
       def parse_peek(switch, option)
-        if option.input_required?
-          return nil if no_or_skip?(switch)
-          raise MalformattedArgumentError, "no value provided for option '#{switch}'" unless current_is_value?
+        unless current_is_value?
+          if option.boolean?
+            # No problem for boolean types
+          elsif no_or_skip?(switch)
+            return nil # User set value to nil
+          elsif option.string? && !option.required?
+            return option.human_name # Return the option name
+          else
+            raise MalformattedArgumentError, "no value provided for option '#{switch}'"
+          end
         end
 
         @non_assigned_required.delete(option)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wycats-thor
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -07:00
+date: 2009-07-16 00:00:00 -07:00
 default_executable: 
 dependencies: []