bundler 1.5.1 → 1.5.2

data/lib/bundler/vendor/thor/actions.rb

@@ -26,9 +26,9 @@ class Thor
       end
 
       # Stores and return the source root for this class
-      def source_root(path=nil)
+      def source_root(path = nil)
         @_source_root = path if path
-        @_source_root
+        @_source_root ||= nil
       end
 
       # Returns the source paths in the following order:
@@ -39,8 +39,8 @@ class Thor
       #
       def source_paths_for_search
         paths = []
-        paths += self.source_paths
-        paths << self.source_root if self.source_root
+        paths += source_paths
+        paths << source_root if source_root
         paths += from_superclass(:source_paths, [])
         paths
       end
@@ -48,17 +48,17 @@ class Thor
       # Add runtime options that help actions execution.
       #
       def add_runtime_options!
-        class_option :force, :type => :boolean, :aliases => "-f", :group => :runtime,
-                             :desc => "Overwrite files that already exist"
+        class_option :force, :type => :boolean, :aliases => '-f', :group => :runtime,
+                             :desc => 'Overwrite files that already exist'
 
-        class_option :pretend, :type => :boolean, :aliases => "-p", :group => :runtime,
-                               :desc => "Run but do not make any changes"
+        class_option :pretend, :type => :boolean, :aliases => '-p', :group => :runtime,
+                               :desc => 'Run but do not make any changes'
 
-        class_option :quiet, :type => :boolean, :aliases => "-q", :group => :runtime,
-                             :desc => "Suppress status output"
+        class_option :quiet, :type => :boolean, :aliases => '-q', :group => :runtime,
+                             :desc => 'Suppress status output'
 
-        class_option :skip, :type => :boolean, :aliases => "-s", :group => :runtime,
-                            :desc => "Skip files that already exist"
+        class_option :skip, :type => :boolean, :aliases => '-s', :group => :runtime,
+                            :desc => 'Skip files that already exist'
       end
     end
 
@@ -71,17 +71,16 @@ class Thor
     #
     # destination_root<String>:: The root directory needed for some actions.
     #
-    def initialize(args=[], options={}, config={})
+    def initialize(args = [], options = {}, config = {})
       self.behavior = case config[:behavior].to_s
-      when "force", "skip"
-        _cleanup_options_and_set(options, config[:behavior])
-        :invoke
-      when "revoke"
-        :revoke
-      else
-        :invoke
-      end
-
+                      when 'force', 'skip'
+                        _cleanup_options_and_set(options, config[:behavior])
+                        :invoke
+                      when 'revoke'
+                        :revoke
+                      else
+                        :invoke
+                      end
       super
       self.destination_root = config[:destination_root]
     end
@@ -113,7 +112,7 @@ class Thor
     # Returns the given path relative to the absolute root (ie, root where
     # the script started).
     #
-    def relative_to_original_destination_root(path, remove_dot=true)
+    def relative_to_original_destination_root(path, remove_dot = true)
       path = path.dup
       if path.gsub!(@destination_stack[0], '.')
         remove_dot ? (path[2..-1] || '') : path
@@ -130,12 +129,15 @@ class Thor
 
     # Receives a file or directory and search for it in the source paths.
     #
-    def find_in_source_paths(file)
+    def find_in_source_paths(file) # rubocop:disable MethodLength
+      possible_files = [file, file + TEMPLATE_EXTNAME]
       relative_root = relative_to_original_destination_root(destination_root, false)
 
       source_paths.each do |source|
-        source_file = File.expand_path(file, File.join(source, relative_root))
-        return source_file if File.exists?(source_file)
+        possible_files.each do |f|
+          source_file = File.expand_path(f, File.join(source, relative_root))
+          return source_file if File.exist?(source_file)
+        end
       end
 
       message = "Could not find #{file.inspect} in any of your source paths. "
@@ -145,12 +147,12 @@ class Thor
       end
 
       if source_paths.empty?
-        message << "Currently you have no source paths."
+        message << 'Currently you have no source paths.'
       else
         message << "Your current source paths are: \n#{source_paths.join("\n")}"
       end
 
-      raise Error, message
+      fail Error, message
     end
 
     # Do something in the root or on a provided subfolder. If a relative path
@@ -162,7 +164,7 @@ class Thor
     # dir<String>:: the directory to move to.
     # config<Hash>:: give :verbose => true to log and use padding.
     #
-    def inside(dir='', config={}, &block)
+    def inside(dir = '', config = {}, &block)
       verbose = config.fetch(:verbose, false)
       pretend = options[:pretend]
 
@@ -204,18 +206,18 @@ class Thor
     #
     #   apply "recipes/jquery.rb"
     #
-    def apply(path, config={})
+    def apply(path, config = {})
       verbose = config.fetch(:verbose, true)
-      is_uri  = path =~ /^https?\:\/\//
+      is_uri  = path =~ %r{^https?\://}
       path    = find_in_source_paths(path) unless is_uri
 
       say_status :apply, path, verbose
       shell.padding += 1 if verbose
 
       if is_uri
-        contents = open(path, "Accept" => "application/x-thor-template") {|io| io.read }
+        contents = open(path, 'Accept' => 'application/x-thor-template') { |io| io.read }
       else
-        contents = open(path) {|io| io.read }
+        contents = open(path) { |io| io.read }
       end
 
       instance_eval(contents, path)
@@ -235,7 +237,7 @@ class Thor
     #     run('ln -s ~/edge rails')
     #   end
     #
-    def run(command, config={})
+    def run(command, config = {})
       return unless behavior == :invoke
 
       destination = relative_to_original_destination_root(destination_root, false)
@@ -259,7 +261,7 @@ class Thor
     # command<String>:: the command to be executed.
     # config<Hash>:: give :verbose => false to not log the status.
     #
-    def run_ruby_script(command, config={})
+    def run_ruby_script(command, config = {})
       return unless behavior == :invoke
       run command, config.merge(:with => Thor::Util.ruby_command)
     end
@@ -295,24 +297,23 @@ class Thor
       run command, :with => :thor, :verbose => verbose, :pretend => pretend, :capture => capture
     end
 
-    protected
+  protected
 
-      # Allow current root to be shared between invocations.
-      #
-      def _shared_configuration #:nodoc:
-        super.merge!(:destination_root => self.destination_root)
-      end
+    # Allow current root to be shared between invocations.
+    #
+    def _shared_configuration #:nodoc:
+      super.merge!(:destination_root => destination_root)
+    end
 
-      def _cleanup_options_and_set(options, key) #:nodoc:
-        case options
-        when Array
-          %w(--force -f --skip -s).each { |i| options.delete(i) }
-          options << "--#{key}"
-        when Hash
-          [:force, :skip, "force", "skip"].each { |i| options.delete(i) }
-          options.merge!(key => true)
-        end
+    def _cleanup_options_and_set(options, key) #:nodoc:
+      case options
+      when Array
+        %w(--force -f --skip -s).each { |i| options.delete(i) }
+        options << "--#{key}"
+      when Hash
+        [:force, :skip, 'force', 'skip'].each { |i| options.delete(i) }
+        options.merge!(key => true)
       end
-
+    end
   end
 end

data/lib/bundler/vendor/thor/actions/create_file.rb

@@ -2,7 +2,6 @@ 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
@@ -51,10 +50,10 @@ class Thor
       #
       def render
         @render ||= if data.is_a?(Proc)
-          data.call
-        else
-          data
-        end
+                      data.call
+                    else
+                      data
+                    end
       end
 
       def invoke!
@@ -65,41 +64,40 @@ class Thor
         given_destination
       end
 
-      protected
+    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
-
-        # 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/bundler/vendor/thor/actions/create_link.rb

@@ -2,7 +2,6 @@ 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/bundler/vendor/thor/actions/directory.rb

@@ -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/bundler/vendor/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