iron_worker_ng 0.13.1 → 0.14.0

data/lib/iron_worker_ng/cli.rb

@@ -190,7 +190,7 @@ module IronWorkerNG
       log_group 'Generating code package webhook'
 
       log 'You can invoke your worker by POSTing to the following URL'
-      log "#{client.api.url(client.api.project_id)}/tasks/webhook?code_name=#{name}&oauth=#{client.api.token}"
+      log client.api.url("projects/#{client.api.project_id}/tasks/webhook?code_name=#{name}&oauth=#{client.api.token}")
     end
 
     def info_code(name, params, options)

data/lib/iron_worker_ng/code/base.rb

@@ -18,6 +18,8 @@ module IronWorkerNG
       attr_accessor :base_dir
       attr_accessor :dest_dir
 
+      attr_accessor :use_local_iron_worker_ng
+
       undef exec
       undef gem
 
@@ -39,6 +41,8 @@ module IronWorkerNG
         @name = nil
         @exec = nil
 
+        @use_local_iron_worker_ng = false
+
         worker_files = []
 
         if args.length == 1 && args[0].is_a?(String)
@@ -257,6 +261,13 @@ RUNNER
             builder = IronWorkerNG::Code::Builder.new
             builder.builder_remote_build_command = @remote_build_command
 
+            builder.use_local_iron_worker_ng = @use_local_iron_worker_ng
+
+            if @use_local_iron_worker_ng
+              builder.gem('iron_worker_ng')
+              builder.fixate
+            end
+
             builder.bundle(container, local)
 
             container.get_output_stream(@name + '.worker') do |wf|

data/lib/iron_worker_ng/code/builder.rb

@@ -15,6 +15,8 @@ module IronWorkerNG
         @remote_build_command = nil
         @full_remote_build = false
 
+        @use_local_iron_worker_ng = false
+
         runtime(:ruby)
       end
 
@@ -32,6 +34,12 @@ BUILDER_SH
           end
         end
 
+        install_iron_worker_ng = ''
+
+        if not @use_local_iron_worker_ng
+          install_iron_worker_ng = "system(\"gem install iron_worker_ng -v #{IronWorkerNG::VERSION}\")"
+        end
+
         container.get_output_stream(@dest_dir + '__builder__.rb') do |builder|
           builder.write <<BUILDER_RUBY
 # #{IronWorkerNG.full_version}
@@ -42,7 +50,7 @@ File.open('.gemrc', 'w') do |gemrc|
   gemrc.puts('gem: --no-ri --no-rdoc')
 end
 
-puts `gem install iron_worker_ng -v #{IronWorkerNG::VERSION}`
+#{install_iron_worker_ng}
 
 require 'iron_worker_ng'
 

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

@@ -1,12 +1,16 @@
+require_relative '../../feature/python/merge_pip_dependency'
+require_relative '../../feature/python/merge_pip'
+
 module IronWorkerNG
   module Code
     module Runtime
       module Python
         include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Python::MergePipDependency::InstanceMethods
 
         def runtime_run_code(local = false)
           <<RUN_CODE
-python #{File.basename(@exec.path)} "$@"
+PYTHONPATH=`pwd`/__pips__ python #{File.basename(@exec.path)} "$@"
 RUN_CODE
         end
       end

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

@@ -0,0 +1,37 @@
+require 'tmpdir'
+require 'fileutils'
+
+module IronWorkerNG
+  module Feature
+    module Python
+      module MergePip
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :deps
+
+          def initialize(code, deps)
+            super(code)
+
+            @deps = deps
+          end
+
+          def bundle(container)
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling pip dependencies"
+
+            tmp_dir_name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'pips')
+
+            ::Dir.mkdir(tmp_dir_name)
+
+            deps_string = @deps.map { |dep| dep.version == '' ? dep.name : dep.name + '==' + dep.version }.join(' ')
+            install_command = 'pip install --upgrade --install-option="--install-purelib=' + tmp_dir_name + '" ' + deps_string
+
+            system(install_command)
+
+            container_add(container, '__pips__', tmp_dir_name, true)
+
+            FileUtils.rm_rf(tmp_dir_name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module IronWorkerNG
+  module Feature
+    module Python
+      module MergePipDependency
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :name
+          attr_reader :version
+
+          def initialize(code, name, version)
+            super(code)
+
+            @name = name
+            @version = version
+          end
+
+          def build_command
+            if @code.full_remote_build
+              "pip '#{@name}', '#{@version}'"
+            elsif @code.remote_build_command
+              "dir '__build__/__pips__'"
+            else
+              nil
+            end
+          end
+        end
+
+        module InstanceMethods
+          def merge_pip(name, version = '')
+            IronCore::Logger.info 'IronWorkerNG', "Adding python pip dependency with name='#{name}' and version='#{version}'"
+
+            @features << IronWorkerNG::Feature::Python::MergePipDependency::Feature.new(self, name, version)
+
+            unless @fixators.include?(:merge_pip_dependency_fixate)
+              @fixators << :merge_pip_dependency_fixate
+            end
+          end
+
+          alias :pip :merge_pip
+
+          def merge_pip_dependency_fixate
+            if not full_remote_build
+              IronCore::Logger.info 'IronWorkerNG', 'Fixating pip dependencies'
+
+              @features.reject! { |f| f.class == IronWorkerNG::Feature::Python::MergePip::Feature }
+
+              deps = @features.reject { |f| f.class != IronWorkerNG::Feature::Python::MergePipDependency::Feature }
+
+              @features << IronWorkerNG::Feature::Python::MergePip::Feature.new(self, deps)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '0.13.1'
+  VERSION = '0.14.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.13.1
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -161,6 +161,8 @@ files:
 - lib/iron_worker_ng/code/php.rb
 - lib/iron_worker_ng/code/go.rb
 - lib/iron_worker_ng/feature/base.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/java/merge_jar.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb