iron_worker_ng 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59da82eb0637e70837821b0715b57464e24156da
-  data.tar.gz: a5345d5d83298f25f4eb07aa47c2bf44caeead3b
+  metadata.gz: 926d0370ba51c657f97880fefff8dfa4e5cf534d
+  data.tar.gz: 0a9bee202b4f8c257886a51132dc4b686f6957e9
 SHA512:
-  metadata.gz: 9ca8030f796916f3568918c3b7aaa53ebda7f85de1337b87f660d6552f92f8510e9a1cd131a605cb4d21719790c2f9def81c0255ab298d80439af7e3d4a69e52
-  data.tar.gz: e0553b7adeb508000ef91afec3ac76ed6bceb103f2dbb56fcba75215a9fd5fb954a8603ff9593c48d1766fe2a402925e22309132955b8ecb5aa869f75ea62e05
+  metadata.gz: a7e81b46f66159b0e173f9b8800e912a6405ceb21d85bbda6cd81b87fc4bf7811d09d3219fd60848180251aa73a2f985cd48fa3cf1bf0165ec964795cd83373a
+  data.tar.gz: 4b35454235b55836e553d14f3c72fe3740b0d0304bbfe7939d2446e878804e55387ca3876ecd72231d2eab7f10201b342f7c71ad3aa778156d7c749b4eab3c53

data/bin/iron_worker

@@ -8,7 +8,7 @@ require 'iron_worker_ng/cli'
 
 class IronWorkerCLILoggerFormatter < ::Logger::Formatter
   def call(severity, time, proname, msg)
-    msg = IronWorkerNG::CLI::LOG_ENTRY + msg unless msg.start_with?(IronWorkerNG::CLI::LOG_GROUP)
+    msg = IronWorkerNG::CLI::LOG_ENTRY + msg unless msg[0, IronWorkerNG::CLI::LOG_GROUP.length] == IronWorkerNG::CLI::LOG_GROUP
 
     msg + "\n"
   end

data/lib/iron_worker_ng/api_client.rb

@@ -76,9 +76,9 @@ module IronWorkerNG
       parse_response(post("projects/#{@project_id}/tasks/#{id}/cancel"))
     end
 
-    def tasks_cancel_all(code_id)
+    def tasks_cancel_all(id)
       check_id(id)
-      parse_response(post("projects/#{@project_id}/codes/#{code_id}/cancel_all"))
+      parse_response(post("projects/#{@project_id}/codes/#{id}/cancel_all"))
     end
 
     def tasks_log(id)

data/lib/iron_worker_ng/code/base.rb

@@ -8,6 +8,7 @@ require 'iron_worker_ng/feature/common/merge_exec'
 require 'iron_worker_ng/feature/common/merge_file'
 require 'iron_worker_ng/feature/common/merge_dir'
 require 'iron_worker_ng/feature/common/merge_deb'
+require 'iron_worker_ng/feature/common/set_env'
 
 module IronWorkerNG
   module Code
@@ -27,6 +28,7 @@ module IronWorkerNG
       include IronWorkerNG::Feature::Common::MergeFile::InstanceMethods
       include IronWorkerNG::Feature::Common::MergeDir::InstanceMethods
       include IronWorkerNG::Feature::Common::MergeDeb::InstanceMethods
+      include IronWorkerNG::Feature::Common::SetEnv::InstanceMethods
 
       def initialize(*args, &block)
         @features = []
@@ -230,6 +232,8 @@ export LD_LIBRARY_PATH
 PATH=.:./bin:./__debs__/usr/bin:./__debs__/bin:$PATH
 export PATH
 
+#{container.runner_additions}
+
 #{runtime_run_code(local)}
 RUNNER
           end

data/lib/iron_worker_ng/code/container/base.rb

@@ -6,9 +6,11 @@ module IronWorkerNG
     module Container
       class Base
         attr_reader :name
+        attr_reader :runner_additions
 
         def initialize
           @name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'container')
+          @runner_additions = ''
         end
 
         def clear_dest(dest)
@@ -28,6 +30,10 @@ module IronWorkerNG
 
         def close
         end
+
+        def runner_add(runner_code)
+          @runner_additions << runner_code << "\n"
+        end
       end
     end
   end

data/lib/iron_worker_ng/code/php.rb

@@ -4,7 +4,7 @@ module IronWorkerNG
   module Code
     class PHP < IronWorkerNG::Code::Base
       def initialize(*args, &block)
-        runtime(:python)
+        runtime(:php)
 
         super(*args, &block)
       end

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

@@ -4,6 +4,38 @@ module IronWorkerNG
       module Node
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
+        def runtime_bundle(container, local = false)
+          container.get_output_stream(@dest_dir + 'node_modules/node_helper.js') do |runner|
+            runner.write <<NODE_RUNNER
+/* #{IronWorkerNG.full_version} */
+
+var fs = require('fs');
+var params = null;
+var task_id = null;
+var config = null;
+
+process.argv.forEach(function(val, index, array) {
+  if (val == "-payload") {
+    params = JSON.parse(fs.readFileSync(process.argv[index + 1], 'utf8'));
+  }
+
+  if (val == "-config") {
+    config = JSON.parse(fs.readFileSync(process.argv[index + 1], 'utf8'));
+  }
+
+  if (val == "-id") {
+    task_id = process.argv[index + 1];
+  }
+});
+
+exports.params = params;
+exports.config = config;
+exports.task_id = task_id;
+
+NODE_RUNNER
+          end
+        end
+
         def runtime_run_code(local = false)
           <<RUN_CODE
 node #{File.basename(@exec.path)} "$@"

data/lib/iron_worker_ng/feature/common/set_env.rb

@@ -0,0 +1,39 @@
+module IronWorkerNG
+  module Feature
+    module Common
+      module SetEnv
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :key
+          attr_reader :value
+
+          def initialize(code, key, value)
+            super(code)
+
+            @key = key
+            @value = value
+          end
+
+          def bundle(container)
+            container.runner_add "export #{@key}=\"#{@value.to_s.gsub('"','\\"')}\""
+          end
+
+          def build_command
+            if @code.remote_build_command || @code.full_remote_build
+              "set_env \"#{@key}\", \"#{@value.to_s.gsub('"','\\"')}\""
+            else
+              nil
+            end
+          end
+        end
+
+        module InstanceMethods
+          def set_env(key, value)
+            IronCore::Logger.info 'IronWorkerNG', "Setting ENV variable with name='#{key}' and value='#{@value}'"
+
+            @features << IronWorkerNG::Feature::Common::SetEnv::Feature.new(self, key, value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/feature/python/merge_pip.rb

@@ -41,7 +41,7 @@ module IronWorkerNG
 
             ::Dir.mkdir(pips_dir_name)
 
-            deps_string = @deps.map { |dep| dep.version == '' ? dep.name : dep.name + dep.version }.join(' ')
+            deps_string = @deps.map { |dep| dep.name + dep.version.to_s.sub(/\A\d/, '==\0') }.join(' ')
             install_command = pip_binary + ' install -U -I --user --root ' + pips_dir_name + ' ' + deps_string
 
             fork do

data/lib/iron_worker_ng/version.rb

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

data/lib/iron_worker_ng.rb

@@ -4,6 +4,20 @@ rescue LoadError
   raise "Please install json gem"
 end
 
+if (not ''.respond_to?(:start_with?)) or (not ''.respond_to?(:end_with?))
+  class ::String
+    def start_with?(prefix)
+      prefix = prefix.to_s
+      self[0, prefix.length] == prefix
+    end
+
+    def end_with?(suffix)
+      suffix = suffix.to_s
+      self[-suffix.length, suffix.length] == suffix
+    end
+  end
+end
+
 require 'iron_worker_ng/version'
 require 'iron_worker_ng/compat'
 require 'iron_worker_ng/fetcher'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +209,7 @@ files:
 - lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
+- lib/iron_worker_ng/feature/common/set_env.rb
 - lib/iron_worker_ng/feature/common/merge_file.rb
 - lib/iron_worker_ng/feature/common/merge_deb.rb
 - lib/iron_worker_ng/feature/common/merge_dir.rb
@@ -238,9 +239,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: New generation ruby client for IronWorker
 test_files: []
-has_rdoc: