simple_args_dispatch 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 239191fdca3ca4a6da66788cbab985fb6daf28df
-  data.tar.gz: fd25320532cb3205e426f9a47f5e31d135edcfa7
+  metadata.gz: 5a2a7ed1501d76a59b12aff8c530bc13be9ea825
+  data.tar.gz: 5e798484d368d20effc09090ac4c3c4ccdb64703
 SHA512:
-  metadata.gz: 1e48df4c18c84d9622ce0318edc04ce0cda9c66396088f037f199583808462fcc312155933231505cdcbe2dc6c5dedd6eea3936c7971054565f36856742c3bca
-  data.tar.gz: cc6c5f20d644ee83f42708b91df0fc0bb1da5e1a1faf43d375a0a818e54db233b9a687a8490610a1864d81f60f64ada2369493a6e6b726f85a1a013ab230a1c3
+  metadata.gz: 9ab60af0dbf1ad92a955ff41b2dfa5e805fa71e01c6dbe22f0fc8fd701a34c28331fe1b471e315bdadafe5d80b18ac89b810636138c8981c753ceb48226b6bc9
+  data.tar.gz: bb771d5b565fbff293fef0d9038189556784e21fd5cefc5aa25d18d18eba80bb3b52cd743b95b408829610b4d0549dced978263a4c7b87bd9a92e641012fc0a3

data/lib/simple_args_dispatch.rb

@@ -15,8 +15,9 @@ module SimpleArgsDispatch
     #   }
     # end
 
-    def initialize(speaker = nil)
+    def initialize(speaker = nil, env_variables = [])
       @speaker = speaker
+      @env_variables = env_variables
     end
 
     def dispatch(app_name, args, actions, parent = nil, template_dir = '')
@@ -45,16 +46,16 @@ module SimpleArgsDispatch
       req_params.each do |param|
         return self.show_available(app_name, Hash[req_params.map { |k| ["--#{k[0]}=<#{k[0]}>", k[1]] }], parent, ' ') if param[1] == :keyreq && args[param[0].to_s].nil? && template_args[param[0].to_s].nil?
       end
-      $env_flags.each do |k, _|
-        Thread.current[k.to_sym] = (args[k] || template_args[k]).to_i
+      @env_variables.each do |k|
+        Thread.current[k.to_sym] = (args[k] || template_args[k]).to_i if args[k] || template_args[k]
       end
       dameth = model.method(action[1])
       params = Hash[req_params.map do |k, _|
         val = args[k.to_s] || template_args[k.to_s]
-        val = eval(val) if val.is_a?(String) && val.match(/^[{\[].*[}\]]$/)
+        val = YAML.load(val.gsub('=>', ': ')) 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 Thread.current[:debug] && Thread.current[:debug] > 0
       params.empty? ? dameth.call : dameth.call(params)
     rescue => e
       @speaker.tell_error(e, "SimpleAgrsDispatch.launch")

data/lib/simple_args_dispatch/version.rb

@@ -1,3 +1,3 @@
 module SimpleArgsDispatch
-  VERSION = "0.3.1"
+  VERSION = "0.3.4"
 end

metadata

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