iron_worker_ng 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f33cdfa7786a81ed2fa653d22ae4b3a4a8813ffb
-  data.tar.gz: b4b791b75d8e1b99b07406d901bb69e650ccc06b
+  metadata.gz: 59da82eb0637e70837821b0715b57464e24156da
+  data.tar.gz: a5345d5d83298f25f4eb07aa47c2bf44caeead3b
 SHA512:
-  metadata.gz: 0358532e9afc52b449058660f9e398c74d4a3ee30e294d9e5ae7b5f6306e743400844ff302d46d31f07c78091686be03f32e2ba7082f155538d505d8065a7074
-  data.tar.gz: f226eaac60e617234f60c09f2022caa5f9954d1281de11f894630b79c8821f5812cc82b85b410de78aeb3225eb6cd92d4a04e3a38a030a47cdccfae3bcd5e4a7
+  metadata.gz: 9ca8030f796916f3568918c3b7aaa53ebda7f85de1337b87f660d6552f92f8510e9a1cd131a605cb4d21719790c2f9def81c0255ab298d80439af7e3d4a69e52
+  data.tar.gz: e0553b7adeb508000ef91afec3ac76ed6bceb103f2dbb56fcba75215a9fd5fb954a8603ff9593c48d1766fe2a402925e22309132955b8ecb5aa869f75ea62e05

data/lib/iron_worker_ng/cli.rb

@@ -69,7 +69,7 @@ module IronWorkerNG
 
       log_group "Creating code package"
 
-      code = IronWorkerNG::Code::Base.new(name)
+      code = IronWorkerNG::Code::Base.new(:name => name, :env => @env)
 
       code.name(params[:name]) unless params[:name].nil?
 
@@ -97,7 +97,7 @@ module IronWorkerNG
         builder_task_id = client.codes.create_async(code, options)
 
         log 'Code package is building'
-        log "Check 'https://hud.iron.io/tq/projects/#{client.api.project_id}/jobs/#{builder_task_id}' for more info"
+        log "Check 'https://hud.iron.io/tq/projects/#{client.api.project_id}/tasks/#{builder_task_id}' for more info"
       else
         code_id = client.codes.create(code, options)._id
         code_info = client.codes.get(code_id)

data/lib/iron_worker_ng/code/base.rb

@@ -17,6 +17,7 @@ module IronWorkerNG
 
       attr_accessor :base_dir
       attr_accessor :dest_dir
+      attr_accessor :env
 
       attr_accessor :use_local_iron_worker_ng
 
@@ -46,23 +47,25 @@ module IronWorkerNG
         worker_files = []
 
         if args.length == 1 && args[0].is_a?(String)
-          if args[0].end_with?('.worker')
-            @name = args[0].gsub(/\.worker$/, '')
-          else
-            @name = args[0]
-          end
+          @name = args[0]
         elsif args.length == 1 && args[0].is_a?(Hash)
           @name = args[0][:name] || args[0]['name']
 
           worker_file = args[0][:workerfile] || args[0]['workerfile']
           worker_files << worker_file unless worker_file.nil?
 
+          @env = args[0][:env] || args[0]['env']
+
           exec = args[0][:exec] || args[0]['exec'] || args[0][:worker] || args[0]['worker']
           unless exec.nil?
             merge_exec(exec)
           end
         end
 
+        if @name.is_a?(String) && @name.end_with?('.worker')
+          @name = @name.gsub(/\.worker$/, '')
+        end
+
         if @name.nil? and (not @exec.nil?)
           @name = guess_name_for_path(@exec.path)
         end

data/lib/iron_worker_ng/code/runtime/php.rb

@@ -13,7 +13,7 @@ module IronWorkerNG
 function getArgs() {
   global $argv;
 
-  $args = array('task_id' => null, 'dir' => null, 'payload' => array());
+  $args = array('task_id' => null, 'dir' => null, 'payload' => array(), 'config' => null);
 
   foreach ($argv as $k => $v) {
     if (empty($argv[$k + 1])) continue;
@@ -26,10 +26,20 @@ function getArgs() {
 
       $parsed_payload = json_decode($args['payload']);
 
-      if ($parsed_payload != NULL) {
+      if ($parsed_payload != null) {
         $args['payload'] = $parsed_payload;
       }
     }
+
+    if ($v == '-config' && file_exists($argv[$k + 1])) {
+      $args['config'] = file_get_contents($argv[$k + 1]);
+
+      $parsed_config = json_decode($args['config'], true);
+
+      if ($parsed_config != null) {
+          $args['config'] = $parsed_config;
+      }
+    }
   }
 
   return $args;
@@ -41,6 +51,12 @@ function getPayload() {
   return $args['payload'];
 }
 
+function getConfig(){
+  $args = getArgs();
+
+  return $args['config'];
+}
+
 require '#{File.basename(@exec.path)}';
 PHP_RUNNER
           end

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -43,14 +43,14 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.9.9
 - !ruby/object:Gem::Dependency