simple_worker 0.3.6 → 0.3.8

data/lib/simple_worker/base.rb

@@ -11,9 +11,11 @@ module SimpleWorker
         class << self
             attr_accessor :subclass, :caller_file
             @merged = []
+            @merged_workers = []
 
             def reset!
                 @merged = []
+                @merged_workers = []
             end
 
             def inherited(subclass)
@@ -43,6 +45,13 @@ module SimpleWorker
                     @merged << File.expand_path(f)
                 end
             end
+
+            def merge_worker(file, class_name)
+                puts 'merge_worker in ' + self.name
+                puts 'FUCK'
+                merge(file)
+                @merged_workers << [File.expand_path(file), class_name]
+            end
         end
 
 
@@ -65,6 +74,7 @@ module SimpleWorker
 
         # Will send in all instance_variables.
         def queue
+            puts 'in queue'
             upload_if_needed
 
             response = SimpleWorker.service.queue(self.class.name, sw_get_data)
@@ -78,6 +88,9 @@ module SimpleWorker
             SimpleWorker.service.status(task_id)
         end
 
+        def upload
+            upload_if_needed
+        end
 
         def schedule(schedule)
             upload_if_needed
@@ -92,23 +105,11 @@ module SimpleWorker
             SimpleWorker.service.schedule_status(schedule_id)
         end
 
-
-#        def queue_other(class_name, data)
-#            SimpleWorker.service.queue(class_name, data)
-#        end
-#
-#        def schedule_other(class_name, data, schedule)
-#            SimpleWorker.service.schedule(class_name, data, schedule)
-#        end
-
         private
-
+        
         def upload_if_needed
 
-#            $LOADED_FEATURES.each_with_index { |feature, idx|
-#  puts "#{ sprintf("%2s", idx) } #{feature}"
-#                if feature[feature.rindex("/")..feature.length] ==
-#}
+            puts 'upload_if_needed'
             unless uploaded?
                 subclass = self.class
                 rfile = subclass.instance_variable_get(:@caller_file) # Base.caller_file # File.expand_path(Base.subclass)
@@ -119,6 +120,13 @@ module SimpleWorker
             else
                 puts 'already uploaded for ' + self.class.name
             end
+            puts 'uploading merged workers'
+            self.class.instance_variable_get(:@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]
+                Kernel.const_get(mw[1]).new.upload
+#                    SimpleWorker.service.upload(mw[0], mw[1])
+            end
         end
 
         def sw_get_data

data/lib/simple_worker/used_in_worker.rb

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

data/lib/simple_worker.rb

@@ -1,8 +1,11 @@
+puts 'REQUIRING THIS SHIT!'
+
 require 'appoxy_api'
 require File.join(File.dirname(__FILE__), 'simple_worker', 'base')
 require File.join(File.dirname(__FILE__), 'simple_worker', 'config')
 require File.join(File.dirname(__FILE__), 'simple_worker', 'used_in_worker')
 
+
 module SimpleWorker
 
     class << self

data/test/models/model_1.rb

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

data/test/scheduled_worker.rb

@@ -1,4 +1,9 @@
-require 'simple_worker'
+begin
+    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue Exception
+    require 'simple_worker'
+end
+
 
 class ScheduledWorker < SimpleWorker::Base
 

data/test/second_worker.rb

@@ -1,6 +1,14 @@
+begin
+    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue Exception => ex
+    puts ex.message
+    require 'simple_worker'
+end
+
 class SecondWorker < SimpleWorker::Base
     attr_accessor :start_time, :num
 
+    # change
 
     def run
         log self.to_s

data/test/test_simple_worker.rb

@@ -2,7 +2,8 @@ require 'test/unit'
 require 'yaml'
 begin
     require File.join(File.dirname(__FILE__), '../lib/simple_worker')
-rescue
+rescue Exception => ex
+    puts ex.message
     require 'simple_worker'
 end
 require File.join(File.dirname(__FILE__), "./test_worker")
@@ -48,7 +49,10 @@ class SimpleWorkerTests < Test::Unit::TestCase
 #        end
 
         # queue up a task
+        puts 'queuing ' + tw.inspect
         response_hash_single = tw.queue
+
+
         puts 'response_hash=' + response_hash_single.inspect
         puts 'task_set_id=' + tw.task_set_id
         puts 'task_id=' + tw.task_id
@@ -61,64 +65,64 @@ class SimpleWorkerTests < Test::Unit::TestCase
         assert tw.status["status"] == "complete"
 
     end
-
-
-    def test_queue
-
-
-        # Upload latest runner code
-        @worker.upload(File.join(File.dirname(__FILE__), "./test_worker.rb"), "TestWorker")
-
-        # Add something to queue, get task ID back
-        # Single task
-        response_hash_single = @worker.queue("TestWorker", {"s3_key"=>"single runner", "times"=>10})
-
-        # task set
-        response_hash = @worker.queue("TestWorker", [{"id"=>"local_id", "s3_key"=>"some key", "times"=>4}, {"s3_key"=>"some key2", "times"=>3}, {"s3_key"=>"some key", "times"=>2}])
-
-         # Check status
-        tasks = response_hash["tasks"]
-        puts 'tasks.size=' + tasks.size.to_s
-        while tasks.size > 0
-            tasks.each do |t|
-                puts "t=" + t.inspect
-                status_response = @worker.status(t["task_id"])
-                puts 'status for ' + t["task_id"] + ' = ' + status_response["status"]
-                if status_response["status"] == "complete" || status_response["status"] == "error" || status_response["status"] == "cancelled"
-                    tasks.delete(t)
-                end
-            end
-        end
-
-        # lets try to get the log now too
-        task_id = response_hash_single["tasks"][0]["task_id"]
-        puts 'task_id=' + task_id
-        status_with_log = @worker.log(task_id)
-        puts 'log=' + status_with_log.inspect
-
-    end
-
-    def test_scheduled
-
-        # Upload latest runner code
-        @worker.upload(File.join(File.dirname(__FILE__), "./scheduled_worker.rb"), "ScheduledWorker")
-
-        start_at = 10.seconds.since
-        #start_at = start_at.gmtime # testing different timezone
-        puts 'start_at =' + start_at.inspect
-        response_hash = @worker.schedule("ScheduledWorker", {"msg"=>"One time test."}, {:start_at=>start_at})
-        puts 'response_hash=' + response_hash.inspect
-
-        start_at = 10.seconds.since
-        response_hash = @worker.schedule("ScheduledWorker", {"msg"=>"Run times test"}, {:start_at=>start_at, :run_every=>30, :run_times=>3})
-        puts 'response_hash=' + response_hash.inspect
-
-        start_at = 10.seconds.since
-        end_at = 2.minutes.since
-        response_hash = @worker.schedule("ScheduledWorker", {"msg"=>"End at test"}, {:start_at=>start_at, :run_every=>30, :end_at=>end_at, :run_times=>20})
-        puts 'response_hash=' + response_hash.inspect
-
-    end
+#
+#
+#    def test_queue
+#
+#
+#        # Upload latest runner code
+#        @worker.upload(File.join(File.dirname(__FILE__), "./test_worker.rb"), "TestWorker")
+#
+#        # Add something to queue, get task ID back
+#        # Single task
+#        response_hash_single = @worker.queue("TestWorker", {"s3_key"=>"single runner", "times"=>10})
+#
+#        # task set
+#        response_hash = @worker.queue("TestWorker", [{"id"=>"local_id", "s3_key"=>"some key", "times"=>4}, {"s3_key"=>"some key2", "times"=>3}, {"s3_key"=>"some key", "times"=>2}])
+#
+#         # Check status
+#        tasks = response_hash["tasks"]
+#        puts 'tasks.size=' + tasks.size.to_s
+#        while tasks.size > 0
+#            tasks.each do |t|
+#                puts "t=" + t.inspect
+#                status_response = @worker.status(t["task_id"])
+#                puts 'status for ' + t["task_id"] + ' = ' + status_response["status"]
+#                if status_response["status"] == "complete" || status_response["status"] == "error" || status_response["status"] == "cancelled"
+#                    tasks.delete(t)
+#                end
+#            end
+#        end
+#
+#        # lets try to get the log now too
+#        task_id = response_hash_single["tasks"][0]["task_id"]
+#        puts 'task_id=' + task_id
+#        status_with_log = @worker.log(task_id)
+#        puts 'log=' + status_with_log.inspect
+#
+#    end
+#
+#    def test_scheduled
+#
+#        # Upload latest runner code
+#        @worker.upload(File.join(File.dirname(__FILE__), "./scheduled_worker.rb"), "ScheduledWorker")
+#
+#        start_at = 10.seconds.since
+#        #start_at = start_at.gmtime # testing different timezone
+#        puts 'start_at =' + start_at.inspect
+#        response_hash = @worker.schedule("ScheduledWorker", {"msg"=>"One time test."}, {:start_at=>start_at})
+#        puts 'response_hash=' + response_hash.inspect
+#
+#        start_at = 10.seconds.since
+#        response_hash = @worker.schedule("ScheduledWorker", {"msg"=>"Run times test"}, {:start_at=>start_at, :run_every=>30, :run_times=>3})
+#        puts 'response_hash=' + response_hash.inspect
+#
+#        start_at = 10.seconds.since
+#        end_at = 2.minutes.since
+#        response_hash = @worker.schedule("ScheduledWorker", {"msg"=>"End at test"}, {:start_at=>start_at, :run_every=>30, :end_at=>end_at, :run_times=>20})
+#        puts 'response_hash=' + response_hash.inspect
+#
+#    end
 
 end
 

data/test/test_worker.rb

@@ -1,6 +1,7 @@
 begin
     require File.join(File.dirname(__FILE__), '../lib/simple_worker')
-rescue Exception
+rescue Exception => ex
+    puts ex.message
     require 'simple_worker'
 end
 # Bump for new checksum.

data/test/test_worker_2.rb

@@ -1,14 +1,15 @@
 begin
     require File.join(File.dirname(__FILE__), '../lib/simple_worker')
-rescue Exception
+rescue Exception => ex
+    puts ex.message
     require 'simple_worker'
 end
 
-# Bump for new checksum.
+# Bump for new checksum.sdf
 class TestWorker2 < SimpleWorker::Base
 
     merge 'models/model_1.rb'
-    merge 'second_worker.rb'
+    merge_worker 'second_worker.rb', 'SecondWorker'
 
     attr_accessor :s3_key, :times, :x
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Travis Reeder