rack-app 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61fb1f8227a3ca529ee22caefa0d7bc8e5b46993
-  data.tar.gz: 3c7bdc49faff05050c558f98d22919cf14f1ae22
+  metadata.gz: cc5f8fe7cb10a7526f5ffaa5d554ee86ec85dd49
+  data.tar.gz: 0fff8341fba579752f6c05720b2355564b19e1c1
 SHA512:
-  metadata.gz: f081f2de5494f5b2730a85722bc4eeeb2df25dbd16cae9d9ce01842ed5c085877dfd1b258e68898bf452999c212ea80630f25f75adf34647dc7321e7b9bc0944
-  data.tar.gz: 28684ea25e3c2a78370ebd696622a340a7d0dbb6303f2d051103ea8aa3f1f94f0325c6e8c8c35c2c448fbb055b2a6009aff2a36e8a22359e34c25ebabcef7767
+  metadata.gz: 115d44b4a0faa00d8bf099e2224ee2f6af5d133157b331d24b297b0f7c75bd22126765bb0a1c7a491175187df08ecca6504f0f5d259dc22efa693212af760c12
+  data.tar.gz: 7920c391d960faee68d9e28ab6fb4784561880a9e8201c97e5d0819ff7fd0e85cfc2921f5e3e0e72b079692b901e113ff24f9d62a1d94a041ae08e3ac9ba23fc

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.2.0

data/lib/rack/app/cli.rb

@@ -42,7 +42,7 @@ class Rack::App::CLI
   def command(name, &block)
     command_prototype = Class.new(Rack::App::CLI::Command)
     command_prototype.class_exec(&block)
-    commands[name.to_s.to_sym]= command_prototype.new(name.to_s.to_sym)
+    commands[name.to_s.to_sym]= command_prototype.new
   end
 
 end

data/lib/rack/app/cli/command.rb

@@ -1,10 +1,11 @@
 class Rack::App::CLI::Command
 
   require 'optparse'
+  require 'rack/app/cli/command/configurator'
 
   class << self
 
-    def optparse_options
+    def option_definitions
       @options_parser_options ||= []
     end
 
@@ -16,7 +17,7 @@ class Rack::App::CLI::Command
     alias desc description
 
     def option(*args, &block)
-      optparse_options << {:args => args, :block => block}
+      option_definitions << {:args => args, :block => block}
     end
 
     alias on option
@@ -27,67 +28,17 @@ class Rack::App::CLI::Command
 
   end
 
-  attr_reader :name
-
-  def initialize(name)
-    @name = name.to_s
-    @option_parser = OptionParser.new
-    attach_definitions!
-    update_banner!
-  end
-
-  def help_message
-    @option_parser.help
+  def options
+    @options ||= {}
   end
 
-  def description
-    self.class.description
+  def action(*argv)
   end
 
   def start(argv)
-    @option_parser.parse!(argv)
     action(*argv)
   rescue ArgumentError => ex
     $stderr.puts(ex.message)
   end
 
-  def action(*argv)
-  end
-
-  protected
-
-  def attach_definitions!
-    self.class.optparse_options.each do |h|
-      @option_parser.on(*h[:args]) do |*args|
-        instance_exec(*args,&h[:block])
-      end
-    end
-  end
-
-  def update_banner!
-
-    banner = @option_parser.banner
-    banner.sub!('[options]', "#{@name} [options]")
-
-    # [[:req, :a], [:opt, :b], [:rest, :c], [:keyreq, :d], [:keyrest, :e]]
-    (method(:action).parameters rescue []).each do |type, keyword|
-      case type
-        when :req
-          banner.concat(" <#{keyword}>")
-
-        when :opt
-          banner.concat(" [<#{keyword}>]")
-
-        when :rest, :keyrest
-          banner.concat(" [<#{keyword}> <#{keyword}> ...]")
-
-      end
-    end
-
-    banner.concat("\n\n")
-    banner.concat(description)
-    banner.concat("\n\n")
-
-  end
-
 end

data/lib/rack/app/cli/command/configurator.rb

@@ -0,0 +1,47 @@
+module Rack::App::CLI::Command::Configurator
+
+  extend self
+
+  def configure(command, name, options_parser)
+
+    attach_definitions(command, options_parser, command.class.option_definitions)
+    update_banner(command, name, options_parser.banner)
+
+  end
+
+  protected
+
+  def attach_definitions(command, optparse, option_definitions)
+    option_definitions.each do |h|
+      optparse.on(*h[:args]) do |*args|
+        command.instance_exec(*args, &h[:block])
+      end
+    end
+  end
+
+  def update_banner(command, name, banner)
+
+    banner.sub!('[options]', "#{name} [options]")
+
+    # [[:req, :a], [:opt, :b], [:rest, :c], [:keyreq, :d], [:keyrest, :e]]
+    (command.method(:action).parameters rescue []).each do |type, keyword|
+      case type
+        when :req
+          banner.concat(" <#{keyword}>")
+
+        when :opt
+          banner.concat(" [<#{keyword}>]")
+
+        when :rest, :keyrest
+          banner.concat(" [<#{keyword}> <#{keyword}> ...]")
+
+      end
+    end
+
+    banner.concat("\n\n")
+    banner.concat(command.class.description)
+    banner.concat("\n\n")
+
+  end
+
+end

data/lib/rack/app/cli/default_commands/list_commands.rb

@@ -12,10 +12,10 @@ module Rack::App::CLI::DefaultCommands::ListCommands
 
     puts_collection << [list_command_name.to_s.rjust(rjust), 'list all available command'].join('  ')
     known_commands.sort_by { |name, _| name.to_s }.each do |name, command|
-      puts_collection << [name.to_s.rjust(rjust), command.description].join('  ')
+      puts_collection << [name.to_s.rjust(rjust), command.class.description].join('  ')
     end
 
-    puts_collection
+    puts_collection.join("\n")
   end
 
   protected

data/lib/rack/app/cli/runner.rb

@@ -1,5 +1,7 @@
 class Rack::App::CLI::Runner
 
+  CommandNotFound = Class.new(StandardError)
+
   def initialize(app)
     @cli = app.respond_to?(:cli) ? app.cli : Rack::App::CLI.new
   end
@@ -18,29 +20,46 @@ class Rack::App::CLI::Runner
   def show_help_message(argv)
     command_name = argv.shift
     command = command_for(command_name)
-    command ? $stdout.puts(command.help_message) : show_commands
+    options_parser = configure_command(command,command_name)
+
+    $stdout.puts(options_parser.help)
+  rescue CommandNotFound
+    show_commands
   end
 
   def start_command_for(command_name, argv)
     case command_name.to_s
 
       when 'commands'
-        show_commands
+        return show_commands
 
       when 'help'
-        show_help_message(argv)
+        return show_help_message(argv)
+
+      else
+        command = command_for(command_name)
+        return run_command(argv, command, command_name)
 
     end
+  end
 
-    command = command_for(command_name)
+  def run_command(argv, command, command_name)
+    return if command.nil?
+
+    option_parser = configure_command(command, command_name)
+    option_parser.parse!(argv)
+    command.start(argv)
 
-    command && command.start(argv)
   end
 
-  def command_for(name)
-    return if name.nil?
+  def configure_command(command, command_name)
+    option_parser = OptionParser.new
+    Rack::App::CLI::Command::Configurator.configure(command, command_name, option_parser)
+    return option_parser
+  end
 
-    commands[name.to_s.to_sym]
+  def command_for(name)
+    commands[(name || raise(CommandNotFound)).to_s.to_sym] || raise(CommandNotFound)
   end
 
   def commands

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -92,6 +92,7 @@ files:
 - lib/rack/app.rb
 - lib/rack/app/cli.rb
 - lib/rack/app/cli/command.rb
+- lib/rack/app/cli/command/configurator.rb
 - lib/rack/app/cli/default_commands.rb
 - lib/rack/app/cli/default_commands/list_commands.rb
 - lib/rack/app/cli/runner.rb