simple_args_dispatch 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12d85e49300951bdee227e616502044c0c890c6
-  data.tar.gz: e67b035a67b5ca61139c798827fd5c703ebc1de2
+  metadata.gz: dbcad084e9c183ea9115eb614b3f91e077948980
+  data.tar.gz: 19c1f415640cf74522411b9dd8725e9f91b5da64
 SHA512:
-  metadata.gz: 60cf0865993289f8989271af51b062bffdc8c1588f94f71357ee8248e3da3e84926a1de3d5fe7a5bcda4aa715cd13cd0fbb631e47116c4f7beab27af0e79769e
-  data.tar.gz: dfbf5515e77f67efd36613e0a12de7568063b10c9b72aec8a301d984807b4f7fda36451b8bb7ef2b3bcf3842e0ecd8bbadcd8465c4180816e09b10fc897e0bd2
+  metadata.gz: ae7f3b763ba04a3722453993474c06413231ca7b7d8caf6fd910006b30f2eeaeb213a46f7481810dee39dde1675755cb73443ecd4fb86765f01e2f8dc62fa98a
+  data.tar.gz: b2327fdba31d354ce9178644d33cca35bd86287a02f6686a2dad8166ba2df0b58757861aa290a033d37ea430b8923fe97f48467554ceec2e6c65528067c0ab53

data/lib/simple_args_dispatch.rb

@@ -14,7 +14,11 @@ module SimpleArgsDispatch
   #   }
   # end
 
-  def self.dispatch(app_name, args, actions, parent = nil, template_dir = '')
+  def initialize(speaker = nil)
+    @speaker = speaker
+  end
+
+  def dispatch(app_name, args, actions, parent = nil, template_dir = '')
     arg = args.shift
     actions.each do |k, v|
       if arg == k.to_s
@@ -26,13 +30,13 @@ module SimpleArgsDispatch
         return
       end
     end
-    speaker.speak_up('Unknown command/option
+    @speaker.speak_up('Unknown command/option
 
 ')
     self.show_available(app_name, actions, parent)
   end
 
-  def self.launch(app_name, action, args, parent, template_dir)
+  def launch(app_name, action, args, parent, template_dir)
     args = Hash[args.flat_map { |s| s.scan(/--?([^=\s]+)(?:=(.+))?/) }]
     template_args = parse_template_args(load_template(args['template_name'], template_dir), template_dir)
     model = Object.const_get(action[0])
@@ -49,13 +53,13 @@ module SimpleArgsDispatch
       val = eval(val) if val.is_a?(String) && val.match(/^[{\[].*[}\]]$/)
       [k, val]
     end].select { |_, v| !v.nil? }
-    speaker.speak_up("Running with arguments: " + params.map{|a, v| "#{a.to_s}='#{v.to_s}'"}.join(' ')) if $env_flags['debug'] > 0
+    @speaker.speak_up("Running with arguments: " + params.map{|a, v| "#{a.to_s}='#{v.to_s}'"}.join(' ')) if $env_flags['debug'] > 0
     params.empty? ? dameth.call : dameth.call(params)
   rescue => e
-    speaker.tell_error(e, "SimpleAgrsDispatch.launch")
+    @speaker.tell_error(e, "SimpleAgrsDispatch.launch")
   end
 
-  def self.load_template(template_name, template_dir)
+  def load_template(template_name, template_dir)
     if template_name.to_s != '' && File.exist?(template_dir + '/' + "#{template_name}.yml")
       return YAML.load_file(template_dir + '/' + "#{template_name}.yml")
     end
@@ -64,11 +68,11 @@ module SimpleArgsDispatch
     {}
   end
 
-  def self.new_line
+  def new_line
     '---------------------------------------------------------'
   end
 
-  def self.parse_template_args(template, template_dir)
+  def parse_template_args(template, template_dir)
     template.keys.each do |k|
       if k.to_s == 'load_template'
         template[k] = [template[k]] if template[k].is_a?(String)
@@ -83,15 +87,11 @@ module SimpleArgsDispatch
     template
   end
 
-  def self.show_available(app_name, available, prepend = nil, join='|', separator = new_line, extra_info = '')
-    speaker.speak_up("Usage: #{app_name} #{prepend + ' ' if prepend}#{available.map { |k, v| "#{k.to_s}#{'(optional)' if v == :opt}" }.join(join)}")
+  def show_available(app_name, available, prepend = nil, join='|', separator = new_line, extra_info = '')
+    @speaker.speak_up("Usage: #{app_name} #{prepend + ' ' if prepend}#{available.map { |k, v| "#{k.to_s}#{'(optional)' if v == :opt}" }.join(join)}")
     if extra_info.to_s != ''
-      speaker.speak_up(separator)
-      speaker.speak_up(extra_info)
+      @speaker.speak_up(separator)
+      @speaker.speak_up(extra_info)
     end
   end
-
-  def self.speaker
-    @speaker ||= SimpleSpeaker::Speaker.new
-  end
 end

data/lib/simple_args_dispatch/version.rb

@@ -1,3 +1,3 @@
 module SimpleArgsDispatch
-  VERSION = "0.2.7"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_args_dispatch
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - R
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-11 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler