josevalim-thor 0.10.4 → 0.10.5

data/lib/thor/actions/directory.rb

@@ -32,20 +32,30 @@ class Thor
     # ==== 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.
     #
     # ==== Examples
     #
     #   directory "doc"
+    #   directory "doc", "docs", false
     #
-    def directory(source, destination=nil, log_status=true)
-      action Directory.new(self, source, destination || source, log_status)
+    def directory(source, destination=nil, recursive=true, log_status=true)
+      action Directory.new(self, source, destination || source, recursive, log_status)
     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)
+      end
 
       def invoke!
-        Dir[File.join(source, '**', '*')].each do |file_source|
+        lookup = recursive ? File.join(source, '**', '*') : File.join(source, '*')
+
+        Dir[lookup].each do |file_source|
           file_destination = File.join(given_destination, file_source.gsub(source, '.'))
 
           if File.directory?(file_source)

data/lib/thor/base.rb

@@ -165,17 +165,13 @@ class Thor
       # ==== Parameters
       # name<String|Symbol>
       #
-      def group(name)
-        @group_name = name.to_s
-      end
-
-      # Returns the group name.
-      #
-      # ==== Returns
-      # String
-      #
-      def group_name
-        @group_name ||= from_superclass(:group_name, 'standard')
+      def group(name=nil)
+        case name
+          when nil
+            @group ||= from_superclass(:group, 'standard')
+          else
+            @group = name.to_s
+        end
       end
 
       # Returns the tasks for this Thor class.

data/lib/thor/group.rb

@@ -2,18 +2,21 @@ class Thor::Group
 
   class << self
 
-    # The descrition for this Thor::Group as a whole.
+    # The descrition for this Thor::Group. If none is provided, but a source root
+    # exists and we have an USAGE inside, this file is used as description. This
+    # is good because we will load such files only when we need it.
     #
     # ==== Parameters
     # description<String>:: The description for this Thor::Group.
     #
     def desc(description=nil)
       case description
-        # TODO When a symbol is given, read a file in the current directory
-        # when Symbol
-        #   @desc = File.read
         when nil
-          @desc ||= from_superclass(:desc, nil)
+          @desc ||= if respond_to?(:source_root) && File.exist?(File.join(source_root, "USAGE"))
+            File.read(File.join(source_root, "USAGE"))
+          else
+            from_superclass(:desc, nil)
+          end
         else
           @desc = description
       end

data/lib/thor/option.rb

@@ -118,7 +118,7 @@ class Thor
     end
 
     def dasherize(str)
-      (str.length > 1 ? "--" : "-") + str
+      (str.length > 1 ? "--" : "-") + str.gsub('_', '-')
     end
 
     def usage(use_default=true)

data/lib/thor/runner.rb

@@ -141,7 +141,7 @@ class Thor::Runner < Thor
     group  = options[:group] || "standard"
 
     klasses = Thor::Base.subclasses.select do |k|
-      (options[:all] || k.group_name == group) && k.namespace =~ search
+      (options[:all] || k.group == group) && k.namespace =~ search
     end
 
     display_klasses(false, klasses)

data/lib/thor/shell/basic.rb

@@ -38,9 +38,7 @@ class Thor
       #
       def say_status(status, message, color=nil)
         return if base && base.options[:quiet]
-
-        status_flag = "[#{status.to_s.upcase}]".rjust(12)
-        say "#{status_flag} #{message}", color, true
+        say "#{status.to_s.rjust(12)}  #{message}", color, true
       end
 
       # Make a question the to user and returns true if the user replies "y" or

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: []