simple_worker 0.3.3 → 0.3.5

data/lib/simple_worker/base.rb

@@ -19,13 +19,13 @@ module SimpleWorker
             def inherited(subclass)
                 subclass.reset!
 
-                puts "New subclass: #{subclass}"
-                puts "subclass.inspect=" + subclass.inspect
-                puts 'existing caller=' + (subclass.instance_variable_defined?(:@caller_file) ? subclass.instance_variable_get(:@caller_file).inspect : "nil")
-                puts "caller=" + caller.inspect
+#                puts "New subclass: #{subclass}"
+#                puts "subclass.inspect=" + subclass.inspect
+#                puts 'existing caller=' + (subclass.instance_variable_defined?(:@caller_file) ? subclass.instance_variable_get(:@caller_file).inspect : "nil")
+#                puts "caller=" + caller.inspect
                 splits = caller[0].split(":")
                 caller_file = splits[0] + ":" + splits[1]
-                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)
 

data/lib/simple_worker.rb

@@ -9,12 +9,11 @@ module SimpleWorker
         attr_accessor :config,
                       :service
 
-    end
-
-    def self.configure()
-        SimpleWorker.config ||= Config.new
-        yield(config)
-        SimpleWorker.service = Service.new(config.access_key, config.secret_key, :config=>config)
+        def configure()
+            SimpleWorker.config ||= Config.new
+            yield(config)
+            SimpleWorker.service = Service.new(config.access_key, config.secret_key, :config=>config)
+        end
     end
 
     class Service < Appoxy::Api::Client
@@ -81,6 +80,7 @@ module SimpleWorker
         end
 
         def add_sw_params(hash_to_send)
+            # 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
         end

data/test/second_worker.rb

@@ -0,0 +1,12 @@
+class SecondWorker < SimpleWorker::Base
+    attr_accessor :start_time, :num
+
+
+    def run
+        log self.to_s
+    end
+
+    def to_s
+        "I am Second Worker #{num}. I was started at #{start_time}"
+    end
+end

data/test/test_simple_worker.rb

@@ -39,13 +39,13 @@ class SimpleWorkerTests < Test::Unit::TestCase
         tw.x = true
 
         # schedule up a task
-        start_at = 10.seconds.since
-        response_hash_single = tw.schedule(:start_at=>start_at, :run_every=>30, :run_times=>3)
-        puts 'response_hash=' + response_hash_single.inspect
-
-        10.times do |i|
-            puts "status #{i}: " + tw.schedule_status.inspect
-        end
+#        start_at = 10.seconds.since
+#        response_hash_single = tw.schedule(:start_at=>start_at, :run_every=>30, :run_times=>3)
+#        puts 'response_hash=' + response_hash_single.inspect
+#
+#        10.times do |i|
+#            puts "status #{i}: " + tw.schedule_status.inspect
+#        end
 
         # queue up a task
         response_hash_single = tw.queue

data/test/test_worker_2.rb

@@ -7,7 +7,8 @@ end
 # Bump for new checksum.
 class TestWorker2 < SimpleWorker::Base
 
-    merge "models/model_1.rb"
+    merge 'models/model_1.rb'
+    merge 'second_worker.rb'
 
     attr_accessor :s3_key, :times, :x
 
@@ -16,8 +17,8 @@ class TestWorker2 < SimpleWorker::Base
         return self.class.name
     end
 
-    def run(data=nil)
-        log 'running the runner for leroy '.upcase + ' with data: ' + data.inspect
+    def run
+        log 'running the runner for leroy '.upcase + ' with data: '
 
         log 's3_key instance_variable = ' + self.s3_key
         times.times do |i|
@@ -28,6 +29,23 @@ class TestWorker2 < SimpleWorker::Base
         m1 = Model1.new
         log "I made a new model1"
         m1.say_hello
+
+        second_workers = []
+        now = Time.now
+        10.times do |i|
+            second_worker = SecondWorker.new
+            second_worker.start_time = now
+            second_worker.num = i
+            second_worker.queue
+            second_workers << second_worker
+        end
+
+        10.times do |i|
+            second_workers.each do |sw|
+                puts sw.to_s
+                puts sw.status["status"].to_s
+            end
+        end
     end
 
     def set_complete(params=nil)
@@ -35,4 +53,3 @@ class TestWorker2 < SimpleWorker::Base
     end
 
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Travis Reeder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -07:00
+date: 2010-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - README.markdown
 - test/models/model_1.rb
 - test/scheduled_worker.rb
+- test/second_worker.rb
 - test/test_inheritance.rb
 - test/test_simple_worker.rb
 - test/test_worker.rb
@@ -89,6 +90,7 @@ summary: Classified
 test_files: 
 - test/models/model_1.rb
 - test/scheduled_worker.rb
+- test/second_worker.rb
 - test/test_inheritance.rb
 - test/test_simple_worker.rb
 - test/test_worker.rb