iron_worker_ng 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98b0e00e293fcd4830606d9df08dcade43b6aa11
-  data.tar.gz: c815b1f91b12f0a065e8e258a995891f2f414627
+  metadata.gz: 70aa324ca6fd1f4fe49bcfe3294d37b6302926b3
+  data.tar.gz: 62d5a435dca86736b109a4282eb98f8476a86ee6
 SHA512:
-  metadata.gz: 242738189db79e8bc2219df6cec277751e985bc7ce6bafabf234feb48cf215ec9d83b343af17694a53f75d54c2add90fca1b3a97c434b995a6f4c8d157fc5218
-  data.tar.gz: 51d840ba457f9dfb0f7b8dec34b9c092cb9b5b288fff1ebf82a0115d61e128967750205eae555215b5acfd3f52577b86be7828d0df190aaef6ddc8ac5d1c8d94
+  metadata.gz: 9efaa8366ddd501b743cb36f64518d038daa6c50be43d70ff0e75a323def3dde72663d2959ba306940d1aef20fed60d08d086076d995beed6afb9676b92c10b0
+  data.tar.gz: 1d5cd976a688c710f624c8b542a697fc806da3d1bd0fabe18b7e3e3cf34efd77cc0e898f66fb2c195712d9ba733c9a67ad5efb025af938b6d3c8594792cb0982

data/README.md

@@ -662,3 +662,11 @@ Cancel the scheduled task specified by `schedule_id`.
 ```ruby
 client.schedules.cancel('1234567890')
 ```
+
+### patch your worker using cli
+
+If you have an uploaded worker named `super_code` with files `qux.rb, bar.rb, etc.` and want to replace the content of `bar.rb` with a local file `foo.rb`, `qux.rb` with `baz.rb` just run a command:
+
+    iron_worker patch super_code -p 'foo.rb=bar.rb,baz.rb=lib/qux.rb.rb,foo.rb,foo2.rb'
+
+No need to pass the same two file names `foo.rb=foo.rb`, only one `foo.rb` would be enough. Normally the patched version is put in place of the originals.

data/bin/iron_worker

@@ -34,6 +34,10 @@ def common_opts(opts)
   opts.on('--token TOKEN', 'token') do |v|
     @cli.token = v
   end
+
+  opts.on('--http-proxy HTTP_PROXY', 'http proxy') do |v|
+    @cli.http_proxy = v
+  end
 end
 
 if $*.size == 1 && ($*[0] == '-v' || $*[0] == '--version')
@@ -125,8 +129,8 @@ elsif command == 'patch'
   opts = OptionParser.new do |opts|
     opts.banner = "usage: iron_worker patch CODE_PACKAGE_NAME [OPTIONS]"
 
-    opts.on('-p', '--patch PATCH', 'patch file') do |v|
-      options[:patch] = v
+    opts.on('-p', '--patch PATCH', Array, 'target and patch file names: \'foo.rb=bar.rb,baz.rb=lib/qux.rb,foo1.rb,foo2.rb\'') do |v|
+      options[:patch] = Hash[v.map{|s| s.include?('=') ? s.split('='): [s, s]}]
     end
 
     common_opts(opts)

data/lib/iron_worker_ng/api_client.rb

@@ -17,6 +17,10 @@ module IronWorkerNG
 
       super('iron', 'worker', options, default_options, [:project_id, :token, :api_version])
 
+      #puts "nhp.proxy yo #{rest.wrapper.http.proxy_uri}" if defined? Net::HTTP::Persistent
+      #puts "RestClient.proxy yo #{RestClient.proxy}" if defined? RestClient
+      #puts "InternalClient.proxy yo #{Rest::InternalClient.proxy}" if defined? Rest::InternalClient
+
       IronCore::Logger.error 'IronWorkerNG', "Token is not set", IronCore::Error if @token.nil?
 
       check_id(@project_id, 'project_id')

data/lib/iron_worker_ng/cli.rb

@@ -10,6 +10,7 @@ module IronWorkerNG
       @env = nil
       @project_id = nil
       @token = nil
+      @http_proxy = nil
     end
 
     def beta?
@@ -41,6 +42,11 @@ module IronWorkerNG
 
       @token = token
     end
+    
+    def http_proxy=(http_proxy)
+      @client = nil
+      @http_proxy = http_proxy
+    end
 
     def log(msg)
       IronCore::Logger.info 'IronWorkerNG', msg
@@ -54,7 +60,9 @@ module IronWorkerNG
       if @client.nil?
         log_group "Creating client"
 
-        @client = IronWorkerNG::Client.new(:config => @config, :env => @env, :project_id => @project_id, :token => @token)
+        @client = IronWorkerNG::Client.new(:config => @config, :env => @env, :project_id => @project_id, :token => @token,
+                                           :http_proxy => @http_proxy
+        )
 
         project = client.projects.get
 

data/lib/iron_worker_ng/client.rb

@@ -171,8 +171,8 @@ module IronWorkerNG
 
     def codes_patch(name, options = {})
       IronCore::Logger.debug 'IronWorkerNG', "Calling codes.patch with name='#{name}' and options='#{options.to_s}'"
-  
-      code = codes.list(:all => true).find { |c| c.name == name }
+
+      code = codes.list(per_page: 100).find { |c| c.name == name }
 
       if code.nil?
         IronCore::Logger.error 'IronWorkerNG', "Can't find code with name='#{name}' to patch", IronCore::Error
@@ -208,9 +208,8 @@ original_code_zip.write(original_code_data)
 original_code_zip.close
 `cd code && unzip code.zip && rm code.zip && cd ..`
 
-patch_file = Dir['patch/*'].first
-
-system("cd code && patch -fp1 <../\#{patch_file} && cd ..") || exit(1)
+patch_params = JSON.parse(params[:patch])
+patch_params.each {|k, v| system("cat patch/\#{k} > code/\#{v}")}
 
 code_container = IronWorkerNG::Code::Container::Zip.new
 
@@ -233,7 +232,8 @@ EXEC_FILE
       patcher_code.runtime = :ruby
       patcher_code.name = patcher_code_name
       patcher_code.exec(exec_file_name)
-      patcher_code.file(options[:patch], 'patch')
+      options[:patch].keys.each {|v| patcher_code.file(v, 'patch')}
+      patch_params = Hash[options[:patch].map {|k,v| [File.basename(k), v]}]
 
       patcher_container_file = patcher_code.create_container
 
@@ -242,8 +242,7 @@ EXEC_FILE
       FileUtils.rm_rf(exec_dir)
       File.unlink(patcher_container_file)
 
-      patcher_task = tasks.create(patcher_code_name, :code_id => code._id, :client_options => @api.options.to_json)
-
+      patcher_task = tasks.create(patcher_code_name, :code_id => code._id, :client_options => @api.options.to_json, patch: patch_params.to_json)
       patcher_task = tasks.wait_for(patcher_task._id)
 
       if patcher_task.status != 'complete'

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

@@ -45,7 +45,7 @@ function getArgs($assoc = true) {
   return $args;
 }
 
-function getPayload($assoc = true) {
+function getPayload($assoc = false) {
   $args = getArgs($assoc);
 
   return $args['payload'];

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 
   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.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: New generation ruby client for IronWorker