thor 0.19.1 → 0.19.2

data/lib/thor/shell.rb

@@ -9,7 +9,7 @@ class Thor
       # it will use a colored log, otherwise it will use a basic one without color.
       #
       def shell
-        @shell ||= if ENV["THOR_SHELL"] && ENV["THOR_SHELL"].size > 0
+        @shell ||= if ENV["THOR_SHELL"] && !ENV["THOR_SHELL"].empty?
           Thor::Shell.const_get(ENV["THOR_SHELL"])
         elsif RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ && !ENV["ANSICON"]
           Thor::Shell::Basic

data/lib/thor/shell/basic.rb

@@ -3,14 +3,17 @@ require "io/console" if RUBY_VERSION > "1.9.2"
 
 class Thor
   module Shell
-    class Basic # rubocop:disable ClassLength
+    class Basic
       attr_accessor :base
       attr_reader   :padding
 
       # Initialize base, mute and padding to nil.
       #
       def initialize #:nodoc:
-        @base, @mute, @padding, @always_force = nil, false, 0, false
+        @base = nil
+        @mute = false
+        @padding = 0
+        @always_force = false
       end
 
       # Mute everything that's inside given block
@@ -24,7 +27,7 @@ class Thor
 
       # Check if base is muted
       #
-      def mute? # rubocop:disable TrivialAccessors
+      def mute?
         @mute
       end
 
@@ -34,6 +37,15 @@ class Thor
         @padding = [0, value].max
       end
 
+      # Sets the output padding while executing a block and resets it.
+      #
+      def indent(count = 1)
+        orig_padding = padding
+        self.padding = padding + count
+        yield
+        self.padding = orig_padding
+      end
+
       # Asks something to the user and receives a response.
       #
       # If asked to limit the correct responses, you can pass in an
@@ -148,7 +160,9 @@ class Thor
       def print_table(array, options = {}) # rubocop:disable MethodLength
         return if array.empty?
 
-        formats, indent, colwidth = [], options[:indent].to_i, options[:colwidth]
+        formats = []
+        indent = options[:indent].to_i
+        colwidth = options[:colwidth]
         options[:truncate] = terminal_width if options[:truncate] == true
 
         formats << "%-#{colwidth + 2}s" if colwidth
@@ -161,12 +175,12 @@ class Thor
         start.upto(colcount - 1) do |index|
           maxima = array.map { |row| row[index] ? row[index].to_s.size : 0 }.max
           maximas << maxima
-          if index == colcount - 1
-            # Don't output 2 trailing spaces when printing the last column
-            formats << "%-s"
-          else
-            formats << "%-#{maxima + 2}s"
-          end
+          formats << if index == colcount - 1
+                       # Don't output 2 trailing spaces when printing the last column
+                       "%-s"
+                     else
+                       "%-#{maxima + 2}s"
+                     end
         end
 
         formats[0] = formats[0].insert(0, " " * indent)
@@ -178,15 +192,15 @@ class Thor
           row.each_with_index do |column, index|
             maxima = maximas[index]
 
-            if column.is_a?(Numeric)
+            f = if column.is_a?(Numeric)
               if index == row.size - 1
                 # Don't output 2 trailing spaces when printing the last column
-                f = "%#{maxima}s"
+                "%#{maxima}s"
               else
-                f = "%#{maxima}s  "
+                "%#{maxima}s  "
               end
             else
-              f = formats[index]
+              formats[index]
             end
             sentence << f % column.to_s
           end
@@ -211,7 +225,7 @@ class Thor
         paras = message.split("\n\n")
 
         paras.map! do |unwrapped|
-          unwrapped.strip.gsub(/\n/, " ").squeeze(" ").gsub(/.{1,#{width}}(?:\s|\Z)/) { ($& + 5.chr).gsub(/\n\005/, "\n").gsub(/\005/, "\n") }
+          unwrapped.strip.tr("\n", " ").squeeze(" ").gsub(/.{1,#{width}}(?:\s|\Z)/) { ($& + 5.chr).gsub(/\n\005/, "\n").gsub(/\005/, "\n") }
         end
 
         paras.each do |para|
@@ -230,7 +244,7 @@ class Thor
       # destination<String>:: the destination file to solve conflicts
       # block<Proc>:: an optional block that returns the value to be used in diff
       #
-      def file_collision(destination) # rubocop:disable MethodLength
+      def file_collision(destination)
         return true if @always_force
         options = block_given? ? "[Ynaqdh]" : "[Ynaqh]"
 
@@ -249,7 +263,7 @@ class Thor
             return @always_force = true
           when is?(:quit)
             say "Aborting..."
-            fail SystemExit
+            raise SystemExit
           when is?(:diff)
             show_diff(destination, yield) if block_given?
             say "Retrying..."
@@ -262,10 +276,10 @@ class Thor
       # This code was copied from Rake, available under MIT-LICENSE
       # Copyright (c) 2003, 2004 Jim Weirich
       def terminal_width
-        if ENV["THOR_COLUMNS"]
-          result = ENV["THOR_COLUMNS"].to_i
+        result = if ENV["THOR_COLUMNS"]
+          ENV["THOR_COLUMNS"].to_i
         else
-          result = unix? ? dynamic_width : 80
+          unix? ? dynamic_width : 80
         end
         result < 10 ? 80 : result
       rescue
@@ -284,7 +298,7 @@ class Thor
       # Apply color to the given string with optional bold. Disabled in the
       # Thor::Shell::Basic class.
       #
-      def set_color(string, *args) #:nodoc:
+      def set_color(string, *) #:nodoc:
         string
       end
 
@@ -353,11 +367,11 @@ class Thor
       end
 
       def dynamic_width_stty
-        %x(stty size 2>/dev/null).split[1].to_i
+        `stty size 2>/dev/null`.split[1].to_i
       end
 
       def dynamic_width_tput
-        %x(tput cols 2>/dev/null).to_i
+        `tput cols 2>/dev/null`.to_i
       end
 
       def unix?
@@ -370,7 +384,7 @@ class Thor
           if chars.length <= width
             chars.join
           else
-            ( chars[0, width - 3].join) + "..."
+            chars[0, width - 3].join + "..."
           end
         end
       end
@@ -381,7 +395,8 @@ class Thor
         end
       else
         def as_unicode
-          old, $KCODE = $KCODE, "U"
+          old = $KCODE
+          $KCODE = "U"
           yield
         ensure
           $KCODE = old
@@ -391,7 +406,7 @@ class Thor
       def ask_simply(statement, color, options)
         default = options[:default]
         message = [statement, ("(#{default})" if default), nil].uniq.join(" ")
-        message = prepare_message(message, color)
+        message = prepare_message(message, *color)
         result = Thor::LineEditor.readline(message, options)
 
         return unless result

data/lib/thor/shell/color.rb

@@ -134,7 +134,7 @@ class Thor
       # for diff.
       #
       def diff_lcs_loaded? #:nodoc:
-        return true  if defined?(Diff::LCS)
+        return true if defined?(Diff::LCS)
         return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
 
         @diff_lcs_loaded = begin

data/lib/thor/shell/html.rb

@@ -51,13 +51,13 @@ class Thor
       def set_color(string, *colors)
         if colors.all? { |color| color.is_a?(Symbol) || color.is_a?(String) }
           html_colors = colors.map { |color| lookup_color(color) }
-          "<span style=\"#{html_colors.join("; ")};\">#{string}</span>"
+          "<span style=\"#{html_colors.join('; ')};\">#{string}</span>"
         else
           color, bold = colors
           html_color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
           styles = [html_color]
           styles << BOLD if bold
-          "<span style=\"#{styles.join("; ")};\">#{string}</span>"
+          "<span style=\"#{styles.join('; ')};\">#{string}</span>"
         end
       end
 
@@ -68,7 +68,7 @@ class Thor
       #
       # TODO: Implement #ask for Thor::Shell::HTML
       def ask(statement, color = nil)
-        fail NotImplementedError, "Implement #ask for Thor::Shell::HTML"
+        raise NotImplementedError, "Implement #ask for Thor::Shell::HTML"
       end
 
     protected
@@ -111,7 +111,7 @@ class Thor
       # for diff.
       #
       def diff_lcs_loaded? #:nodoc:
-        return true  if defined?(Diff::LCS)
+        return true if defined?(Diff::LCS)
         return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
 
         @diff_lcs_loaded = begin

data/lib/thor/util.rb

@@ -64,7 +64,7 @@ class Thor
         new_constants = Thor::Base.subclasses.dup
         Thor::Base.subclasses.replace(old_constants)
 
-        new_constants.map! { |c| c.namespace }
+        new_constants.map!(&:namespace)
         new_constants.compact!
         new_constants
       end
@@ -72,7 +72,7 @@ class Thor
       # Returns the thor classes declared inside the given class.
       #
       def thor_classes_in(klass)
-        stringfied_constants = klass.constants.map { |c| c.to_s }
+        stringfied_constants = klass.constants.map(&:to_s)
         Thor::Base.subclasses.select do |subclass|
           next unless subclass.name
           stringfied_constants.include?(subclass.name.gsub("#{klass.name}::", ""))
@@ -103,7 +103,7 @@ class Thor
       #
       def camel_case(str)
         return str if str !~ /_/ && str =~ /[A-Z]+.*/
-        str.split("_").map { |i| i.capitalize }.join
+        str.split("_").map(&:capitalize).join
       end
 
       # Receives a namespace and tries to retrieve a Thor or Thor::Group class
@@ -135,7 +135,8 @@ class Thor
           klass   = Thor::Util.find_by_namespace(pieces.join(":"))
         end
         unless klass # look for a Thor::Group with the right name
-          klass, command = Thor::Util.find_by_namespace(namespace), nil
+          klass = Thor::Util.find_by_namespace(namespace)
+          command = nil
         end
         if !klass && fallback # try a command in the default namespace
           command = namespace
@@ -163,7 +164,7 @@ class Thor
         end
       end
 
-      def user_home # rubocop:disable MethodLength
+      def user_home
         @@user_home ||= if ENV["HOME"]
           ENV["HOME"]
         elsif ENV["USERPROFILE"]
@@ -188,7 +189,7 @@ class Thor
       # Returns the root where thor files are located, depending on the OS.
       #
       def thor_root
-        File.join(user_home, ".thor").gsub(/\\/, "/")
+        File.join(user_home, ".thor").tr('\\', "/")
       end
 
       # Returns the files in the thor root. On Windows thor_root will be something
@@ -216,7 +217,7 @@ class Thor
       # Return the path to the ruby interpreter taking into account multiple
       # installations and windows extensions.
       #
-      def ruby_command # rubocop:disable MethodLength
+      def ruby_command
         @ruby_command ||= begin
           ruby_name = RbConfig::CONFIG["ruby_install_name"]
           ruby = File.join(RbConfig::CONFIG["bindir"], ruby_name)

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.19.1"
+  VERSION = "0.19.2"
 end

data/thor.gemspec

@@ -6,19 +6,16 @@ require "thor/version"
 Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.0"
   spec.authors = ["Yehuda Katz", "José Valim"]
-  spec.description = %q(Thor is a toolkit for building powerful command-line interfaces.)
+  spec.description = "Thor is a toolkit for building powerful command-line interfaces."
   spec.email = "ruby-thor@googlegroups.com"
-  spec.executables = %w[thor]
-  spec.files = %w[.document CHANGELOG.md LICENSE.md README.md Thorfile thor.gemspec]
-  spec.files += Dir.glob("bin/**/*")
-  spec.files += Dir.glob("lib/**/*.rb")
-  spec.files += Dir.glob("spec/**/*")
+  spec.executables = %w(thor)
+  spec.files = %w(.document thor.gemspec) + Dir["*.md", "bin/*", "lib/**/*.rb"]
   spec.homepage = "http://whatisthor.com/"
-  spec.licenses = %w[MIT]
+  spec.licenses = %w(MIT)
   spec.name = "thor"
-  spec.require_paths = %w[lib]
+  spec.require_paths = %w(lib)
+  spec.required_ruby_version = ">= 1.8.7"
   spec.required_rubygems_version = ">= 1.3.5"
   spec.summary = spec.description
-  spec.test_files = Dir.glob("spec/**/*")
   spec.version = Thor::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Yehuda Katz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -34,9 +34,9 @@ extra_rdoc_files: []
 files:
 - ".document"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - LICENSE.md
 - README.md
-- Thorfile
 - bin/thor
 - lib/thor.rb
 - lib/thor/actions.rb
@@ -70,77 +70,6 @@ files:
 - lib/thor/shell/html.rb
 - lib/thor/util.rb
 - lib/thor/version.rb
-- spec/actions/create_file_spec.rb
-- spec/actions/create_link_spec.rb
-- spec/actions/directory_spec.rb
-- spec/actions/empty_directory_spec.rb
-- spec/actions/file_manipulation_spec.rb
-- spec/actions/inject_into_file_spec.rb
-- spec/actions_spec.rb
-- spec/base_spec.rb
-- spec/command_spec.rb
-- spec/core_ext/hash_with_indifferent_access_spec.rb
-- spec/core_ext/ordered_hash_spec.rb
-- spec/exit_condition_spec.rb
-- spec/fixtures/application.rb
-- spec/fixtures/app{1}/README
-- spec/fixtures/bundle/execute.rb
-- spec/fixtures/bundle/main.thor
-- spec/fixtures/command.thor
-- spec/fixtures/doc/%file_name%.rb.tt
-- spec/fixtures/doc/COMMENTER
-- spec/fixtures/doc/README
-- spec/fixtures/doc/block_helper.rb
-- spec/fixtures/doc/config.rb
-- spec/fixtures/doc/config.yaml.tt
-- spec/fixtures/doc/excluding/%file_name%.rb.tt
-- spec/fixtures/enum.thor
-- spec/fixtures/group.thor
-- spec/fixtures/invoke.thor
-- spec/fixtures/path with spaces
-- spec/fixtures/preserve/script.sh
-- spec/fixtures/script.thor
-- spec/fixtures/subcommand.thor
-- spec/group_spec.rb
-- spec/helper.rb
-- spec/invocation_spec.rb
-- spec/line_editor/basic_spec.rb
-- spec/line_editor/readline_spec.rb
-- spec/line_editor_spec.rb
-- spec/parser/argument_spec.rb
-- spec/parser/arguments_spec.rb
-- spec/parser/option_spec.rb
-- spec/parser/options_spec.rb
-- spec/quality_spec.rb
-- spec/rake_compat_spec.rb
-- spec/register_spec.rb
-- spec/runner_spec.rb
-- spec/sandbox/application.rb
-- spec/sandbox/app{1}/README
-- spec/sandbox/bundle/execute.rb
-- spec/sandbox/bundle/main.thor
-- spec/sandbox/command.thor
-- spec/sandbox/doc/%file_name%.rb.tt
-- spec/sandbox/doc/COMMENTER
-- spec/sandbox/doc/README
-- spec/sandbox/doc/block_helper.rb
-- spec/sandbox/doc/config.rb
-- spec/sandbox/doc/config.yaml.tt
-- spec/sandbox/doc/excluding/%file_name%.rb.tt
-- spec/sandbox/enum.thor
-- spec/sandbox/group.thor
-- spec/sandbox/invoke.thor
-- spec/sandbox/path with spaces
-- spec/sandbox/preserve/script.sh
-- spec/sandbox/script.thor
-- spec/sandbox/subcommand.thor
-- spec/shell/basic_spec.rb
-- spec/shell/color_spec.rb
-- spec/shell/html_spec.rb
-- spec/shell_spec.rb
-- spec/subcommand_spec.rb
-- spec/thor_spec.rb
-- spec/util_spec.rb
 - thor.gemspec
 homepage: http://whatisthor.com/
 licenses:
@@ -154,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -162,79 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Thor is a toolkit for building powerful command-line interfaces.
-test_files:
-- spec/actions/create_file_spec.rb
-- spec/actions/create_link_spec.rb
-- spec/actions/directory_spec.rb
-- spec/actions/empty_directory_spec.rb
-- spec/actions/file_manipulation_spec.rb
-- spec/actions/inject_into_file_spec.rb
-- spec/actions_spec.rb
-- spec/base_spec.rb
-- spec/command_spec.rb
-- spec/core_ext/hash_with_indifferent_access_spec.rb
-- spec/core_ext/ordered_hash_spec.rb
-- spec/exit_condition_spec.rb
-- spec/fixtures/application.rb
-- spec/fixtures/app{1}/README
-- spec/fixtures/bundle/execute.rb
-- spec/fixtures/bundle/main.thor
-- spec/fixtures/command.thor
-- spec/fixtures/doc/%file_name%.rb.tt
-- spec/fixtures/doc/block_helper.rb
-- spec/fixtures/doc/COMMENTER
-- spec/fixtures/doc/config.rb
-- spec/fixtures/doc/config.yaml.tt
-- spec/fixtures/doc/excluding/%file_name%.rb.tt
-- spec/fixtures/doc/README
-- spec/fixtures/enum.thor
-- spec/fixtures/group.thor
-- spec/fixtures/invoke.thor
-- spec/fixtures/path with spaces
-- spec/fixtures/preserve/script.sh
-- spec/fixtures/script.thor
-- spec/fixtures/subcommand.thor
-- spec/group_spec.rb
-- spec/helper.rb
-- spec/invocation_spec.rb
-- spec/line_editor/basic_spec.rb
-- spec/line_editor/readline_spec.rb
-- spec/line_editor_spec.rb
-- spec/parser/argument_spec.rb
-- spec/parser/arguments_spec.rb
-- spec/parser/option_spec.rb
-- spec/parser/options_spec.rb
-- spec/quality_spec.rb
-- spec/rake_compat_spec.rb
-- spec/register_spec.rb
-- spec/runner_spec.rb
-- spec/sandbox/application.rb
-- spec/sandbox/app{1}/README
-- spec/sandbox/bundle/execute.rb
-- spec/sandbox/bundle/main.thor
-- spec/sandbox/command.thor
-- spec/sandbox/doc/%file_name%.rb.tt
-- spec/sandbox/doc/block_helper.rb
-- spec/sandbox/doc/COMMENTER
-- spec/sandbox/doc/config.rb
-- spec/sandbox/doc/config.yaml.tt
-- spec/sandbox/doc/excluding/%file_name%.rb.tt
-- spec/sandbox/doc/README
-- spec/sandbox/enum.thor
-- spec/sandbox/group.thor
-- spec/sandbox/invoke.thor
-- spec/sandbox/path with spaces
-- spec/sandbox/preserve/script.sh
-- spec/sandbox/script.thor
-- spec/sandbox/subcommand.thor
-- spec/shell/basic_spec.rb
-- spec/shell/color_spec.rb
-- spec/shell/html_spec.rb
-- spec/shell_spec.rb
-- spec/subcommand_spec.rb
-- spec/thor_spec.rb
-- spec/util_spec.rb
+test_files: []