simple_worker 0.5.5 → 0.5.6

data/README.markdown

@@ -123,6 +123,10 @@ The log will be available for viewing via the SimpleWorker UI or via log in the
 
     SimpleWorker.service.log(job_id)
 
+or if you still have a handle to your worker object:
+
+    worker.get_log
+
 Setting Progress
 ----------------
 
@@ -218,6 +222,16 @@ uploaded separately and treated as distinctly separate workers.
 
     merge_worker "./other_worker.rb", "OtherWorker"
 
+Merging Gems
+---------------------
+
+This allows you to use any gem you'd like with SimpleWorker. 
+
+    merge_gem "some_gem"
+    merge_gem "some_gem_with_version", "1.2.3"
+
+[Check here for more info on merge_gem](http://support.simpleworker.com/kb/working-with-simpleworker/merging-gems-into-your-worker).
+
 
 Configuration Options
 ---------------------

data/lib/simple_worker/base.rb

@@ -31,7 +31,7 @@ module SimpleWorker
 #                caller_file = splits[0] + ":" + splits[1]
         caller_file = caller[0][0...(caller[0].index(":in"))]
         caller_file = caller_file[0...(caller_file.rindex(":"))]
-#                puts 'caller_file=' + caller_file
+        #        puts 'caller_file=' + caller_file
         # don't need these class_variables anymore probably
         subclass.instance_variable_set(:@caller_file, caller_file)
 
@@ -189,6 +189,25 @@ module SimpleWorker
       SimpleWorker.service.status(task_id)
     end
 
+    # will return after job has completed or errored out.
+    # Returns status.
+    # todo: add a :timeout option
+    def wait_until_complete
+      tries = 0
+      status = nil
+      sleep 1
+      while tries < 100
+        status = self.status
+        puts "Waiting... status=" + status["status"]
+        if status["status"] != "queued" && status["status"] != "running"
+          break
+        end
+        sleep 2
+      end
+      status
+    end
+
+
     def upload
       upload_if_needed
     end
@@ -217,6 +236,7 @@ module SimpleWorker
       SimpleWorker.service.schedule_status(schedule_id)
     end
 
+    # Retrieves the log for this worker from the SimpleWorker service.
     def get_log
       SimpleWorker.service.log(task_id)
     end
@@ -295,6 +315,7 @@ module SimpleWorker
         payload[iv] = instance_variable_get(iv)
       end
       data[:attr_encoded] = Base64.encode64(payload.to_json)
+      data[:file_name] = File.basename(self.class.instance_variable_get(:@caller_file))
 
       config_data = SimpleWorker.config.get_atts_to_send
       data[:sw_config] = config_data

data/lib/simple_worker/service.rb

@@ -4,7 +4,7 @@ require 'appoxy_api'
 require 'zip'
 module SimpleWorker
 
-  @@logger       = Logger.new(STDOUT)
+  @@logger = Logger.new(STDOUT)
   @@logger.level = Logger::INFO
 
   def self.logger
@@ -32,15 +32,15 @@ module SimpleWorker
     def upload(filename, class_name, options={})
 #      puts "Uploading #{class_name}"
       # check whether it should upload again
-      tmp          = Dir.tmpdir()
-      md5file      = "simple_worker_#{class_name.gsub("::", ".")}_#{access_key[0, 8]}.md5"
+      tmp = Dir.tmpdir()
+      md5file = "simple_worker_#{class_name.gsub("::", ".")}_#{access_key[0, 8]}.md5"
       existing_md5 = nil
-      f            = File.join(tmp, md5file)
+      f = File.join(tmp, md5file)
       if File.exists?(f)
         existing_md5 = IO.read(f)
       end
       # Check for code changes.
-      md5      = Digest::MD5.hexdigest(File.read(filename))
+      md5 = Digest::MD5.hexdigest(File.read(filename))
       new_code = false
       if md5 != existing_md5
         SimpleWorker.logger.info "Uploading #{class_name}, code modified."
@@ -52,14 +52,13 @@ module SimpleWorker
       end
 
 
-      filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems])
+      zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems])
 
 #            sys.classes[subclass].__file__
 #            puts '__FILE__=' + Base.subclass.__file__.to_s
 #            puts "new md5=" + md5
 
 
-
       if new_code
 #        mystring = nil
 #        file     = File.open(filename, "r") do |f|
@@ -67,8 +66,12 @@ module SimpleWorker
 #        end
 #        mystring = Base64.encode64(mystring)
 #        puts 'code=' + mystring
-        options  = {"class_name"=>class_name, }
-        ret      = post_file("code/put", File.new(filename), options)
+        options = {
+            "class_name"=>class_name,
+            "file_name"=> File.basename(filename)
+        }
+        puts 'options for upload=' + options.inspect
+        ret = post_file("code/put", File.new(zip_filename), options)
         ret
       end
     end
@@ -77,7 +80,7 @@ module SimpleWorker
       gem_name =(full_gem_name.match(/^[a-zA-Z0-9\-_]+/)[0])
       puts "Searching #{gem_name}"
       searcher = Gem::GemPathSearcher.new
-      gems     = searcher.find_all(gem_name)
+      gems = searcher.find_all(gem_name)
       gems = gems.select { |g| g.version.version==version } if version
       if !gems.empty?
         gem = gems.first
@@ -149,7 +152,7 @@ module SimpleWorker
       # todo: remove secret key??  Can use worker service from within a worker without it now
       hash_to_send["sw_access_key"] = self.access_key
       hash_to_send["sw_secret_key"] = self.secret_key
-      hash_to_send["api_version"]    = SimpleWorker.api_version
+      hash_to_send["api_version"] = SimpleWorker.api_version
     end
 
     def check_config
@@ -167,8 +170,8 @@ module SimpleWorker
         data = [data]
       end
 #      p data
-      hash_to_send               = {}
-      hash_to_send["payload"]    = 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
@@ -182,15 +185,14 @@ module SimpleWorker
     end
 
     def queue_raw(class_name, data={})
-      params                     = nil
-      hash_to_send               = data
+      params = nil
+      hash_to_send = data
       hash_to_send["class_name"] = class_name
-      ret                        = post("queue/add", hash_to_send)
+      ret = post("queue/add", hash_to_send)
       ret
 
     end
 
-
     #
     # schedule: hash of scheduling options that can include:
     #     Required:
@@ -207,10 +209,10 @@ module SimpleWorker
 #            if !data.is_a?(Array)
 #                data = [data]
 #            end
-      hash_to_send               = {}
-      hash_to_send["payload"]    = data
+      hash_to_send = {}
+      hash_to_send["payload"] = data
       hash_to_send["class_name"] = class_name
-      hash_to_send["schedule"]   = schedule
+      hash_to_send["schedule"] = schedule
       add_sw_params(hash_to_send)
 #            puts ' about to send ' + hash_to_send.inspect
       ret = post("scheduler/schedule", hash_to_send)
@@ -219,33 +221,33 @@ module SimpleWorker
 
     def cancel_schedule(scheduled_task_id)
       raise "Must include a schedule id." if scheduled_task_id.blank?
-      hash_to_send                      = {}
+      hash_to_send = {}
       hash_to_send["scheduled_task_id"] = scheduled_task_id
-      ret                               = post("scheduler/cancel", hash_to_send)
+      ret = post("scheduler/cancel", hash_to_send)
       ret
     end
 
     def get_schedules()
       hash_to_send = {}
-      ret          = get("scheduler/list", hash_to_send)
+      ret = get("scheduler/list", hash_to_send)
       ret
     end
 
     def status(task_id)
       data = {"task_id"=>task_id}
-      ret  = get("task/status", data)
+      ret = get("task/status", data)
       ret
     end
 
     def schedule_status(schedule_id)
       data = {"schedule_id"=>schedule_id}
-      ret  = get("scheduler/status", data)
+      ret = get("scheduler/status", data)
       ret
     end
 
     def log(task_id)
       data = {"task_id"=>task_id}
-      ret  = get("task/log", data, {:parse=>false})
+      ret = get("task/log", data, {:parse=>false})
 #            puts ' ret=' + ret.inspect
 #            ret["log"] = Base64.decode64(ret["log"])
       ret

data/test/awesome_job.rb

@@ -1,5 +1,5 @@
 class AwesomeJob < SimpleWorker::Base
-  merge_gem 'dropbox'
+  merge_gem 'dropbox' # , '1.2.3'
   # bumpdsfsdfdsfasdf
 
   def run

data/test/test_inheritance.rb

@@ -1,4 +1,4 @@
-require 'test_base'
+require_relative 'test_base'
 
 class TestInheritance < TestBase
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 -07:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency