commander 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a71b1e0b6cd4cc5c9155cd54879132e0e8d76446
-  data.tar.gz: 7cebb2917cfd393a23a1aac0fd4763142709ed01
+  metadata.gz: 61e13c07b5343657433d60e4c43e472a2ed3d556
+  data.tar.gz: 514acee724f197f3500138992a32dc604b91765c
 SHA512:
-  metadata.gz: 0de8b294364f785f0ce045d801fc2bf7c6f64ab3cd505cef40169533461377314098044ad8a88f3b297625cb92fc970f7a8f8c06b056ac75266f32fc40c9155b
-  data.tar.gz: 6d90f6f512e2856f9aa3779e6bcf54a8d4118c3f9083b544fbe1a4488248dbc548977ace3684cee16bcd2529a7e8e06053f66b3c2f290029f7cf874da9251652
+  metadata.gz: cbef7c7332b5399567cbbfffdc3849e49fbeb513814466f0494d32a7326f02c794c0fde96693950287687c84d955b51e23f89dc4c1c9ddf9ab3a7f897a5d6c33
+  data.tar.gz: 75e421ef03d886623685b3f0f25460b1d72de46ce37d0034384cf098bab9a77d57ce80587220f0a8fba428031b70a62148219eaf6ad6cd2464666e81cc6e95d5

data/.rubocop.yml

@@ -4,7 +4,6 @@ inherit_from: .rubocop_todo.yml
 Encoding:
   Enabled: false
 
-# Offense count: 1
-LineLength:
-  Max: 242
-
+# Enforce trailing comma after last item of multiline hashes.
+Style/TrailingComma:
+  EnforcedStyleForMultiline: comma

data/.rubocop_todo.yml

@@ -1,19 +1,10 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-02-07 17:05:05 -0800 using RuboCop version 0.29.0.
+# on 2015-02-16 16:08:54 -0800 using RuboCop version 0.29.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 5
-Lint/AmbiguousOperator:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Enabled: false
-
 # Offense count: 2
 Lint/Eval:
   Enabled: false
@@ -22,19 +13,6 @@ Lint/Eval:
 Lint/HandleExceptions:
   Enabled: false
 
-# Offense count: 1
-Lint/RescueException:
-  Enabled: false
-
-# Offense count: 2
-Lint/ShadowingOuterLocalVariable:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
-  Enabled: false
-
 # Offense count: 5
 Metrics/AbcSize:
   Max: 29
@@ -42,13 +20,13 @@ Metrics/AbcSize:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 221
+  Max: 230
 
 # Offense count: 4
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 2
+# Offense count: 89
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 242
@@ -56,7 +34,7 @@ Metrics/LineLength:
 # Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 33
+  Max: 36
 
 # Offense count: 4
 Metrics/PerceivedComplexity:
@@ -66,147 +44,34 @@ Metrics/PerceivedComplexity:
 Style/AccessorMethodName:
   Enabled: false
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/ClassAndModuleChildren:
-  Enabled: false
-
 # Offense count: 18
 Style/Documentation:
   Enabled: false
 
-# Offense count: 2
-Style/EachWithObject:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundMethodBody:
-  Enabled: false
-
-# Offense count: 5
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/FormatString:
-  Enabled: false
-
 # Offense count: 12
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Enabled: false
 
-# Offense count: 2
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Enabled: false
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/HashSyntax:
-  Enabled: false
-
 # Offense count: 1
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/Lambda:
-  Enabled: false
-
-# Offense count: 17
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MethodDefParentheses:
-  Enabled: false
-
 # Offense count: 1
 Style/MultilineBlockChain:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MultilineOperationIndentation:
-  Enabled: false
-
 # Offense count: 1
 Style/MultilineTernaryOperator:
   Enabled: false
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/Not:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Enabled: false
-
 # Offense count: 5
 Style/RescueModifier:
   Enabled: false
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AllowAsExpressionSeparator.
-Style/Semicolon:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpecialGlobalVars:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
-  Enabled: false
-
-# Offense count: 74
-# Cop supports --auto-correct.
-Style/TrailingWhitespace:
-  Enabled: false
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, Whitelist.
 Style/TrivialAccessors:
   Enabled: false
-
-# Offense count: 1
-Style/UnlessElse:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/VariableName:
-  Enabled: false

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 4.3.1 / 2015-03-27
+
+* Fix various Ruby warnings for circular requires, etc.
+* Update to use highline 1.7 (@SkyTrix)
+
 === 4.3.0 / 2015-02-07
 
 * Drops support for Ruby 1.8. Please use 4.2.1 if you still need Ruby 1.8 compatibility.

data/bin/commander

@@ -48,7 +48,7 @@ command :init do |c|
       end
       File.chmod 0755, file
       say "Initialized template in #{file}"
-    rescue Exception => e
+    rescue => e
       abort e
     end
   end

data/commander.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('highline', '~> 1.6.11')
+  s.add_runtime_dependency('highline', '~> 1.7.1')
 
   s.add_development_dependency('rspec', '~> 2.14')
   s.add_development_dependency('rake')

data/lib/commander/blank.rb

@@ -1,4 +1,3 @@
-
 module Blank
   def self.included(base)
     base.class_eval do

data/lib/commander/command.rb

@@ -1,4 +1,3 @@
-
 require 'optparse'
 
 module Commander
@@ -112,7 +111,7 @@ module Commander
         args: args,
         proc: proc,
         switches: switches,
-        description: description
+        description: description,
       }
     end
 
@@ -162,7 +161,7 @@ module Commander
 
     def parse_options_and_call_procs(*args)
       return args if args.empty?
-      @options.inject OptionParser.new do |opts, option|
+      @options.each_with_object(OptionParser.new) do |option, opts|
         opts.on(*option[:args], &option[:proc])
         opts
       end.parse! args
@@ -187,7 +186,7 @@ module Commander
     # collected by the #option_proc.
 
     def proxy_option_struct
-      proxy_options.inject Options.new do |options, (option, value)|
+      proxy_options.each_with_object(Options.new) do |(option, value), options|
         # options that are present will evaluate to true
         value = true if value.nil?
         options.__send__ :"#{option}=", value
@@ -201,7 +200,7 @@ module Commander
     # and work with option values.
 
     def option_proc(switches)
-      lambda { |value| proxy_options << [Runner.switch_to_sym(switches.last), value] }
+      ->(value) { proxy_options << [Runner.switch_to_sym(switches.last), value] }
     end
 
     def inspect

data/lib/commander/configure.rb

@@ -1,6 +1,3 @@
-require 'commander'
-require 'commander/methods'
-
 module Commander
   def configure(*configuration_opts, &configuration_block)
     configuration_module = Module.new

data/lib/commander/core_ext/array.rb

@@ -1,4 +1,3 @@
-
 class Array
   ##
   # Split _string_ into an array. Used in

data/lib/commander/core_ext/object.rb

@@ -1,4 +1,3 @@
-
 class Object
   ##
   # Return the current binding.

data/lib/commander/core_ext.rb

@@ -1,3 +1,2 @@
-
 require 'commander/core_ext/array'
 require 'commander/core_ext/object'

data/lib/commander/delegates.rb

@@ -12,8 +12,8 @@ module Commander
       never_trace!
     ).each do |meth|
       eval <<-END, binding, __FILE__, __LINE__
-        def #{meth} *args, &block
-          ::Commander::Runner.instance.#{meth} *args, &block
+        def #{meth}(*args, &block)
+          ::Commander::Runner.instance.#{meth}(*args, &block)
         end
       END
     end

data/lib/commander/help_formatters/base.rb

@@ -1,4 +1,3 @@
-
 module Commander
   ##
   # = Help Formatter

data/lib/commander/help_formatters/terminal.rb

@@ -1,4 +1,3 @@
-
 require 'erb'
 
 module Commander

data/lib/commander/help_formatters/terminal_compact.rb

@@ -1,4 +1,3 @@
-
 require 'erb'
 
 module Commander

data/lib/commander/help_formatters.rb

@@ -1,4 +1,3 @@
-
 module Commander
   module HelpFormatter
     autoload :Base, 'commander/help_formatters/base'

data/lib/commander/import.rb

@@ -1,6 +1,4 @@
-
 require 'commander'
-require 'commander/delegates'
 
 include Commander::UI
 include Commander::UI::AskForClass

data/lib/commander/methods.rb

@@ -1,10 +1,9 @@
-require 'commander'
-require 'commander/delegates'
+module Commander
+  module Methods
+    include Commander::UI
+    include Commander::UI::AskForClass
+    include Commander::Delegates
 
-module Commander::Methods
-  include Commander::UI
-  include Commander::UI::AskForClass
-  include Commander::Delegates
-
-  $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
+    $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 5 rescue 80 if $stdin.tty?
+  end
 end

data/lib/commander/platform.rb

@@ -1,4 +1,3 @@
-
 module Commander
   module Platform
     def self.jruby?

data/lib/commander/runner.rb

@@ -2,71 +2,77 @@ require 'optparse'
 
 module Commander
   class Runner
-    
     #--
     # Exceptions
     #++
 
     class CommandError < StandardError; end
     class InvalidCommandError < CommandError; end
-    
+
     ##
     # Array of commands.
-    
+
     attr_reader :commands
-    
+
     ##
     # Global options.
-    
+
     attr_reader :options
-    
+
     ##
     # Hash of help formatter aliases.
-    
+
     attr_reader :help_formatter_aliases
 
     ##
     # Initialize a new command runner. Optionally
     # supplying _args_ for mocking, or arbitrary usage.
-    
-    def initialize args = ARGV
+
+    def initialize(args = ARGV)
       @args, @commands, @aliases, @options = args, {}, {}, []
       @help_formatter_aliases = help_formatter_alias_defaults
       @program = program_defaults
+      @always_trace = false
+      @never_trace = false
       create_default_commands
     end
-    
+
     ##
     # Return singleton Runner instance.
-    
+
     def self.instance
       @singleton ||= new
     end
-    
+
     ##
     # Run command parsing and execution process.
-    
+
     def run!
       trace = @always_trace || false
       require_program :version, :description
       trap('INT') { abort program(:int_message) } if program(:int_message)
       trap('INT') { program(:int_block).call } if program(:int_block)
       global_option('-h', '--help', 'Display help documentation') do
-        args = @args - %w[-h --help]
+        args = @args - %w(-h --help)
         command(:help).run(*args)
         return
       end
-      global_option('-v', '--version', 'Display version information') { say version; return } 
+      global_option('-v', '--version', 'Display version information') do
+        say version
+        return
+      end
       global_option('-t', '--trace', 'Display backtrace when an error occurs') { trace = true } unless @never_trace || @always_trace
       parse_global_options
       remove_global_options options, @args
-      unless trace
+      if trace
+        run_active_command
+      else
         begin
           run_active_command
         rescue InvalidCommandError => e
           abort "#{e}. Use --help for more information"
         rescue \
-          OptionParser::InvalidOption, 
+          OptionParser::InvalidOption,
           OptionParser::InvalidArgument,
           OptionParser::MissingArgument => e
           abort e.to_s
@@ -77,16 +83,14 @@ module Commander
             abort "error: #{e}. Use --trace to view backtrace"
           end
         end
-      else
-        run_active_command
       end
     end
-    
+
     ##
     # Return program version.
-    
+
     def version
-      '%s %s' % [program(:name), program(:version)]
+      format('%s %s', program(:name), program(:version))
     end
 
     ##
@@ -109,7 +113,7 @@ module Commander
     # Assign program information.
     #
     # === Examples
-    #    
+    #
     #   # Set data
     #   program :name, 'Commander'
     #   program :version, Commander::VERSION
@@ -119,7 +123,7 @@ module Commander
     #   program :int_message 'Bye bye!'
     #   program :help_formatter, :compact
     #   program :help_formatter, Commander::HelpFormatter::TerminalCompact
-    #   
+    #
     #   # Get data
     #   program :name # => 'Commander'
     #
@@ -132,9 +136,9 @@ module Commander
     #   :help            Allows addition of arbitrary global help blocks
     #   :int_message     Message to display when interrupted (CTRL + C)
     #
-    
-    def program key, *args, &block
-      if key == :help and !args.empty?
+
+    def program(key, *args, &block)
+      if key == :help && !args.empty?
         @program[:help] ||= {}
         @program[:help][args.first] = args.at(1)
       elsif key == :help_formatter && !args.empty?
@@ -148,150 +152,154 @@ module Commander
         @program[key]
       end
     end
-    
+
     ##
     # Creates and yields a command instance when a block is passed.
     # Otherwise attempts to return the command, raising InvalidCommandError when
     # it does not exist.
     #
     # === Examples
-    #    
+    #
     #   command :my_command do |c|
     #     c.when_called do |args|
     #       # Code
     #     end
     #   end
     #
-    
-    def command name, &block
+
+    def command(name, &block)
       yield add_command(Commander::Command.new(name)) if block
       @commands[name.to_s]
     end
-    
+
     ##
     # Add a global option; follows the same syntax as Command#option
     # This would be used for switches such as --version, --trace, etc.
-    
-    def global_option *args, &block
-      switches, description = Runner.separate_switches_from_description *args
+
+    def global_option(*args, &block)
+      switches, description = Runner.separate_switches_from_description(*args)
       @options << {
-        :args => args,
-        :proc => block,
-        :switches => switches,
-        :description => description,
+        args: args,
+        proc: block,
+        switches: switches,
+        description: description,
       }
     end
-    
+
     ##
     # Alias command _name_ with _alias_name_. Optionally _args_ may be passed
     # as if they were being passed straight to the original command via the command-line.
-    
-    def alias_command alias_name, name, *args
+
+    def alias_command(alias_name, name, *args)
       @commands[alias_name.to_s] = command name
       @aliases[alias_name.to_s] = args
     end
-    
+
     ##
     # Default command _name_ to be used when no other
     # command is found in the arguments.
-    
-    def default_command name
+
+    def default_command(name)
       @default_command = name
     end
-    
+
     ##
     # Add a command object to this runner.
-    
-    def add_command command
+
+    def add_command(command)
       @commands[command.name] = command
     end
-    
+
     ##
     # Check if command _name_ is an alias.
-    
-    def alias? name
+
+    def alias?(name)
       @aliases.include? name.to_s
     end
-    
+
     ##
     # Check if a command _name_ exists.
-    
-    def command_exists? name
+
+    def command_exists?(name)
       @commands[name.to_s]
     end
-    
+
     #:stopdoc:
-    
+
     ##
     # Get active command within arguments passed to this runner.
-    
+
     def active_command
       @__active_command ||= command(command_name_from_args)
     end
-    
+
     ##
     # Attempts to locate a command name from within the arguments.
     # Supports multi-word commands, using the largest possible match.
-    
+
     def command_name_from_args
       @__command_name_from_args ||= (valid_command_names_from(*@args.dup).sort.last || @default_command)
     end
-    
+
     ##
     # Returns array of valid command names found within _args_.
-    
-    def valid_command_names_from *args
+
+    def valid_command_names_from(*args)
       arg_string = args.delete_if { |value| value =~ /^-/ }.join ' '
       commands.keys.find_all { |name| name if /^#{name}\b/.match arg_string }
     end
-    
+
     ##
     # Help formatter instance.
-    
+
     def help_formatter
       @__help_formatter ||= program(:help_formatter).new self
     end
-    
+
     ##
     # Return arguments without the command name.
-    
+
     def args_without_command_name
       removed = []
       parts = command_name_from_args.split rescue []
       @args.dup.delete_if do |arg|
-        removed << arg if parts.include?(arg) and not removed.include?(arg)
+        removed << arg if parts.include?(arg) && !removed.include?(arg)
       end
     end
-    
+
     ##
     # Returns hash of help formatter alias defaults.
-    
+
     def help_formatter_alias_defaults
-      return :compact => HelpFormatter::TerminalCompact
+      {
+        compact: HelpFormatter::TerminalCompact,
+      }
     end
-    
+
     ##
     # Returns hash of program defaults.
-    
+
     def program_defaults
-      return :help_formatter => HelpFormatter::Terminal, 
-             :name => File.basename($0)
+      {
+        help_formatter: HelpFormatter::Terminal,
+        name: File.basename($PROGRAM_NAME),
+      }
     end
-    
+
     ##
-    # Creates default commands such as 'help' which is 
+    # Creates default commands such as 'help' which is
     # essentially the same as using the --help switch.
-    
+
     def create_default_commands
       command :help do |c|
         c.syntax = 'commander help [command]'
         c.description = 'Display global or [command] help documentation'
         c.example 'Display global help', 'command help'
         c.example "Display help for 'foo'", 'command help foo'
-        c.when_called do |args, options|
+        c.when_called do |args, _options|
           UI.enable_paging
           if args.empty?
-            say help_formatter.render 
+            say help_formatter.render
           else
             command = command args.join(' ')
             begin
@@ -304,33 +312,33 @@ module Commander
         end
       end
     end
-    
+
     ##
     # Raises InvalidCommandError when a _command_ is not found.
-    
-    def require_valid_command command = active_command
-      raise InvalidCommandError, 'invalid command', caller if command.nil?
+
+    def require_valid_command(command = active_command)
+      fail InvalidCommandError, 'invalid command', caller if command.nil?
     end
-    
+
     ##
     # Removes global _options_ from _args_. This prevents an invalid
     # option error from occurring when options are parsed
     # again for the command.
-    
-    def remove_global_options options, args
+
+    def remove_global_options(options, args)
       # TODO: refactor with flipflop, please TJ ! have time to refactor me !
       options.each do |option|
         switches = option[:switches].dup
         next if switches.empty?
 
-        if switchHasArg = switches.any? { |s| s =~ /[ =]/ }
+        if (switch_has_arg = switches.any? { |s| s =~ /[ =]/ })
           switches.map! { |s| s[0, s.index('=') || s.index(' ') || s.length] }
         end
 
         past_switch, arg_removed = false, false
         args.delete_if do |arg|
           if switches.any? { |s| arg[0, s.length] == s }
-            arg_removed = !switchHasArg
+            arg_removed = !switch_has_arg
             past_switch = true
           elsif past_switch && !arg_removed && arg !~ /^-/
             arg_removed = true
@@ -341,14 +349,13 @@ module Commander
         end
       end
     end
-            
+
     ##
     # Parse global command options.
-    
-    def parse_global_options
 
+    def parse_global_options
       parser = options.inject(OptionParser.new) do |options, option|
-        options.on *option[:args], &global_option_proc(option[:switches], &option[:proc])
+        options.on(*option[:args], &global_option_proc(option[:switches], &option[:proc]))
       end
 
       options = @args.dup
@@ -360,44 +367,44 @@ module Commander
         retry
       end
     end
-    
+
     ##
     # Returns a proc allowing for commands to inherit global options.
     # This functionality works whether a block is present for the global
     # option or not, so simple switches such as --verbose can be used
     # without a block, and used throughout all commands.
-    
-    def global_option_proc switches, &block
+
+    def global_option_proc(switches, &block)
       lambda do |value|
         unless active_command.nil?
           active_command.proxy_options << [Runner.switch_to_sym(switches.last), value]
         end
-        yield value if block and !value.nil?
+        yield value if block && !value.nil?
       end
     end
-    
+
     ##
     # Raises a CommandError when the program any of the _keys_ are not present, or empty.
-        
-    def require_program *keys
+
+    def require_program(*keys)
       keys.each do |key|
-        raise CommandError, "program #{key} required" if program(key).nil? or program(key).empty?
+        fail CommandError, "program #{key} required" if program(key).nil? || program(key).empty?
       end
     end
-    
+
     ##
     # Return switches and description separated from the _args_ passed.
 
-    def self.separate_switches_from_description *args
-      switches = args.find_all { |arg| arg.to_s =~ /^-/ } 
-      description = args.last unless !args.last.is_a? String or args.last.match(/^-/)
-      return switches, description
+    def self.separate_switches_from_description(*args)
+      switches = args.find_all { |arg| arg.to_s =~ /^-/ }
+      description = args.last if args.last.is_a?(String) && !args.last.match(/^-/)
+      [switches, description]
     end
-    
+
     ##
     # Attempts to generate a method name symbol from +switch+.
     # For example:
-    # 
+    #
     #   -h                 # => :h
     #   --trace            # => :trace
     #   --some-switch      # => :some_switch
@@ -405,26 +412,25 @@ module Commander
     #   --file FILE        # => :file
     #   --list of,things   # => :list
     #
-    
-    def self.switch_to_sym switch
+
+    def self.switch_to_sym(switch)
       switch.scan(/[\-\]](\w+)/).join('_').to_sym rescue nil
     end
-    
+
     ##
     # Run the active command.
-    
+
     def run_active_command
       require_valid_command
       if alias? command_name_from_args
-        active_command.run *(@aliases[command_name_from_args.to_s] + args_without_command_name)
+        active_command.run(*(@aliases[command_name_from_args.to_s] + args_without_command_name))
       else
-        active_command.run *args_without_command_name
-      end      
-    end
-     
-    def say *args #:nodoc: 
-      $terminal.say *args
+        active_command.run(*args_without_command_name)
+      end
     end
 
+    def say(*args) #:nodoc:
+      $terminal.say(*args)
+    end
   end
 end

data/lib/commander/user_interaction.rb

@@ -53,7 +53,7 @@ module Commander
     #
 
     def log(action, *args)
-      say '%15s  %s' % [action, args.join(' ')]
+      say format('%15s  %s', action, args.join(' '))
     end
 
     ##
@@ -165,18 +165,24 @@ module Commander
 
     def converse(prompt, responses = {})
       i, commands = 0, responses.map { |_key, value| value.inspect }.join(',')
-      statement = responses.inject '' do |statement, (key, value)|
-        statement << (((i += 1) == 1 ?
-          %(if response is "#{value}" then\n) : %(else if response is "#{value}" then\n))) <<
-          %(do shell script "echo '#{key}'"\n)
+      statement = responses.inject '' do |inner_statement, (key, value)|
+        inner_statement <<
+        (
+          (i += 1) == 1 ?
+          %(if response is "#{value}" then\n) :
+          %(else if response is "#{value}" then\n)
+        ) <<
+        %(do shell script "echo '#{key}'"\n)
       end
-      applescript(%(
+      applescript(
+        %(
         tell application "SpeechRecognitionServer"
           set response to listen for {#{commands}} with prompt "#{prompt}"
           #{statement}
           end if
         end tell
-      )).strip.to_sym
+        ),
+      ).strip.to_sym
     end
 
     ##
@@ -214,10 +220,9 @@ module Commander
     def io(input = nil, output = nil, &block)
       $stdin = File.new(input) if input
       $stdout = File.new(output, 'r+') if output
-      if block
-        yield
-        reset_io
-      end
+      return unless block
+      yield
+      reset_io
     end
 
     ##
@@ -279,7 +284,8 @@ module Commander
 
       if Kernel.fork
         $stdin.reopen read
-        write.close; read.close
+        write.close
+        read.close
         Kernel.select [$stdin]
         ENV['LESS'] = 'FSRX' unless ENV.key? 'LESS'
         pager = ENV['PAGER'] || 'less'
@@ -288,7 +294,8 @@ module Commander
         # subprocess
         $stdout.reopen write
         $stderr.reopen write if $stderr.tty?
-        write.close; read.close
+        write.close
+        read.close
       end
     rescue NotImplementedError
     ensure
@@ -318,15 +325,17 @@ module Commander
 
     module AskForClass
       # All special cases in HighLine::Question#convert, except those that implement #parse
-      ([Float, Integer, String, Symbol, Regexp, Array, File, Pathname] +
-      # All Classes that respond to #parse
-      Object.constants.map do |const|
-        # const_get(:Config) issues a deprecation warning on ruby 1.8.7
-        # TODO: clean up now that we're not supporting Ruby 1.8
-        Object.const_get(const) unless const == :Config
-      end.select do |const|
-        const.class == Class && const.respond_to?(:parse)
-      end).each do |klass|
+      (
+        [Float, Integer, String, Symbol, Regexp, Array, File, Pathname] +
+        # All Classes that respond to #parse
+        Object.constants.map do |const|
+          # const_get(:Config) issues a deprecation warning on ruby 1.8.7
+          # TODO: clean up now that we're not supporting Ruby 1.8
+          Object.const_get(const) unless const == :Config
+        end.select do |const|
+          const.class == Class && const.respond_to?(:parse)
+        end
+      ).each do |klass|
         define_method "ask_for_#{klass.to_s.downcase}" do |prompt|
           $terminal.ask(prompt, klass)
         end
@@ -337,8 +346,8 @@ module Commander
     # Substitute _hash_'s keys with their associated values in _str_.
 
     def replace_tokens(str, hash) #:nodoc:
-      hash.inject str do |str, (key, value)|
-        str.gsub ":#{key}", value.to_s
+      hash.inject(str) do |string, (key, value)|
+        string.gsub ":#{key}", value.to_s
       end
     end
 
@@ -465,8 +474,8 @@ module Commander
           step: @step,
           steps_remaining: steps_remaining,
           total_steps: @total_steps,
-          time_elapsed: '%0.2fs' % time_elapsed,
-          time_remaining: @step > 0 ? '%0.2fs' % time_remaining : ''
+          time_elapsed: format('%0.2fs', time_elapsed),
+          time_remaining: @step > 0 ? format('%0.2fs', time_remaining) : '',
         }.merge! @tokens
       end
 
@@ -474,13 +483,12 @@ module Commander
       # Output the progress bar.
 
       def show
-        unless finished?
-          erase_line
-          if completed?
-            $terminal.say UI.replace_tokens(@complete_message, generate_tokens) if @complete_message.is_a? String
-          else
-            $terminal.say UI.replace_tokens(@format, generate_tokens) << ' '
-          end
+        return if finished?
+        erase_line
+        if completed?
+          $terminal.say UI.replace_tokens(@complete_message, generate_tokens) if @complete_message.is_a? String
+        else
+          $terminal.say UI.replace_tokens(@format, generate_tokens) << ' '
         end
       end
 

data/lib/commander/version.rb

@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '4.3.0'
+  VERSION = '4.3.1'
 end

data/lib/commander.rb

@@ -30,5 +30,6 @@ require 'commander/runner'
 require 'commander/command'
 require 'commander/help_formatters'
 require 'commander/platform'
+require 'commander/delegates'
 require 'commander/methods'
 require 'commander/configure'

data/spec/core_ext/object_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Object do
   describe '#get_binding' do
     it 'should return the objects binding' do
-      expect(lambda {}.get_binding).to be_instance_of(Binding)
+      expect(-> {}.get_binding).to be_instance_of(Binding)
     end
   end
 

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ def create_test_command
     c.example 'description 2', 'command 2'
     c.option '-v', '--verbose', 'verbose description'
     c.when_called do |args, _options|
-      'test %s' % args.join
+      format('test %s', args.join)
     end
   end
   @command = command :test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.11
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.11
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The complete solution for Ruby command-line executables