simple_worker 0.3.21 → 0.3.22

data/README.markdown

@@ -165,9 +165,9 @@ Rails 3.X:
     gem 'simple_worker'
 
 Now you can use your workers like they're part of your app!  We recommend putting your worker classes in
-/app/workers path.
+/app/workers path.  
 
-Configuring an Database Connection
+Configuring a Database Connection
 ---------------------------------
 
 Although you could easily do this in your worker, this makes it a bit more convenient and more importantly
@@ -210,11 +210,13 @@ The opposite can be done as well with "unmerge" and can be useful when using Rai
 merged.
 
 
-Bringing in other Workers
+Merging other Workers
 ---------------------
 
-merge_worker
-TODO
+Merging other workers is a bit different than merging other code like above because they will be
+uploaded separately and treated as distinctly separate workers.
+
+    merge_worker "./other_worker.rb", "OtherWorker"
 
 
 Configuration Options

data/lib/rails2_init.rb

@@ -1,8 +1,8 @@
-puts "Initializing list of Rails models..."
+#puts "Initializing list of Rails models..."
 SimpleWorker.configure do |config|
   path = File.join(Rails.root, 'app/models/*.rb')
-  puts 'path=' + path
+#  puts 'path=' + path
   config.models = Dir.glob(path)
   config.extra_requires += ['active_support/core_ext', 'active_record', 'action_mailer']
-  puts 'config.models=' + config.models.inspect
+#  puts 'config.models=' + config.models.inspect
 end

data/lib/simple_worker/base.rb

@@ -10,14 +10,14 @@ module SimpleWorker
 
     class << self
       attr_accessor :subclass, :caller_file
-      @merged         = []
+      @merged = []
       @merged_workers = []
-      @unmerged       = []
+      @unmerged = []
 
       def reset!
-        @merged         = []
+        @merged = []
         @merged_workers = []
-        @unmerged       = []
+        @unmerged = []
       end
 
       def inherited(subclass)
@@ -52,7 +52,7 @@ module SimpleWorker
           puts 'f2=' + f2
           if File.exist? f2
             exists = true
-            f      = f2
+            f = f2
           end
         end
         unless exists
@@ -86,6 +86,11 @@ module SimpleWorker
         s[-suffix.length, suffix.length] == suffix
       end
 
+      # 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'. 
       def merge_worker(file, class_name)
 #        puts 'merge_worker in ' + self.name
         merge(file)
@@ -116,9 +121,17 @@ module SimpleWorker
 
     # Call this if you want to run locally and get some extra features from this gem like global attributes.
     def run_local
-#            puts 'run_local'
+      # puts 'run_local'
       set_auto_attributes
-      run
+      begin
+        run
+      rescue => ex
+        if self.respond_to?(:rescue_all)
+          rescue_all(ex)
+        else
+          raise ex
+        end
+      end
     end
 
     def set_auto_attributes
@@ -138,16 +151,20 @@ module SimpleWorker
       end
     end
 
-    # Will send in all instance_variables.
+    # Call this to queue up your job to SimpleWorker cloud.
+    # options:
+    #   :priority => 0,1 or 2. Default is 0.
+    #   :recursive => true/false. Default is false. If you queue up a worker that is the same class as the currently
+    #                 running worker, it will be rejected unless you set this explicitly so we know you meant to do it.
     def queue(options={})
 #            puts 'in queue'
       set_auto_attributes
       upload_if_needed
 
-      response     = SimpleWorker.service.queue(self.class.name, sw_get_data, options)
+      response = SimpleWorker.service.queue(self.class.name, sw_get_data, options)
 #            puts 'queue response=' + response.inspect
-      @task_set_id = response["task_set_id"]
-      @task_id     = response["tasks"][0]["task_id"]
+#      @task_set_id = response["task_set_id"]
+      @task_id = response["task_id"]
       response
     end
 
@@ -173,7 +190,7 @@ module SimpleWorker
       set_global_attributes
       upload_if_needed
 
-      response     = SimpleWorker.service.schedule(self.class.name, sw_get_data, schedule)
+      response = SimpleWorker.service.schedule(self.class.name, sw_get_data, schedule)
 #            puts 'schedule response=' + response.inspect
       @schedule_id = response["schedule_id"]
       response
@@ -206,15 +223,15 @@ module SimpleWorker
 
       before_upload
 
-      puts 'upload_if_needed ' + self.class.name
+#      puts 'upload_if_needed ' + self.class.name
       # Todo, watch for this file changing or something so we can reupload
       unless uploaded?
-        merged     = self.class.instance_variable_get(:@merged)
-        unmerged     = self.class.instance_variable_get(:@unmerged)
+        merged = self.class.instance_variable_get(:@merged)
+        unmerged = self.class.instance_variable_get(:@unmerged)
 #        puts 'merged1=' + merged.inspect
 
-        subclass   = self.class
-        rfile      = subclass.instance_variable_get(:@caller_file) # Base.caller_file # File.expand_path(Base.subclass)
+        subclass = self.class
+        rfile = subclass.instance_variable_get(:@caller_file) # Base.caller_file # File.expand_path(Base.subclass)
 #        puts 'subclass file=' + rfile.inspect
 #        puts 'subclass.name=' + subclass.name
         superclass = subclass
@@ -232,14 +249,14 @@ module SimpleWorker
         SimpleWorker.service.upload(rfile, subclass.name, :merge=>merged, :unmerge=>unmerged)
         self.class.instance_variable_set(:@uploaded, true)
       else
-        puts 'already uploaded for ' + self.class.name
+        SimpleWorker.logger.debug 'Already uploaded for ' + self.class.name
       end
       merged_workers = self.class.instance_variable_get(:@merged_workers)
       if merged_workers.size > 0
-        puts 'now uploading merged workers ' + merged_workers.inspect
+#        puts 'now uploading merged workers ' + merged_workers.inspect
         merged_workers.each do |mw|
           # to support merges in the secondary worker, we should instantiate it here, then call "upload"
-          puts 'instantiating and uploading ' + mw[1]
+          SimpleWorker.logger.debug 'Instantiating and uploading ' + mw[1]
           Kernel.const_get(mw[1]).new.upload
 #                    SimpleWorker.service.upload(mw[0], mw[1])
         end
@@ -254,7 +271,7 @@ module SimpleWorker
         data[iv] = instance_variable_get(iv)
       end
 
-      config_data      = SimpleWorker.config.get_atts_to_send
+      config_data = SimpleWorker.config.get_atts_to_send
       data[:sw_config] = config_data
       return data
     end

data/lib/simple_worker/service.rb

@@ -1,13 +1,21 @@
 require 'base64'
+require 'logger'
 
 module SimpleWorker
 
+  @@logger = Logger.new(STDOUT)
+  @@logger.level = Logger::INFO
+
+  def self.logger
+    @@logger
+  end
+
   class Service < Appoxy::Api::Client
 
     attr_accessor :config
 
     def initialize(access_key, secret_key, options={})
-      puts 'Starting SimpleWorker::Service...'
+      SimpleWorker.logger.info 'Starting SimpleWorker::Service...'
       self.config = options[:config] if options[:config]
       super("http://api.simpleworker.com/api/", access_key, secret_key, options)
       self.host = self.config.host if self.config && self.config.host
@@ -17,7 +25,7 @@ module SimpleWorker
     #    - :callback_url
     #    - :merge => array of files to merge in with this file
     def upload(filename, class_name, options={})
-      puts "Uploading #{class_name}"
+#      puts "Uploading #{class_name}"
       # check whether it should upload again
       tmp          = Dir.tmpdir()
       md5file      = "simple_worker_#{class_name.gsub("::", ".")}_#{access_key[0,8]}.md5"
@@ -36,11 +44,11 @@ module SimpleWorker
 
       new_code = false
       if md5 != existing_md5
-        puts "#{class_name}: new code, uploading"
+        SimpleWorker.logger.info "Uploading #{class_name}, code modified."
         File.open(f, 'w') { |f| f.write(md5) }
         new_code = true
       else
-        puts "#{class_name}: same code, not uploading"
+#        puts "#{class_name}: same code, not uploading"
       end
 
       if new_code
@@ -97,15 +105,16 @@ module SimpleWorker
     # class_name: The class name of a previously upload class, eg: MySuperWorker
     # data: Arbitrary hash of your own data that your task will need to run.
     def queue(class_name, data={}, options={})
-      puts "Queuing #{class_name}"
+      puts "Queuing #{class_name}..."
       if !data.is_a?(Array)
         data = [data]
       end
-      p data
+#      p data
       hash_to_send               = {}
       hash_to_send["payload"]    = data
       hash_to_send["class_name"] = class_name
       hash_to_send["priority"] = options[:priority] if options[:priority]
+      hash_to_send["options"] = options
       add_sw_params(hash_to_send)
       if defined?(RAILS_ENV)
         # todo: move this to global_attributes in railtie
@@ -136,7 +145,7 @@ module SimpleWorker
     #     - run_times:     Task will run exactly :run_times. For instance if :run_times is 5, then the task will run 5 times.
     #
     def schedule(class_name, data, schedule)
-      puts "Scheduling #{class_name}"
+      puts "Scheduling #{class_name}..."
       raise "Schedule must be a hash." if !schedule.is_a? Hash
 #            if !data.is_a?(Array)
 #                data = [data]

data/lib/simple_worker/used_in_worker.rb

@@ -5,8 +5,7 @@ module SimpleWorker
     module UsedInWorker
 
         def log(str)
-            puts 'gem usedinworker log=' + str.to_s
-#            puts str.to_s
+            puts str.to_s
         end
     end
 end

data/test/test_base.rb

@@ -3,7 +3,7 @@ require 'yaml'
 begin
   require File.join(File.dirname(__FILE__), '../lib/simple_worker')
 rescue Exception => ex
-  puts ex.message
+  puts "Could NOT load current simple_worker: " + ex.message
   require 'simple_worker'
 end
 require_relative "test_worker"

data/test/test_simple_worker.rb

@@ -22,7 +22,8 @@ class SimpleWorkerTests < TestBase
     # queue up a task
     puts 'queuing ' + tw.inspect
 
-    50.times do |i|
+    response_hash_single = nil
+    5.times do |i|
       begin
         response_hash_single = tw.queue
       rescue => ex
@@ -31,7 +32,6 @@ class SimpleWorkerTests < TestBase
     end
 
     puts 'response_hash=' + response_hash_single.inspect
-    puts 'task_set_id=' + tw.task_set_id
     puts 'task_id=' + tw.task_id
     10.times do |i|
       puts "status #{i}: " + tw.status.inspect

data/test/test_worker.rb

@@ -1,9 +1,9 @@
-begin
-    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
-rescue Exception => ex
-    puts ex.message
-    require 'simple_worker'
-end
+#begin
+#    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+#rescue Exception => ex
+#    puts ex.message
+#    require 'simple_worker'
+#end
 # Bump for new checksum.
 class TestWorker < SimpleWorker::Base
 

data/test/test_worker_2.rb

@@ -1,9 +1,11 @@
+=begin
 begin
     require File.join(File.dirname(__FILE__), '../lib/simple_worker')
 rescue Exception => ex
     puts ex.message
     require 'simple_worker'
 end
+=end
 
 # Bump for new checksum.sdf adsfjlaksdjf dasfasdfadsf
 class TestWorker2 < SimpleWorker::Base

data/test/test_worker_3.rb

@@ -1,9 +1,11 @@
+=begin
 begin
     require File.join(File.dirname(__FILE__), '../lib/simple_worker')
 rescue Exception => ex
     puts ex.message
     require 'simple_worker'
 end
+=end
 require_relative 'test_worker_2'
 
 class TestWorker3 < TestWorker2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_worker
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-13 00:00:00.000000000 -08:00
+date: 2011-02-19 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appoxy_api
-  requirement: &26617572 !ruby/object:Gem::Requirement
+  requirement: &27002148 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26617572
+  version_requirements: *27002148
 description: The official SimpleWorker gem for http://www.simpleworker.com
 email: travis@appoxy.com
 executables: []
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: The official SimpleWorker gem for http://www.simpleworker.com