console_runner 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fdcaea27d9c7a47a33276fe97eaadb5063a1bb
-  data.tar.gz: f67cf5ec2116676fce4b14a7a8b4807f0a42fb17
+  metadata.gz: 46251b514ee3ff2c6fe6d1805b58bb7bc8740ebb
+  data.tar.gz: 7781c2c0188af33e49ab7bec3e99be229bb756ac
 SHA512:
-  metadata.gz: 50ff21a11dbb5b47c459807520468000c69c2279d426444a9a2d37376cf1d5695edbb5fd04253c9de4c3c059c28786491da6cbc4666f15778f5f4e09574731a3
-  data.tar.gz: 6dc150a981b78e4ff5d572efc948e92f179223f85196ea32a9cc4b370c7521bfc9c68e3db8ff646dea3e70f14dfcc0c5524f7546947a0486127ef690ccb6f64a
+  metadata.gz: 1ca1cf2617736897556652cfa6de3c7a894349359d3ab2472f759c7a8def9a0b617e77138e48dbab8e9c77c805451b52ff4aef38fca6ffb8187b9ddc2d62c4cc
+  data.tar.gz: 64c9e1747574c79f5ee1b863a7e26ba4a2dd9f98ecd10d8f4cfbab133b02350c34354ef73b5bf451487ea69c7b0dbb875cd597a857d7dae68bb5b68a7705e1f8

data/README.md

@@ -100,8 +100,7 @@ Finish Time: 2017-04-11 21:39:40 +0300 (Duration: 0.0 minutes)
 ```
 
 ## ToDo
-- fix help menu for action: action help text should be displayed.
-- add tests for same methods naming
+- fix help menu for action: action help text should be displayed, list of available actions should be displayed
 - write good readme
 
 ## Development
@@ -114,12 +113,10 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/yuri-karpovich/console_runner.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
-
 [Gem Version]: https://rubygems.org/gems/console_runner
 [Build Status]: https://travis-ci.org/yuri-karpovich/console_runner
 [travis pull requests]: https://travis-ci.org/yuri-karpovich/console_runner/pull_requests

data/lib/cmd_parser.rb

@@ -26,9 +26,14 @@ class CmdParser
 
     if init_method
       @init_method = MethodParser.new init_method
-      same_methods = @init_method.param_tags_names & @init_method.option_tags_names
-      raise "You have the same name for @param and @option attribute(s): #{same_methods.join(', ')}.
-Use different names to `console_runner` be able to run #{@init_method.name} method." if same_methods.count > 0
+      same_params  = @init_method.param_tags_names & @init_method.option_tags_names
+      if same_params.count > 0
+        raise(
+          ConsoleRunnerError,
+          "You have the same name for @param and @option attribute(s): #{same_params.join(', ')}.
+Use different names to `console_runner` be able to run #{@init_method.name} method."
+        )
+      end
 
 
       @init_method.param_tags.each do |tag|
@@ -57,7 +62,7 @@ Use different names to `console_runner` be able to run #{@init_method.name} meth
       begin
         @parser.parse ARGV
       rescue Trollop::CommandlineError => e
-        raise "You must provide one of available actions: #{sub_commands.join ', '}" unless sub_commands.include?(ARGV[0])
+        raise ConsoleRunnerError, "You must provide one of available actions: #{sub_commands.join ', '}" unless sub_commands.include?(ARGV[0])
         raise e
       end
     end
@@ -71,10 +76,15 @@ Use different names to `console_runner` be able to run #{@init_method.name} meth
   # Parse method and configure #Trollop
   def parse_method(method)
     ARGV.shift
-    @method      = MethodParser.new method
-    same_methods = @method.param_tags_names & @method.option_tags_names
-    raise "You have the same name for @param and @option attribute(s): #{same_methods.join(', ')}.
-Use different names to `console_runner` be able to run #{@method.name} method." if same_methods.count > 0
+    @method     = MethodParser.new method
+    same_params = @method.param_tags_names & @method.option_tags_names
+    if same_params.count > 0
+      raise(
+        ConsoleRunnerError,
+        "You have the same name for @param and @option attribute(s): #{same_params.join(', ')}.
+Use different names to `console_runner` be able to run #{@method.name} method."
+      )
+    end
     method_params_tags = @method.param_tags
 
     method_params_tags.each do |tag|
@@ -113,14 +123,14 @@ Use different names to `console_runner` be able to run #{@method.name} method."
     method_params_tags.select { |t| t.tag_name == 'param' }.map(&:name).each do |required_param|
       next if @method.options_group? required_param
       unless @method.cmd_opts[required_param.to_sym]
-        raise "You must specify required parameter: #{required_param}"
+        raise ConsoleRunnerError, "You must specify required parameter: #{required_param}"
       end
     end
   end
 
   def self.parse_type(yard_type)
     result = TYPES_MAPPINGS[yard_type]
-    raise "Unsupported YARD type: #{yard_type}" unless result
+    raise ConsoleRunnerError, "Unsupported YARD type: #{yard_type}" unless result
     result
   end
 

data/lib/console_runner.rb

@@ -24,8 +24,15 @@ Runnable class should be marked with @#{FileParser::RUNNABLE_TAG} tag"
   run_method        = all_methods.find { |m| m.name == :run }
 
 
-  cmd           = ARGV[0]
-  action_method = runnable_methods.find { |m| m.name.to_s == cmd } # get sub-command
+  cmd            = ARGV[0]
+  action_methods = runnable_methods.select { |m| m.name.to_s == cmd }
+  if action_methods.count > 1
+    raise(
+      ConsoleRunnerError,
+      "Class and Instance methods have the same name (#{cmd}). Action name should be unique"
+    )
+  end
+  action_method = action_methods.first
   action_method ||= run_method
   cmd_parser    = CmdParser.new(runnable_methods, initialize_method)
   raise ConsoleRunnerError, "Cannot run! You haven't specify any method to run." unless action_method

data/lib/console_runner/version.rb

@@ -1,3 +1,3 @@
 module ConsoleRunner
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/file_parser.rb

@@ -5,12 +5,12 @@ require 'console_runner_error'
 class FileParser
   RUNNABLE_TAG = :runnable
 
+  # array of #YARD::CodeObjects
   attr_reader :all_objects
 
   # Parse file with #YARD::CLI::Stats
   #
   # @param [String] file_path path to the file to be parsed
-  # @return[Array(YARD::CodeObjects)] array of #YARD::CodeObjects classes
   def initialize(file_path)
     raise ConsoleRunnerError "Cannot find file #{file_path}" unless File.exist?(file_path)
     code = YARD::CLI::Stats.new

metadata

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