josevalim-thor 0.10.2 → 0.10.3

data/lib/thor/actions/create_file.rb

@@ -21,8 +21,9 @@ class Thor
     #   create_file "config/apach.conf", "your apache config"
     #
     def create_file(destination, data=nil, log_status=true, &block)
-      action AddFile.new(self, destination, block || data.to_s, log_status)
+      action CreateFile.new(self, destination, block || data.to_s, log_status)
     end
+    alias :add_file :create_file
 
     # AddFile is a subset of Template, which instead of rendering a file with
     # ERB, it gets the content from the user.

data/lib/thor/actions/template.rb

@@ -20,7 +20,7 @@ class Thor
     #   template "doc/README"
     #
     def template(source, destination=nil, log_status=true)
-      destination ||= source.gsub('.tt$', '')
+      destination ||= source.gsub(/.tt$/, '')
       action Template.new(self, source, destination, log_status)
     end
 

data/lib/thor/actions/templater.rb

@@ -65,8 +65,10 @@ class Thor
       # Revokes the action.
       #
       def revoke!
-        say_status :deleted, :green
-        ::FileUtils.rm_rf(destination) unless pretend?
+        if exists?
+          say_status :deleted, :green
+          ::FileUtils.rm_rf(destination) unless pretend?
+        end
       end
 
       protected

data/lib/thor/actions.rb

@@ -132,7 +132,7 @@ class Thor
     #
     #   chmod "script/*", 0755
     #
-    def chmod(mode, path, log_status=true)
+    def chmod(path, mode, 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]

data/lib/thor/base.rb

@@ -301,12 +301,14 @@ class Thor
 
             printer = lambda do |group_name, options|
               unless options.empty?
-                options.map! do |option|
+                list = []
+
+                options.each do |option|
                   next if option.argument?
-                  [ option.usage, option.description || '' ]
-                end
 
-                options.compact!
+                  list << [ option.usage(false), option.description || "" ]
+                  list << [ "", "Default: #{option.default}" ] if option.description && option.default
+                end
 
                 if group_name
                   shell.say "#{group_name} options:"
@@ -314,7 +316,7 @@ class Thor
                   shell.say "Options:"
                 end
 
-                shell.print_table(options, :emphasize_last => true, :ident => 2)
+                shell.print_table(list, :emphasize_last => true, :ident => 2)
                 shell.say ""
               end
             end
@@ -391,7 +393,12 @@ class Thor
         end
 
         def from_superclass(method, default=nil)
-          self == baseclass ? default : superclass.send(method).dup
+          if self == baseclass
+            default
+          else
+            value = superclass.send(method)
+            value.dup if value
+          end
         end
 
         # SIGNATURE: Sets the baseclass. This is where the superclass lookup

data/lib/thor/option.rb

@@ -121,8 +121,12 @@ class Thor
       (str.length > 1 ? "--" : "-") + str
     end
 
-    def usage
-      sample = formatted_default || formatted_value
+    def usage(use_default=true)
+      sample = if use_default
+        formatted_default || formatted_value
+      else
+        formatted_value
+      end
 
       sample = if sample
         "#{switch_name}=#{sample}"
@@ -156,7 +160,7 @@ class Thor
           when :numeric
             default.to_s
           when :string, :default
-            default.empty? ? formatted_value : default.to_s
+            default.to_s.empty? ? formatted_value : default.to_s
           when :hash
             if default.empty?
               formatted_value
@@ -204,7 +208,7 @@ class Thor
       true
     end
 
-    def usage
+    def usage(use_default=true)
       required? ? formatted_value : "[#{formatted_value}]"
     end
   end

data/lib/thor/task.rb

@@ -28,8 +28,12 @@ class Thor
     rescue ArgumentError => e
       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, true)}'"
+      if backtrace.empty? && e.message =~ /wrong number of arguments/
+        if instance.is_a?(Thor::Group)
+          raise e, "'#{name}' was called incorrectly. Are you sure it has arity equals to 0?"
+        else
+          raise InvocationError, "'#{name}' was called incorrectly. Call as '#{formatted_usage(instance.class, true)}'"
+        end
       else
         raise e
       end

metadata

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