iron_worker_ng 0.15.3 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a144b9e59731f576c1b8ee52493c648c02b8c5
-  data.tar.gz: 57c5f272f39ddee7f62404ea424d8b3fabd8f7f5
+  metadata.gz: cdb0ecf4cb31bca3a74ab9058eac4f192d3aaf51
+  data.tar.gz: dcdcf1d49ae382b24b4ea39db51601b7829c9071
 SHA512:
-  metadata.gz: a92229c173e9e85e6d40d2561c17f3f90e375f821886a66782b8b1357fa4542b3414be5c9bcefa5006f4eb971a63c9314e229c4075c3157b5dbbc2c997f97710
-  data.tar.gz: baf4c4cbc869c5055106f406f743983c5cdf3f2f5240dd4263d6c04b6c9d5013d9d9efe9ead886e1d0190f1bcbddf4db1b1c47d460907e4fd93dad467d780d2a
+  metadata.gz: 197caf385e658a094d013ab318196888497d24d0a5aa86252fa8928e50fd1fd922e04cd13ffffaab637f79fe0fe102cc7e62270a6ea5951d1927de2bc3fd23c5
+  data.tar.gz: 8318b65292c4c6a417e20578d9d1e4b41f8f321b42dab6f3fcd72abc6a30ccdf1bbd95b47985527315ca75a58064cffcd4eb63e1a1951521792b979de5fc8fa4

data/README.md

@@ -26,7 +26,7 @@ the following is an acceptable worker:
 
 ```ruby
 puts "Hello Worker!"
-puts "My task_id is #{@iron_worker_task_id}"
+puts "My task_id is #{@iron_task_id}"
 puts "I got '#{params}' parameters"
 ```
 
@@ -351,7 +351,7 @@ Merge a pip package with dependencies. If any pip package contains native extens
 
 ```ruby
 code.merge_pip 'iron_mq'
-code.merge_pip 'iron_worker', '0.2'
+code.merge_pip 'iron_worker', '==0.2'
 ```
 
 # Upload Your Worker

data/lib/iron_worker_ng/code/base.rb

@@ -221,10 +221,10 @@ root() {
 
 cd "$(root "$@")"
 
-LD_LIBRARY_PATH=.:./__debs__/usr/lib:./__debs__/usr/lib/x86_64-linux-gnu:./__debs__/lib:./__debs__/lib/x86_64-linux-gnu
+LD_LIBRARY_PATH=.:./lib:./__debs__/usr/lib:./__debs__/usr/lib/x86_64-linux-gnu:./__debs__/lib:./__debs__/lib/x86_64-linux-gnu
 export LD_LIBRARY_PATH
 
-PATH=.:./__debs__/usr/bin:./__debs__/bin:$PATH
+PATH=.:./bin:./__debs__/usr/bin:./__debs__/bin:$PATH
 export PATH
 
 #{runtime_run_code(local)}

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

@@ -10,7 +10,7 @@ module IronWorkerNG
 
         def runtime_run_code(local = false)
           <<RUN_CODE
-PATH=`pwd`/__pips__/bin:$PATH PYTHONPATH=`pwd`/__pips__ python -u #{File.basename(@exec.path)} "$@"
+PATH=`pwd`/__pips__/__bin__:$PATH PYTHONPATH=`pwd`/__pips__ python -u #{File.basename(@exec.path)} "$@"
 RUN_CODE
         end
       end

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

@@ -17,23 +17,42 @@ module IronWorkerNG
           def bundle(container)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling pip dependencies"
 
-            tmp_dir_name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'pips')
+            pip_dir_name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'pip')
 
-            ::Dir.mkdir(tmp_dir_name)
-            ::Dir.mkdir(tmp_dir_name + '/bin')
-            ::Dir.mkdir(tmp_dir_name + '/lib')
+            ::Dir.mkdir(pip_dir_name)
 
-            deps_string = @deps.map { |dep| dep.version == '' ? dep.name : dep.name + '==' + dep.version }.join(' ')
-            install_command = 'pip install --ignore-installed --install-option="--prefix=' + tmp_dir_name + '" ' + deps_string
+            p = 'pip-1.3.1'
+            `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 --root #{pip_dir_name} && rm -rf #{p} #{p}.tar.gz`
 
-            system(install_command)
+            local = File.exists?(pip_dir_name + '/usr/local/lib') ? 'local' : ''
 
-            packages_dir = Dir.glob(tmp_dir_name + '/lib/*python*').first + '/site-packages'
+            pip_packages_dir = Dir.glob(pip_dir_name + '/usr/' + local + '/lib/*python*').first
 
-            container_add(container, '__pips__/bin', tmp_dir_name + '/bin', true)
-            container_add(container, '__pips__', packages_dir , true)
+            deps_string = @deps.map { |dep| dep.version == '' ? dep.name : dep.name + dep.version }.join(' ')
+            install_command = pip_dir_name + '/usr/' + local + '/bin/pip install --user -U -I ' + deps_string
 
-            FileUtils.rm_rf(tmp_dir_name)
+            fork do
+              ENV['PYTHONPATH'] = pip_packages_dir + '/site_packages:' + pip_packages_dir + '/dist-packages'
+              puts `#{install_command}`
+            end
+
+            Process.wait
+
+            pips_packages_dir = Dir.glob(ENV['HOME'] + '/.local/lib/*python*').first
+
+            if File.exists?(ENV['HOME'] + '/.local/bin')
+              container_add(container, '__pips__/__bin__', ENV['HOME'] + '/.local/bin', true)
+            end
+
+            if File.exists?(pips_packages_dir + '/site-packages')
+              container_add(container, '__pips__', pips_packages_dir + '/site-packages' , true)
+            end
+
+            if File.exists?(pips_packages_dir + '/dist-packages')
+              container_add(container, '__pips__', pips_packages_dir + '/dist-packages' , true)
+            end
+
+            FileUtils.rm_rf(pip_dir_name)
           end
         end
       end

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '0.15.3'
+  VERSION = '0.16.0'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.16.0
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core