mandy 0.4.995 → 0.4.996

data/VERSION

@@ -1 +1 @@
-0.4.995
+0.4.996

data/bin/mandy-hadoop

@@ -48,6 +48,13 @@ def gemfile(file)
   File.exist?(path) ? path : nil
 end
 
+def set_env(opts_string)
+  opts_string.split(' ').each do |pair|
+    key, value = pair.split("=")
+    ENV[key] = value
+  end
+end
+
 file   = ARGV[0]
 filename = File.basename(file)
 inputs  = ARGV[1].split(",")
@@ -56,8 +63,9 @@ input = inputs.map {|path| "-input \"#{path}\""}.join(" ")
 output_folder = ARGV[2]
 config = absolute_path(options.config || 'cluster.xml')
 puts "Packaging code for distribution..."
-payload = Mandy::Packer.pack(file, options.payload || ARGV[0], gemfile(options.gemfile))
+payload = Mandy::Packer.pack(file, options.payload || ARGV[0], gemfile(options.gemfile))  
 cmdenv = options.cmdenv
+set_env(cmdenv)
 
 at_exit do
   puts

data/lib/mandy/job.rb

@@ -12,8 +12,8 @@ module Mandy
       end
       
       def parameter(name)
-        return find_json_param(name) if json_provided?
-        ENV[name.to_s]
+        param = find_json_param(name) if json_provided?
+        param || ENV[name.to_s]
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mandy
 version: !ruby/object:Gem::Version 
-  version: 0.4.995
+  version: 0.4.996
 platform: ruby
 authors: 
 - Andy Kent