iron_worker_ng 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70aa324ca6fd1f4fe49bcfe3294d37b6302926b3
-  data.tar.gz: 62d5a435dca86736b109a4282eb98f8476a86ee6
+  metadata.gz: 4dceb21b4e176225f0a5734c84418c1869057002
+  data.tar.gz: 0a4661a382515893776e9fe322966dce35348e58
 SHA512:
-  metadata.gz: 9efaa8366ddd501b743cb36f64518d038daa6c50be43d70ff0e75a323def3dde72663d2959ba306940d1aef20fed60d08d086076d995beed6afb9676b92c10b0
-  data.tar.gz: 1d5cd976a688c710f624c8b542a697fc806da3d1bd0fabe18b7e3e3cf34efd77cc0e898f66fb2c195712d9ba733c9a67ad5efb025af938b6d3c8594792cb0982
+  metadata.gz: b4f81f7d49ee9780b5309059706c289256de133322b761ff7c0cd2133fb2721881ea57fa15d6575047e803f91dbdf2c71919399da05aedc7b510d0a6d24d7ba8
+  data.tar.gz: 98cc687d4f7b4e3cc91cbcf73435bdee44cd299081672d47b87c3b8bf75772e67ddb4912fe7fc5d4cbf3838a0e2338ec1d8173c8bd256ca5e879a1b472502ffb

data/README.md

@@ -415,6 +415,24 @@ code.merge_pip 'iron_mq'
 code.merge_pip 'iron_worker', '==0.2'
 ```
 
+### merge_requirements(path)
+### requirements(path)
+
+Merge all libraries from a python standard requirements.txt.
+The requirements.txt example file after freezing may look like as follows:
+
+```txt
+Flask==0.8
+Jinja2==2.6
+Werkzeug==0.8.3
+certifi==0.0.8
+chardet==1.0.
+```
+
+```ruby
+code.merge_requirements '../requirements.txt'
+```
+
 # Upload Your Worker
 
 When you have your code package, you are ready to upload and run it on the IronWorker cloud.

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

@@ -13,6 +13,7 @@ var fs = require('fs');
 var querystring = require('querystring');
 var params = null;
 var task_id = null;
+var schedule_id = null;
 var config = null;
 
 process.argv.forEach(function(val, index, array) {
@@ -39,11 +40,16 @@ process.argv.forEach(function(val, index, array) {
   if (val == "-id") {
     task_id = process.argv[index + 1];
   }
+
+  if (val == "-schedule_id") {
+    schedule_id = process.argv[index + 1];
+  }
 });
 
 exports.params = params;
 exports.config = config;
 exports.task_id = task_id;
+exports.schedule_id = schedule_id;
 
 NODE_RUNNER
           end

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

@@ -13,13 +13,14 @@ module IronWorkerNG
 function getArgs($assoc = true) {
   global $argv;
 
-  $args = array('task_id' => null, 'dir' => null, 'payload' => array(), 'config' => null);
+  $args = array('task_id' => null, 'dir' => null, 'payload' => array(), 'config' => null, 'schedule_id' => null);
 
   foreach ($argv as $k => $v) {
     if (empty($argv[$k + 1])) continue;
 
     if ($v == '-id') $args['task_id'] = $argv[$k + 1];
     if ($v == '-d')  $args['dir']     = $argv[$k + 1];
+    if ($v == '-schedule_id') $args['schedule_id'] = $argv[$k + 1];
 
     if ($v == '-payload' && file_exists($argv[$k + 1])) {
       $args['payload'] = file_get_contents($argv[$k + 1]);

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

@@ -1,5 +1,6 @@
 require 'iron_worker_ng/feature/python/merge_pip_dependency'
 require 'iron_worker_ng/feature/python/merge_pip'
+require 'iron_worker_ng/feature/python/merge_requirements'
 
 module IronWorkerNG
   module Code
@@ -7,6 +8,7 @@ module IronWorkerNG
       module Python
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
         include IronWorkerNG::Feature::Python::MergePipDependency::InstanceMethods
+        include IronWorkerNG::Feature::Python::MergeRequirements::InstanceMethods
 
         def runtime_run_code(local, params)
           <<RUN_CODE

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

@@ -32,12 +32,14 @@ root = nil
 payload_file = nil
 config_file = nil
 task_id = nil
+schedule_id = nil
 
 0.upto($*.length - 2) do |i|
   root = $*[i + 1] if $*[i] == '-d'
   payload_file = $*[i + 1] if $*[i] == '-payload'
   config_file = $*[i + 1] if $*[i] == '-config'
   task_id = $*[i + 1] if $*[i] == '-id'
+  schedule_id = $*[i + 1] if $*[i] == '-schedule_id'
 end
 
 ENV['GEM_PATH'] = ([root + '__gems__'] + (ENV['GEM_PATH'] || '').split(':')).join(':')
@@ -49,6 +51,7 @@ require 'json'
 require 'yaml'
 
 @iron_task_id = task_id
+@iron_schedule_id = schedule_id
 
 @payload = File.read(payload_file)
 
@@ -96,6 +99,10 @@ def iron_task_id
   @iron_task_id
 end
 
+def iron_schedule_id
+  @iron_schedule_id
+end
+
 require '#{File.basename(@exec.path)}'
 
 unless #{@exec.arg(:class, 0) == nil}
@@ -114,6 +121,10 @@ unless #{@exec.arg(:class, 0) == nil}
     exec_inst.send(:iron_task_id=, iron_task_id)
   end
 
+  if exec_inst.respond_to?(:iron_schedule_id=)
+    exec_inst.send(:iron_schedule_id=, iron_schedule_id)
+  end
+
   exec_inst.run
 end
 RUBY_RUNNER

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

@@ -21,7 +21,7 @@ module IronWorkerNG
 
             ::Dir.mkdir(pip_dir_name)
 
-            p = 'pip-1.3.1'
+            p = 'pip-6.0.8'
             `cd #{pip_dir_name} && curl -O https://pypi.python.org/packages/source/p/pip/#{p}.tar.gz && tar xf #{p}.tar.gz && cd #{p} && python setup.py install --user --root #{pip_dir_name} && cd .. && rm -rf #{p} #{p}.tar.gz`
 
             pip_packages_dir = ::Dir.glob(pip_dir_name + ENV['HOME'] + '/.local/lib/python*').first
@@ -44,6 +44,7 @@ module IronWorkerNG
             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
 
+            puts install_command
             fork do
               ENV['PYTHONPATH'] = pip_packages_dir + '/site-packages:' + pip_packages_dir + '/dist-packages'
               puts `#{install_command}`

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

@@ -0,0 +1,35 @@
+module IronWorkerNG
+  module Feature
+    module Python
+      module MergeRequirements
+        module InstanceMethods
+
+          def merge_requirements(path)
+            feature = IronWorkerNG::Feature::Base.new(self)
+            IronWorkerNG::Fetcher.fetch_to_file(feature.rebase(path)) do |requirements|
+              specs = parse_requirements(requirements)
+              specs.each {|spec| merge_pip(spec[:name], spec[:version])}
+            end
+            @features << feature
+          end
+
+          alias :requirements :merge_requirements
+
+          private
+          def parse_requirements(file)
+            specs = []
+            File.readlines(file).each do |line|
+              line = line.strip
+              next if line.to_s.empty? || line.start_with?('#')
+              spec = line.split(/(==|>=|<=|<|>)/, 2)
+              version = spec[1]? spec[1]+spec[2]: ''
+              specs << {name: spec[0], version:version}
+            end
+            specs
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -216,6 +216,7 @@ files:
 - lib/iron_worker_ng/feature/java/merge_jar.rb
 - lib/iron_worker_ng/feature/python/merge_pip.rb
 - lib/iron_worker_ng/feature/python/merge_pip_dependency.rb
+- lib/iron_worker_ng/feature/python/merge_requirements.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb