console_runner 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c79e1d20d6a2c13058ab7bfc7392db15f0fa18f
-  data.tar.gz: 4c1d9bf3a7426c484acf0278241b65e61f5281b1
+  metadata.gz: ada21ff65dc0e2c0a9b1507be918b6f106136c18
+  data.tar.gz: 9296ab89bdb38ef21b3d93224c8cc940e31a0f20
 SHA512:
-  metadata.gz: 79b5f19ec17a3948780cece0cd4498f87e20c1286acc5df491b06550b130a57fec3497d5c2708a84aec0fe05a77b70ab3480b55f533b8332fd3bd94e57700d4f
-  data.tar.gz: 9c691933f59ff3b88dd7b953e74f77343224c6798c89eec1b52235e002c3da12c0f3617ec8527afe2d07012b02cae1ee305e33f10848cb4638b7f78b44f8b338
+  metadata.gz: 0899daa95e9d73083b7880314a3fa2fb144e7efc597a19aa72a376c5a388e0c8729958d2d96b904f53d8fd9d5917be2466267c9f67a0eb9e981adb56c5103602
+  data.tar.gz: ae4e372b0dce5c371c0ee213fb69fcd1feb587fce471790af879e3a60044edd1dc9b9ec884609a004faa6ca788d60d9cf15047d3159335ec8e09d3076b2b3dca

data/lib/command_line_parser.rb

@@ -19,6 +19,7 @@ class CommandLineParser
       ]
     end.to_h
     @parser            = Trollop::Parser.new
+    @parser.opt(:debug, 'Run in debug mode.', type: :flag)
     @parser.stop_on @sub_commands
     @initialize_method = nil
   end
@@ -28,7 +29,7 @@ class CommandLineParser
   end
 
   def self.debug=(value)
-    @debug=value
+    @debug = value unless @debug
   end
 
   def tool_banner
@@ -66,7 +67,6 @@ class CommandLineParser
     raise_on_action_absence @sub_commands
     @initialize_method ||= MethodParser.new(@file_parser.initialize_method) if @file_parser.initialize_method
     @method            = MethodParser.new action
-    @parser.opt(:debug, 'Run in debug mode.', type: :flag)
     [@initialize_method, @method].each do |method|
       next unless method
       method.trollop_opts.each { |a| @parser.opt(*a) }
@@ -86,5 +86,4 @@ class CommandLineParser
     end
   end
 
-end
-
+end

data/lib/console_runner.rb

@@ -13,10 +13,12 @@ Start Time: #{start_time}".blue
 
     file_from_arg = ARGV.shift
     raise ConsoleRunnerError, 'Specify file to be executed' unless file_from_arg
-    file_path   = File.realpath file_from_arg
-    file_parser = FileParser.new(file_path)
-    cmd         = ARGV[0]
-    actions     = file_parser.runnable_methods.select { |m| m.name.to_s == cmd }
+    file_path      = File.realpath file_from_arg
+    file_parser    = FileParser.new(file_path)
+    next_arguments = ARGV.dup
+    %w(-d --debug -h --help).each { |a| next_arguments.delete a }
+    cmd     = next_arguments[0]
+    actions = file_parser.runnable_methods.select { |m| m.name.to_s == cmd }
     if actions.count > 1
       raise(
         ConsoleRunnerError,
@@ -28,18 +30,17 @@ Start Time: #{start_time}".blue
     c_line_parser = CommandLineParser.new(file_parser)
     c_line_parser.run(action)
 
-    debug_message = "#{SEPARATOR}\n"
+    debug_message = SEPARATOR
     if c_line_parser.initialize_method
-      debug_message += ":initialize method:\n"
+      debug_message += "\ninitialize method execution\n"
       debug_message += c_line_parser.initialize_method.cmd_opts.map { |k, v| "     #{k} = #{v}" }.join("\n")
     end
-    debug_message += "#{action.name} method:\n"
+    debug_message += "\n#{action.name} method execution\n"
     debug_message += c_line_parser.method.cmd_opts.map { |k, v| "     #{k} = #{v}" }.join("\n")
-    debug_message +=  "Remaining arguments: #{ARGV.inspect}" if ARGV != []
-    debug_message += SEPARATOR
+    debug_message += "\nRemaining arguments: #{ARGV.inspect}" if ARGV != []
+    debug_message += "\n#{SEPARATOR}"
     puts debug_message if CommandLineParser.debug?
 
-
     require file_path
     class_full_name = file_parser.clazz.title
     raise ConsoleRunnerError, "#{class_full_name} is not defined" unless Module.const_defined?(class_full_name)

data/lib/console_runner/version.rb

@@ -1,3 +1,3 @@
 module ConsoleRunner
-  VERSION = '0.1.20'
+  VERSION = '0.1.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Yury Karpovich