thor 0.18.1 → 0.19.0

data/lib/thor/actions/create_file.rb

@@ -1,8 +1,7 @@
-require 'thor/actions/empty_directory'
+require "thor/actions/empty_directory"
 
 class Thor
   module Actions
-
     # Create a new file relative to the destination root with the given data,
     # which is the return value of a block or a data string.
     #
@@ -25,7 +24,7 @@ class Thor
       data = args.first
       action CreateFile.new(self, destination, block || data.to_s, config)
     end
-    alias :add_file :create_file
+    alias_method :add_file, :create_file
 
     # CreateFile is a subset of Template, which instead of rendering a file with
     # ERB, it gets the content from the user.
@@ -33,7 +32,7 @@ class Thor
     class CreateFile < EmptyDirectory #:nodoc:
       attr_reader :data
 
-      def initialize(base, destination, data, config={})
+      def initialize(base, destination, data, config = {})
         @data = data
         super(base, destination, config)
       end
@@ -60,46 +59,45 @@ class Thor
       def invoke!
         invoke_with_conflict_check do
           FileUtils.mkdir_p(File.dirname(destination))
-          File.open(destination, 'wb') { |f| f.write render }
+          File.open(destination, "wb") { |f| f.write render }
         end
         given_destination
       end
 
-      protected
-
-        # Now on conflict we check if the file is identical or not.
-        #
-        def on_conflict_behavior(&block)
-          if identical?
-            say_status :identical, :blue
-          else
-            options = base.options.merge(config)
-            force_or_skip_or_conflict(options[:force], options[:skip], &block)
-          end
-        end
+    protected
 
-        # If force is true, run the action, otherwise check if it's not being
-        # skipped. If both are false, show the file_collision menu, if the menu
-        # returns true, force it, otherwise skip.
-        #
-        def force_or_skip_or_conflict(force, skip, &block)
-          if force
-            say_status :force, :yellow
-            block.call unless pretend?
-          elsif skip
-            say_status :skip, :yellow
-          else
-            say_status :conflict, :red
-            force_or_skip_or_conflict(force_on_collision?, true, &block)
-          end
+      # Now on conflict we check if the file is identical or not.
+      #
+      def on_conflict_behavior(&block)
+        if identical?
+          say_status :identical, :blue
+        else
+          options = base.options.merge(config)
+          force_or_skip_or_conflict(options[:force], options[:skip], &block)
         end
+      end
 
-        # Shows the file collision menu to the user and gets the result.
-        #
-        def force_on_collision?
-          base.shell.file_collision(destination){ render }
+      # If force is true, run the action, otherwise check if it's not being
+      # skipped. If both are false, show the file_collision menu, if the menu
+      # returns true, force it, otherwise skip.
+      #
+      def force_or_skip_or_conflict(force, skip, &block)
+        if force
+          say_status :force, :yellow
+          block.call unless pretend?
+        elsif skip
+          say_status :skip, :yellow
+        else
+          say_status :conflict, :red
+          force_or_skip_or_conflict(force_on_collision?, true, &block)
         end
+      end
 
+      # Shows the file collision menu to the user and gets the result.
+      #
+      def force_on_collision?
+        base.shell.file_collision(destination) { render }
+      end
     end
   end
 end

data/lib/thor/actions/create_link.rb

@@ -1,8 +1,7 @@
-require 'thor/actions/create_file'
+require "thor/actions/create_file"
 
 class Thor
   module Actions
-
     # Create a new file relative to the destination root from the given source.
     #
     # ==== Parameters
@@ -20,7 +19,7 @@ class Thor
       source = args.first
       action CreateLink.new(self, destination, source, config)
     end
-    alias :add_link :create_link
+    alias_method :add_link, :create_link
 
     # CreateLink is a subset of CreateFile, which instead of taking a block of
     # data, just takes a source string from the user.

data/lib/thor/actions/directory.rb

@@ -1,4 +1,4 @@
-require 'thor/actions/empty_directory'
+require "thor/actions/empty_directory"
 
 class Thor
   module Actions
@@ -55,10 +55,10 @@ class Thor
     class Directory < EmptyDirectory #:nodoc:
       attr_reader :source
 
-      def initialize(base, source, destination=nil, config={}, &block)
+      def initialize(base, source, destination = nil, config = {}, &block)
         @source = File.expand_path(base.find_in_source_paths(source.to_s))
         @block  = block
-        super(base, destination, { :recursive => true }.merge(config))
+        super(base, destination, {:recursive => true}.merge(config))
       end
 
       def invoke!
@@ -70,50 +70,49 @@ class Thor
         execute!
       end
 
-      protected
+    protected
 
-        def execute!
-          lookup = Util.escape_globs(source)
-          lookup = config[:recursive] ? File.join(lookup, '**') : lookup
-          lookup = file_level_lookup(lookup)
+      def execute! # rubocop:disable MethodLength
+        lookup = Util.escape_globs(source)
+        lookup = config[:recursive] ? File.join(lookup, "**") : lookup
+        lookup = file_level_lookup(lookup)
 
-          files(lookup).sort.each do |file_source|
-            next if File.directory?(file_source)
-            next if config[:exclude_pattern] && file_source.match(config[:exclude_pattern])
-            file_destination = File.join(given_destination, file_source.gsub(source, '.'))
-            file_destination.gsub!('/./', '/')
+        files(lookup).sort.each do |file_source|
+          next if File.directory?(file_source)
+          next if config[:exclude_pattern] && file_source.match(config[:exclude_pattern])
+          file_destination = File.join(given_destination, file_source.gsub(source, "."))
+          file_destination.gsub!("/./", "/")
 
-            case file_source
-            when /\.empty_directory$/
-              dirname = File.dirname(file_destination).gsub(/\/\.$/, '')
-              next if dirname == given_destination
-              base.empty_directory(dirname, config)
-            when /\.tt$/
-              destination = base.template(file_source, file_destination[0..-4], config, &@block)
-            else
-              destination = base.copy_file(file_source, file_destination, config, &@block)
-            end
+          case file_source
+          when /\.empty_directory$/
+            dirname = File.dirname(file_destination).gsub(/\/\.$/, "")
+            next if dirname == given_destination
+            base.empty_directory(dirname, config)
+          when /#{TEMPLATE_EXTNAME}$/
+            base.template(file_source, file_destination[0..-4], config, &@block)
+          else
+            base.copy_file(file_source, file_destination, config, &@block)
           end
         end
+      end
 
-        if RUBY_VERSION < '2.0'
-          def file_level_lookup(previous_lookup)
-            File.join(previous_lookup, '{*,.[a-z]*}')
-          end
-
-          def files(lookup)
-            Dir[lookup]
-          end
-        else
-          def file_level_lookup(previous_lookup)
-            File.join(previous_lookup, '*')
-          end
+      if RUBY_VERSION < "2.0"
+        def file_level_lookup(previous_lookup)
+          File.join(previous_lookup, "{*,.[a-z]*}")
+        end
 
-          def files(lookup)
-            Dir.glob(lookup, File::FNM_DOTMATCH)
-          end
+        def files(lookup)
+          Dir[lookup]
+        end
+      else
+        def file_level_lookup(previous_lookup)
+          File.join(previous_lookup, "*")
         end
 
+        def files(lookup)
+          Dir.glob(lookup, File::FNM_DOTMATCH)
+        end
+      end
     end
   end
 end

data/lib/thor/actions/empty_directory.rb

@@ -1,6 +1,5 @@
 class Thor
   module Actions
-
     # Creates an empty directory.
     #
     # ==== Parameters
@@ -11,7 +10,7 @@ class Thor
     #
     #   empty_directory "doc"
     #
-    def empty_directory(destination, config={})
+    def empty_directory(destination, config = {})
       action EmptyDirectory.new(self, destination, config)
     end
 
@@ -32,8 +31,8 @@ class Thor
       # destination<String>:: Relative path to the destination of this file
       # config<Hash>:: give :verbose => false to not log the status.
       #
-      def initialize(base, destination, config={})
-        @base, @config   = base, { :verbose => true }.merge(config)
+      def initialize(base, destination, config = {})
+        @base, @config   = base, {:verbose => true}.merge(config)
         self.destination = destination
       end
 
@@ -43,7 +42,7 @@ class Thor
       # Boolean:: true if the file exists, false otherwise.
       #
       def exists?
-        ::File.exists?(destination)
+        ::File.exist?(destination)
       end
 
       def invoke!
@@ -58,80 +57,79 @@ class Thor
         given_destination
       end
 
-      protected
+    protected
 
-        # Shortcut for pretend.
-        #
-        def pretend?
-          base.options[:pretend]
-        end
+      # Shortcut for pretend.
+      #
+      def pretend?
+        base.options[:pretend]
+      end
 
-        # Sets the absolute destination value from a relative destination value.
-        # It also stores the given and relative destination. Let's suppose our
-        # script is being executed on "dest", it sets the destination root to
-        # "dest". The destination, given_destination and relative_destination
-        # are related in the following way:
-        #
-        #   inside "bar" do
-        #     empty_directory "baz"
-        #   end
-        #
-        #   destination          #=> dest/bar/baz
-        #   relative_destination #=> bar/baz
-        #   given_destination    #=> baz
-        #
-        def destination=(destination)
-          if destination
-            @given_destination = convert_encoded_instructions(destination.to_s)
-            @destination = ::File.expand_path(@given_destination, base.destination_root)
-            @relative_destination = base.relative_to_original_destination_root(@destination)
-          end
+      # Sets the absolute destination value from a relative destination value.
+      # It also stores the given and relative destination. Let's suppose our
+      # script is being executed on "dest", it sets the destination root to
+      # "dest". The destination, given_destination and relative_destination
+      # are related in the following way:
+      #
+      #   inside "bar" do
+      #     empty_directory "baz"
+      #   end
+      #
+      #   destination          #=> dest/bar/baz
+      #   relative_destination #=> bar/baz
+      #   given_destination    #=> baz
+      #
+      def destination=(destination)
+        if destination
+          @given_destination = convert_encoded_instructions(destination.to_s)
+          @destination = ::File.expand_path(@given_destination, base.destination_root)
+          @relative_destination = base.relative_to_original_destination_root(@destination)
         end
+      end
 
-        # Filenames in the encoded form are converted. If you have a file:
-        #
-        #   %file_name%.rb
-        #
-        # It calls #file_name from the base and replaces %-string with the
-        # return value (should be String) of #file_name:
-        #
-        #   user.rb
-        #
-        # The method referenced can be either public or private.
-        #
-        def convert_encoded_instructions(filename)
-          filename.gsub(/%(.*?)%/) do |initial_string|
-            method = $1.strip
-            base.respond_to?(method, true) ? base.send(method) : initial_string
-          end
+      # Filenames in the encoded form are converted. If you have a file:
+      #
+      #   %file_name%.rb
+      #
+      # It calls #file_name from the base and replaces %-string with the
+      # return value (should be String) of #file_name:
+      #
+      #   user.rb
+      #
+      # The method referenced can be either public or private.
+      #
+      def convert_encoded_instructions(filename)
+        filename.gsub(/%(.*?)%/) do |initial_string|
+          method = $1.strip
+          base.respond_to?(method, true) ? base.send(method) : initial_string
         end
+      end
 
-        # Receives a hash of options and just execute the block if some
-        # conditions are met.
-        #
-        def invoke_with_conflict_check(&block)
-          if exists?
-            on_conflict_behavior(&block)
-          else
-            say_status :create, :green
-            block.call unless pretend?
-          end
-
-          destination
+      # Receives a hash of options and just execute the block if some
+      # conditions are met.
+      #
+      def invoke_with_conflict_check(&block)
+        if exists?
+          on_conflict_behavior(&block)
+        else
+          say_status :create, :green
+          block.call unless pretend?
         end
 
-        # What to do when the destination file already exists.
-        #
-        def on_conflict_behavior(&block)
-          say_status :exist, :blue
-        end
+        destination
+      end
 
-        # Shortcut to say_status shell method.
-        #
-        def say_status(status, color)
-          base.shell.say_status status, relative_destination, color if config[:verbose]
-        end
+      # What to do when the destination file already exists.
+      #
+      def on_conflict_behavior(&block)
+        say_status :exist, :blue
+      end
 
+      # Shortcut to say_status shell method.
+      #
+      def say_status(status, color)
+        base.shell.say_status status, relative_destination, color if config[:verbose]
+      end
     end
   end
 end

data/lib/thor/actions/file_manipulation.rb

@@ -1,9 +1,8 @@
-require 'erb'
-require 'open-uri'
+require "erb"
+require "open-uri"
 
 class Thor
   module Actions
-
     # Copies the file from the relative source to the relative destination. If
     # the destination is not given it's assumed to be equal to the source.
     #
@@ -79,8 +78,8 @@ class Thor
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first
 
-      source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^https?\:\/\//
-      render = open(source) {|input| input.binmode.read }
+      source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ %r{^https?\://}
+      render = open(source) { |input| input.binmode.read }
 
       destination ||= if block_given?
         block.arity == 1 ? block.call(render) : block.call
@@ -108,13 +107,13 @@ class Thor
     #
     def template(source, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
-      destination = args.first || source.sub(/\.tt$/, '')
+      destination = args.first || source.sub(/#{TEMPLATE_EXTNAME}$/, "")
 
       source  = File.expand_path(find_in_source_paths(source.to_s))
-      context = instance_eval('binding')
+      context = instance_eval("binding")
 
       create_file destination, nil, config do
-        content = ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
+        content = ERB.new(::File.binread(source), nil, "-", "@output_buffer").result(context)
         content = block.call(content) if block
         content
       end
@@ -131,7 +130,7 @@ class Thor
     #
     #   chmod "script/server", 0755
     #
-    def chmod(path, mode, config={})
+    def chmod(path, mode, config = {})
       return unless behavior == :invoke
       path = File.expand_path(path, destination_root)
       say_status :chmod, relative_to_original_destination_root(path), config.fetch(:verbose, true)
@@ -231,7 +230,7 @@ class Thor
       unless options[:pretend]
         content = File.binread(path)
         content.gsub!(flag, *args, &block)
-        File.open(path, 'wb') { |file| file.write(content) }
+        File.open(path, "wb") { |file| file.write(content) }
       end
     end
 
@@ -284,17 +283,20 @@ class Thor
     #   remove_file 'README'
     #   remove_file 'app/controllers/application_controller.rb'
     #
-    def remove_file(path, config={})
+    def remove_file(path, config = {})
       return unless behavior == :invoke
       path  = File.expand_path(path, destination_root)
 
       say_status :remove, relative_to_original_destination_root(path), config.fetch(:verbose, true)
-      ::FileUtils.rm_rf(path) if !options[:pretend] && File.exists?(path)
+      ::FileUtils.rm_rf(path) if !options[:pretend] && File.exist?(path)
     end
-    alias :remove_dir :remove_file
+    alias_method :remove_dir, :remove_file
 
-  private
     attr_accessor :output_buffer
+    private :output_buffer, :output_buffer=
+
+  private
+
     def concat(string)
       @output_buffer.concat(string)
     end
@@ -303,7 +305,7 @@ class Thor
       with_output_buffer { block.call(*args) }
     end
 
-    def with_output_buffer(buf = '') #:nodoc:
+    def with_output_buffer(buf = "") #:nodoc:
       self.output_buffer, old_buffer = buf, output_buffer
       yield
       output_buffer