iron_worker 2.3.12 → 2.3.13

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 3
-:patch: 12
+:patch: 13
 :build: !!null 

data/lib/iron_worker/base.rb

@@ -119,13 +119,20 @@ module IronWorker
       # Use this to merge in other workers. These are treated differently the normal merged files because
       # they will be uploaded separately and treated as distinctly separate workers.
       #
-      # file: This is the path to the file, just like merge.
-      # class_name: eg: 'MyWorker'.
+      # @param file [String] This is the path to the file, just like merge.
+      # @param class_name [String|Class] 'MyWorker' or just MyWorker.
+      # @return [Hash]
       def merge_worker(file, class_name)
-#        puts 'merge_worker in ' + self.name
         ret = merge(file)
-        ret[:class_name] = class_name
-        #[File.expand_path(file), class_name]
+        ret[:class_name] = case class_name
+                             when String
+                               class_name.strip
+                             when Class
+                               class_name.name
+                             else
+                               IronWorker.service.logger.warn "merge_worker: only String or Class is expected as class_name"
+                               class_name # probably user does know what is he doing
+                           end
         @merged_workers[file] = ret
         ret
       end
@@ -242,11 +249,11 @@ module IronWorker
     end
 
     def is_local?
-      !is_remote?
+      IronWorker.is_local?
     end
 
     def is_remote?
-      false
+      IronWorker.is_remote?
     end
 
     # will return after job has completed or errored out.

data/lib/iron_worker/config.rb

@@ -33,7 +33,7 @@ module IronWorker
                   :skip_auto_dependencies
 
     def self.system_gems
-      ['bson_ext', 'curb', 'em-http-request', 'eventmachine', 'mysql2', 'net-scp', 'net-sftp', 'net-ssh', 'nokogiri', 'rmagick', 'sqlite3', 'typhoeus']
+      ['yajl-ruby', 'bson_ext', 'curb', 'em-http-request', 'eventmachine', 'mysql2', 'net-scp', 'net-sftp', 'net-ssh', 'nokogiri', 'rmagick', 'sqlite3', 'typhoeus']
     end
 
     def initialize

data/lib/iron_worker/server/overrides.rb

@@ -21,6 +21,22 @@ module IronWorker
     def task_data
       @task_data
     end
+
+    def payload=(td)
+      @payload = td
+    end
+
+    def payload
+      @payload
+    end
+
+    def is_local?
+      !is_remote?
+    end
+
+    def is_remote?
+      true
+    end
   end
 
   def self.disable_queueing()
@@ -82,15 +98,6 @@ module IronWorker
 
     end
 
-    def is_remote?
-      true
-    end
-
-    #:todo remove this method later, when new iron_worker gem will be released
-    def is_local?
-      !is_remote?
-    end
-
     def log(str)
       puts str.to_s
     end

data/lib/iron_worker/server/runner.rb

@@ -51,10 +51,12 @@ def init_runner(runner_class, job_data, user_dir, task_id)
   end
   runner = runner_class.new
   runner.instance_variable_set(:@task_id, task_id)
-  runner.instance_variable_set(:@job_data, job_data)
-  runner.instance_variable_set(:@sw_config, job_data['sw_config'])
+  if job_data
+    runner.instance_variable_set(:@job_data, job_data)
+    runner.instance_variable_set(:@sw_config, job_data['sw_config'])
+    runner.sw_set_data(job_data)
+  end
   runner.instance_variable_set(:@user_dir, user_dir)
-  runner.sw_set_data(job_data)
   runner
 end
 

data/lib/iron_worker/service.rb

@@ -51,7 +51,7 @@ module IronWorker
 
       begin
 
-        zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:unmerged_gems], options[:merged_mailers], options[:merged_folders])
+        zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:unmerged_gems], options[:merged_mailers], options[:merged_folders], class_name)
 
         # Check for code changes.
         zipfile = Zip::ZipFile.open(zip_filename, Zip::ZipFile::CREATE)
@@ -92,6 +92,9 @@ module IronWorker
       !Gem::GemPathSearcher.private_instance_methods.include?(:_deprecated_initialize)
     end
 
+    def webhook
+
+    end
 
     def self.get_gem_path(gem_info)
 #      gem_name =(gem_info[:require] || gem_info[:name].match(/^[a-zA-Z0-9\-_\.]+/)[0])
@@ -143,7 +146,7 @@ module IronWorker
       dependendent_gems
     end
 
-    def build_merged_file(filename, merged, unmerge, merged_gems, unmerged_gems, merged_mailers, merged_folders)
+    def build_merged_file(filename, merged, unmerge, merged_gems, unmerged_gems, merged_mailers, merged_folders, class_name)
 
       unmerged_gems ||= {}
 
@@ -157,8 +160,7 @@ module IronWorker
       end
       merged = merge
       IronWorker.logger.debug 'merged=' + merged.inspect
-
-      merged_gems = merged_gems.merge(IronWorker.config.merged_gems)
+      merged_gems = IronWorker.config.merged_gems.merge(merged_gems)
       IronWorker.logger.debug 'merged_gems=' + merged_gems.inspect
 
       if config.skip_auto_dependencies
@@ -257,7 +259,10 @@ IronWorker.disable_queueing()
 #puts 'dirname=' + dirname.inspect
 Dir.chdir(dirname)
 # Load in job data
-job_data = JSON.load(File.open(task_data_file))
+payload = IO.read(task_data_file)
+IronWorker.payload = payload
+begin
+job_data = JSON.parse(payload)
 #puts 'payload=' + job_data.inspect
 sw_config = job_data['sw_config']
 IronWorker.task_data = job_data
@@ -272,6 +277,9 @@ if IronWorker.task_data['rails']
     end
   end
 end
+rescue JSON::ParserError => ex
+  puts 'Payload is not json, raw payload can be accessed with IronWorker.payload.'
+end
 ")
 
         if IronWorker.config.extra_requires
@@ -300,11 +308,13 @@ end
         f.write("require_relative '#{File.basename(filename)}'\n")
 
         f.write("
-  runner_class = get_class_to_run(job_data['class_name'])
+        clz_name = '#{class_name}' # job_data['class_name']
+  runner_class = get_class_to_run(clz_name)
   IronWorker.running_class = runner_class
   runner = init_runner(runner_class, job_data, dirname, task_id)
+if IronWorker.task_data
   init_worker_service_for_runner(job_data)
-
+end
   # Now reenable after loading
   IronWorker.enable_queueing()
 
@@ -334,10 +344,10 @@ end
 #            puts 'gem=' + gem.inspect
             path = gem[:path]
             if path
-              IronWorker.logger.debug "Collecting gem #{path}"
+              #IronWorker.logger.debug "Collecting gem #{path}"
               paths_to_use = ["#{path}/*", "#{path}/lib/**/**"]
               if gem[:include_dirs]
-                IronWorker.logger.debug "including extra dirs: " + gem[:include_dirs].inspect
+                #IronWorker.logger.debug "including extra dirs: " + gem[:include_dirs].inspect
                 gem[:include_dirs].each do |dir|
                   paths_to_use << "#{path}/#{dir}/**/**"
                 end
@@ -345,11 +355,11 @@ end
               IronWorker.logger.debug 'paths_to_use: ' + paths_to_use.inspect
               Dir.glob(paths_to_use).each do |file|
                 # todo: could check if directory and it not lib, skip it
-                IronWorker.logger.debug 'file for gem=' + file.inspect
+                #IronWorker.logger.debug 'file for gem=' + file.inspect
 #                puts 'gem2=' + gem.inspect
                 zdest = "gems/#{gem[:name]}/#{file.sub(path+'/', '')}"
 #                puts 'gem file=' + file.to_s
-                IronWorker.logger.debug 'zip dest=' + zdest
+                #IronWorker.logger.debug 'zip dest=' + zdest
                 f.add(zdest, file)
               end
             else
@@ -369,7 +379,7 @@ end
             if files and files.size>0
               files.each do |file|
                 zdest = "#{Digest::MD5.hexdigest(folder)}/#{file.sub(':', '_').sub('/', '_')}"
-                IronWorker.logger.debug 'put file to=' + zdest
+                #IronWorker.logger.debug 'put file to=' + zdest
                 f.add(zdest, file)
               end
             end
@@ -471,7 +481,7 @@ end
     def queue(name, data={}, options={})
       puts "Queuing #{name}..."
       check_config
-      if !data.is_a?(Array)
+      unless data.is_a?(Array)
         data = [data]
       end
       # Now we need to add class_name to the payload
@@ -493,7 +503,7 @@ end
         # todo: REMOVE THIS
         hash_to_send["rails_env"] = RAILS_ENV
       end
-      return queue_raw(name, hash_to_send, options)
+      queue_raw(name, hash_to_send, options)
     end
 
     def queue_raw(name, data={}, options={})

data/lib/iron_worker.rb

@@ -34,6 +34,14 @@ module IronWorker
     def api_version
       2
     end
+
+    def is_local?
+      !is_remote?
+    end
+
+    def is_remote?
+      false
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.3.12
+  version: 2.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &11824140 !ruby/object:Gem::Requirement
+  requirement: &19776580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11824140
+  version_requirements: *19776580
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &11823620 !ruby/object:Gem::Requirement
+  requirement: &19775720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11823620
+  version_requirements: *19775720
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &11823040 !ruby/object:Gem::Requirement
+  requirement: &19775140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11823040
+  version_requirements: *19775140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11822560 !ruby/object:Gem::Requirement
+  requirement: &19774600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11822560
+  version_requirements: *19774600
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &11822080 !ruby/object:Gem::Requirement
+  requirement: &19774020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11822080
+  version_requirements: *19774020
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &11821600 !ruby/object:Gem::Requirement
+  requirement: &19773440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11821600
+  version_requirements: *19773440
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &11821120 !ruby/object:Gem::Requirement
+  requirement: &19772860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11821120
+  version_requirements: *19772860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11820640 !ruby/object:Gem::Requirement
+  requirement: &19772320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11820640
+  version_requirements: *19772320
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []