iron_worker_ng 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac318a56ff54032909607e2e0830aa394e9f429
-  data.tar.gz: 6476cd2c649e6a2793349ef459c328b9c683789d
+  metadata.gz: 21cb18e68aec2b9f25a095b90a195e4f9a7db3aa
+  data.tar.gz: 980cae983aff2f5c6ba5279bac6ce652de96a7e8
 SHA512:
-  metadata.gz: bf3df9f5bf9ba572a4b92f7bc214e94afccba715b89b40ea2f1993d28b3e9d9a965d965ffd71d633e567c73b2db1f053b18ecf83acb1295cf484de7617b2559e
-  data.tar.gz: fe4200eacdcd5381076d1eed7191702e5df77c99c9a41edeea75b3182307945d33df1ee9a70503943deec9c5fc5956bc5158f1a8cb682747b5438d910969eec8
+  metadata.gz: e85488731c141bd7ac2a9df0fd04ba121fa77d3d4c05b26f3e7c818c63fc9b51c57aabb90d85fca0a24a9e478961b3caddfd1f4aa536898271691cfd8fcb5ba5
+  data.tar.gz: 076068df20091a051c19e95cc85c4748bc6cdd11e9987b45768f0e74439b56bbd8959b420cd56242497b4a92d0e867b490c5d63d3a7d6da751bc8cc0fd94f240

data/README.md

@@ -34,7 +34,7 @@ All output to `STDOUT` will be logged and available for your review when your wo
 
 # Creating The Code Package
 
-Before you can run use IronWorker, be sure you've [created a free account with Iron.io](http://www.iron.io)
+Before you can use IronWorker, be sure you've [created a free account with Iron.io](http://www.iron.io)
 and [setup your Iron.io credentials on your system](http://dev.iron.io/worker/reference/configuration/) (either in a json
 file or using ENV variables). You only need to do that once for your machine. If you've done that, then you can continue.
 

data/bin/iron_worker

@@ -175,6 +175,10 @@ elsif command == 'queue' || command == 'schedule'
       options[:delay] = v
     end
 
+    opts.on('--cluster CLUSTER', String, 'Run task on selected cluster') do |v|
+      options[:cluster] = v
+    end
+
     if command == 'queue'
       opts.on('--wait', Integer, 'wait for task to complete and print log') do |v|
         options[:wait] = true
@@ -295,6 +299,10 @@ elsif command == 'run'
       params[:payload] = File.read(v)
     end
 
+    opts.on('--worker-config CONFIG_FILE', 'config file for worker') do |v|
+      options[:worker_config] = v
+    end
+    
     common_opts(opts)
   end
 
@@ -448,4 +456,4 @@ elsif command == 'info'
 
 elsif command == 'stacks'
   @cli.stacks_list
-end
+end

data/lib/iron_worker_ng/cli.rb

@@ -212,10 +212,14 @@ module IronWorkerNG
       code = IronWorkerNG::Code::Base.new(name)
 
       log "Code package name is '#{code.name}'"
-
       log_group "Running '#{code.name}'"
-
-      code.run(params[:payload] || params['payload'])
+      
+      if options[:worker_config]
+        log "Loading worker_config at #{options[:worker_config]}"
+        c = IO.read(options[:worker_config])
+        options[:config] = c
+      end
+      code.run(params[:payload] || params['payload'], options[:config] || options['config'])
     end
 
     def install(name, params, options)

data/lib/iron_worker_ng/code/base.rb

@@ -325,18 +325,22 @@ RUNNER
         container.name
       end
 
-      def run(params = {})
+      def run(params = {}, config = {})
         container_name = create_container(true)
 
         payload = File.open("#{container_name}/__payload__", 'wb')
         payload.write(params.is_a?(String) ? params : params.to_json)
         payload.close
 
+        config_file = File.open("#{container_name}/__config__", 'wb')
+        config_file.write(config.is_a?(String) ? config : config.to_json)
+        config_file.close
+
         if @remote_build_command
           system("cd #{container_name} && #{@remote_build_command}")
         end
 
-        system("sh #{container_name}/__runner__.sh -d #{container_name} -payload #{container_name}/__payload__ -id 0")
+        system("sh #{container_name}/__runner__.sh -d #{container_name} -payload #{container_name}/__payload__ -config #{container_name}/__config__ -id 0")
 
         FileUtils.rm_rf(container_name)
       end

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.4.2'
+  VERSION = '1.5.0'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core