console_runner 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d8e37c222218501547763179826453d99b5208
-  data.tar.gz: 2cdc022889b7ce2bfa05ed217b4fa77a333ec5a4
+  metadata.gz: b185a9456da7ae30b9968451c2c4e83f2ede4072
+  data.tar.gz: e3cf2221df5e63c8908ff1ca84870a3ffa0a23d0
 SHA512:
-  metadata.gz: 581eca4768176a9458c70cde0e670b187cb0462215ef7d94cf9165f88efc7bac233a5d87e8a1b1c8b922d5d67acd1e389c8d9185c440392dfc35567ebae90044
-  data.tar.gz: 6127da22aeeb5bf37d8b0a65e697d5b82325e7be977683274f9c927aede4198fc18177256ecb41e95642b228d5a24912eeb447cdcd5e7abf1d0fcab328f2a6df
+  metadata.gz: 77c2ade30c51ab89a515ca54151ae4d84b7e20e3f7ce85a5a92664c68ceb0e5f03ea8ad3e3cde51051f0925642725b49dd548984edd698b4164db4cb3195f77f
+  data.tar.gz: 133b07c51e0a3bc846725a45ed4b8ba09d40b62656f6c96b9474dcae9161dbbd3d06e7cce1a4412794c74a1af77f2f08ba0cfc72881a412c305e0bd3e4b06e3a

data/lib/command_line_parser.rb

@@ -17,12 +17,11 @@ class CommandLineParser
       ]
     end.to_h
     @parser            = Trollop::Parser.new
-    @banner            = generate_banner
     @parser.stop_on @sub_commands
     @init_method = nil
   end
 
-  def generate_banner
+  def tool_banner
     result = FileParser.select_runnable_tags(@file_parser.clazz).map(&:text).join("\n")
     result += "\n\n\tAvailable actions:\n"
     result += @sub_commands_text.map do |c, text|
@@ -30,31 +29,37 @@ class CommandLineParser
       t += "\n\t\t\t#{text}" if text != ''
       t
     end.join("\n")
-    @parser.banner(result)
     result
   end
 
-  def raise_help
-    if %w(-h --help).include?(ARGV[0].to_s.strip)
-      Trollop::with_standard_exception_handling(@parser) { raise Trollop::HelpNeeded }
+  def maybe_help(banner, action_name = nil)
+    action = action_name
+    scope = ARGV
+    if action_name
+      action_index = ARGV.index(action)
+      scope = ARGV[0..action_index] if action_index
     end
-    return if @sub_commands.include?(ARGV[0].to_s.strip)
-    raise ConsoleRunnerError, "You must provide one of available actions: #{@sub_commands.join ', '}"
+    return unless scope.any?{|a| %w(-h --help).include? a }
+    @parser.banner(banner)
+    Trollop::with_standard_exception_handling(@parser) { raise Trollop::HelpNeeded }
+  end
+
+  def raise_on_action_absence(sub_commands)
+    return if ARGV.any? {|a| sub_commands.include? a }
+    raise ConsoleRunnerError, "You must provide one of available actions: #{sub_commands.join ', '}"
   end
 
   def run(action)
-    raise_help
+    maybe_help(tool_banner, action ? action.name.to_s : nil )
+    raise ConsoleRunnerError, 'Cannot find any @runnable action' unless action
+    raise_on_action_absence @sub_commands
     @init_method ||= MethodParser.new(@file_parser.initialize_method) if @file_parser.initialize_method
     @method      = MethodParser.new action
     [@init_method, @method].each do |method|
       next unless method
       method.trollop_opts.each { |a| @parser.opt(*a) }
-      cmd_opts        = Trollop::with_standard_exception_handling @parser do
-        unless method.parameters.count.zero?
-          raise Trollop::HelpNeeded if ARGV.empty?
-        end
-        @parser.parse ARGV
-      end
+      maybe_help(method.text, action.name.to_s)
+      cmd_opts        = @parser.parse ARGV
       given_attrs     = cmd_opts.keys.select { |k| k.to_s.include? '_given' }.map { |k| k.to_s.gsub('_given', '').to_sym }
       method.cmd_opts = cmd_opts.select { |k, _| given_attrs.include? k }
       method.default_values.each do |k, v|

data/lib/console_runner/version.rb

@@ -1,3 +1,3 @@
 module ConsoleRunner
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 end

data/lib/method_parser.rb

@@ -2,6 +2,7 @@
 class MethodParser
   attr_reader :method,
               :name,
+              :text,
               :parameters,
               :param_tags, # All method parameters tags
               :option_tags, # Only options tags
@@ -28,6 +29,7 @@ class MethodParser
   def initialize(method)
     @method              = method
     @name                = @method.name
+    @text                = FileParser.select_runnable_tags(@method).map(&:text).join("\n")
     @parameters          = @method.parameters
     @default_values      = default_params
     @param_tags          = FileParser.select_param_tags @method
@@ -83,8 +85,8 @@ Use different names to `console_runner` be able to run #{@name} method."
   end
 
   def params_array
-    options_groups  = {}
-    get_params      = {}
+    options_groups = {}
+    get_params     = {}
     @parameters.map(&:first).map.with_index { |p, i| [i, p] }.to_h.each do |index, name|
       if options_group?(name)
         options_groups[index] = name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Yury Karpovich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler