josevalim-thor 0.10.6 → 0.10.7

data/lib/thor/actions/inject_into_file.rb

@@ -72,10 +72,10 @@ class Thor
           end
         end
 
-        # Shortcut to say_status base method.
+        # Shortcut to say_status shell method.
         #
         def say_status(status)
-          base.send :say_status_if_log, status, relative_destination, @log_status
+          base.shell.say_status status, relative_destination, @log_status
         end
 
         # Adds the content to the file.

data/lib/thor/actions/templater.rb

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

data/lib/thor/actions.rb

@@ -151,7 +151,7 @@ class Thor
     #
     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
+      say_status :chmod, relative_to_absolute_root(path), log_status
       FileUtils.chmod_R(mode, path) unless options[:pretend]
     end
 
@@ -169,7 +169,7 @@ class Thor
     #   end
     #
     def run(command, log_status=true)
-      say_status_if_log :run, "#{command} from #{relative_to_absolute_root(root, false)}", log_status
+      say_status :run, "#{command} from #{relative_to_absolute_root(root, false)}", log_status
       `#{command}` unless options[:pretend]
     end
 
@@ -213,6 +213,25 @@ class Thor
       end
     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.
+    #
+    # ==== Example
+    #
+    #   remove_file 'README'
+    #   remove_file 'app/controllers/application_controller.rb'
+    #
+    def remove_file(path, log_status=true)
+      path = File.expand_path(path, root)
+      say_status :remove, relative_to_absolute_root(path), log_status
+
+      ::FileUtils.rm_rf(path) if !options[:pretend] && File.exists?(path)
+    end
+
     # Run a regular expression replacement on a file.
     #
     # ==== Parameters
@@ -234,7 +253,7 @@ class Thor
       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
+      say_status :gsub, relative_to_absolute_root(path), log_status
 
       unless options[:pretend]
         content = File.read(path)
@@ -257,7 +276,7 @@ class Thor
     #
     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
+      say_status :append, relative_to_absolute_root(path), log_status
 
       File.open(path, 'ab') { |file| file.write(data || block.call) } unless options[:pretend]
     end
@@ -276,7 +295,7 @@ class Thor
     #
     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
+      say_status :prepend, relative_to_absolute_root(path), log_status
 
       unless options[:pretend]
         content = data || block.call
@@ -285,12 +304,5 @@ class Thor
       end
     end
 
-    protected
-
-      def say_status_if_log(status, message, log_status)
-        color = log_status.is_a?(Symbol) ? log_status : :green
-        shell.say_status status, message, color if log_status
-      end
-
   end
 end

data/lib/thor/options.rb

@@ -248,7 +248,7 @@ class Thor
       #
       def check_requirement!(switch, option)
         if option.input_required?
-          raise RequiredArgumentMissingError, "no value provided for argument '#{switch}'"  if peek.nil?
+          raise RequiredArgumentMissingError, "no value provided for required argument '#{switch}'" if peek.nil?
           raise MalformattedArgumentError, "cannot pass switch '#{peek}' as an argument" if switch?(peek)
         end
       end
@@ -257,8 +257,11 @@ class Thor
       #
       def check_validity!
         unless @non_assigned_required.empty?
-          switch_names = @non_assigned_required.map{ |o| o.switch_name }.join(', ')
-          raise RequiredArgumentMissingError, "no value provided for required arguments '#{switch_names}'" 
+          names = @non_assigned_required.map do |o|
+            o.argument? ? o.human_name : o.switch_name
+          end.join("', '")
+
+          raise RequiredArgumentMissingError, "no value provided for required arguments '#{names}'"
         end
       end
 

data/lib/thor/shell/basic.rb

@@ -33,12 +33,16 @@ class Thor
         end
       end
 
-      # Say a status with the given color and appends the message.
-      # It does not show the status if the base is set to quiet.
+      # Say a status with the given color and appends the message. Since this
+      # method is used frequently by actions, it allows nil or false to be given
+      # in log_status, avoiding the message from being shown. If a Symbol is
+      # given in log_status, it's used as the color.
       #
-      def say_status(status, message, color=nil)
+      def say_status(status, message, log_status=true)
         return if base && base.options[:quiet]
-        say "#{status.to_s.rjust(12)}  #{message}", color, true
+
+        color = log_status.is_a?(Symbol) ? log_status : :green
+        say "#{status.to_s.rjust(12)}  #{message}", color, true if log_status
       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.6
+  version: 0.10.7
 platform: ruby
 authors: 
 - Yehuda Katz