simple_worker 0.4.0 → 0.4.1

data/lib/simple_worker/service.rb

@@ -28,19 +28,24 @@ 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
 
+      # todo: no point in writing the merged file, just use a string, we're just reading it back in anyways
       filename = build_merged_file(filename, options[:merge], options[:unmerge]) if options[:merge]
 
 #            sys.classes[subclass].__file__
 #            puts '__FILE__=' + Base.subclass.__file__.to_s
-      md5      = Digest::MD5.hexdigest(File.read(filename))
+      contents = File.read(filename)
+#      puts 'START CONTENTS:'
+#      puts contents
+#      puts 'END CONTENTS'
+      md5 = Digest::MD5.hexdigest(contents)
 #            puts "new md5=" + md5
 
       new_code = false
@@ -54,23 +59,23 @@ module SimpleWorker
 
       if new_code
         mystring = nil
-        file     = File.open(filename, "r") do |f|
+        file = File.open(filename, "r") do |f|
           mystring = f.read
         end
 #        mystring = Base64.encode64(mystring)
 #        puts 'code=' + mystring
-        options  = {"code"=>mystring, "class_name"=>class_name}
-        ret      = post("code/put", options)
+        options = {"code"=>mystring, "class_name"=>class_name}
+        ret = post("code/put", options)
         ret
       end
     end
 
     def build_merged_file(filename, merge, unmerge)
       merge = merge.dup
-      merge << filename
+#      merge << filename
       #puts "merge before uniq! " + merge.inspect
       merge.uniq!
-     # puts "merge after uniq! " + merge.inspect
+      # puts "merge after uniq! " + merge.inspect
 
       if unmerge
         unmerge.each do |x|
@@ -82,17 +87,47 @@ module SimpleWorker
       fname2 = File.join(Dir.tmpdir(), File.basename(filename))
 #            puts 'fname2=' + fname2
 #            puts 'merged_file_array=' + merge.inspect
+
+      # Let's put the requires from the worker at the top
+      worker_file_contents_array = File.readlines(filename)
+      requires_lines = ""
+      in_comment = false
+      worker_file_contents_array.each do |line|
+        line = line.strip
+#        puts 'checking for requires in ' + line
+        next if line.length == 0
+        next if line[0] == "#"
+#        puts 'line[0, 6]=' + line[0, 6]
+        if in_comment && line[0,4] == "=end"
+          in_comment = false
+          next
+        elsif in_comment
+          next
+        elsif line[0, 6] == "=begin"
+          in_comment = true
+          next
+        end
+        if line.index("require") == 0
+          requires_lines << line + "\n"
+        else
+          break
+        end
+      end
+
       File.open(fname2, "w") do |f|
-         if SimpleWorker.config.extra_requires
-           SimpleWorker.config.extra_requires.each do |r|
-             f.write "require '#{r}'\n"
-           end
-         end
+        if SimpleWorker.config.extra_requires
+          SimpleWorker.config.extra_requires.each do |r|
+            f.write "require '#{r}'\n"
+          end
+        end
+#        puts 'Adding requires lines ' + requires_lines.inspect
+        f.write requires_lines
         merge.each do |m|
 #          puts "merging #{m} into #{filename}"
           f.write File.open(m, 'r') { |mo| mo.read }
           f.write "\n\n"
         end
+        f.write worker_file_contents_array.join("\n")
       end
       fname2
     end
@@ -111,8 +146,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
@@ -126,10 +161,10 @@ 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
@@ -151,10 +186,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)
@@ -163,33 +198,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/db_worker.rb

@@ -1,5 +1,6 @@
 require 'mysql2'
 
+# bump asdf
 class DbWorker < SimpleWorker::Base
   attr_accessor :array_of_models
   merge 'trace_object'

data/test/models/model_1.rb

@@ -1,7 +1,7 @@
 begin
     require File.join(File.dirname(__FILE__), '../../lib/simple_worker')
 rescue Exception => ex
-    puts 'ERROR!!! ' + ex.message
+    puts 'Could not load relative simple_worker: ' + ex.message
 #    require 'simple_worker'
 end
 

data/test/models/model_2.rb

@@ -1,7 +1,7 @@
 begin
     require File.join(File.dirname(__FILE__), '../../lib/simple_worker')
 rescue Exception => ex
-    puts 'ERROR!!! ' + ex.message
+    puts 'Could not load relative simple_worker: ' + ex.message
 #    require 'simple_worker'
 end
 

data/test/test_simple_worker.rb

@@ -28,7 +28,7 @@ class SimpleWorkerTests < TestBase
     puts 'queuing ' + tw.inspect
 
     response_hash_single = nil
-    5.times do |i|
+    1.times do |i|
       begin
         response_hash_single = tw.queue
       rescue => ex
@@ -38,7 +38,7 @@ class SimpleWorkerTests < TestBase
 
     puts 'response_hash=' + response_hash_single.inspect
     puts 'task_id=' + tw.task_id
-    10.times do |i|
+    20.times do |i|
       puts "status #{i}: " + tw.status.inspect
       break if tw.status["status"] == "complete"
       sleep 2

data/test/test_worker_2.rb

@@ -7,7 +7,10 @@ rescue Exception => ex
 end
 =end
 
-# Bump for new checksum.sdf adsfjlaksdjf dasfasdfadsf
+# Bump for new checksum.sdf adsfjlaksdjf d
+
+require 'json'
+
 class TestWorker2 < SimpleWorker::Base
 
     merge File.join(File.dirname(__FILE__), 'models', 'model_1.rb')
@@ -37,7 +40,7 @@ class TestWorker2 < SimpleWorker::Base
 
         second_workers = []
         now = Time.now
-        10.times do |i|
+        1.times do |i|
             second_worker = SecondWorker.new
             second_worker.start_time = now
             second_worker.num = i

metadata

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