simple_worker 0.3.9 → 0.3.10

data/lib/simple_worker/base.rb

@@ -104,17 +104,50 @@ module SimpleWorker
             SimpleWorker.service.schedule_status(schedule_id)
         end
 
+        # Callbacks for developer
+        def before_upload
+
+        end
+
+        def after_upload
+
+        end
+
+           def before_run
+
+        end
+        def after_run
+
+        end
+
         private
-        
+
         def upload_if_needed
 
+            before_upload
+
             puts 'upload_if_needed'
+            # Todo, watch for this file changing or something so we can reupload
             unless uploaded?
                 subclass = self.class
                 rfile = subclass.instance_variable_get(:@caller_file) # Base.caller_file # File.expand_path(Base.subclass)
                 puts 'rfile=' + rfile.inspect
                 puts 'self.class.name=' + subclass.name
-                SimpleWorker.service.upload(rfile, subclass.name, :merge=>self.class.instance_variable_get(:@merged))
+                merged = self.class.instance_variable_get(:@merged)
+                puts 'merged1=' + merged.inspect
+                superclass = subclass
+                # Also get merged from subclasses up to SimpleWorker::Base
+                while (superclass = superclass.superclass)
+                    puts 'superclass=' + superclass.name
+                    break if superclass.name == SimpleWorker::Base.name
+                    super_merged = superclass.instance_variable_get(:@merged)
+#                     puts 'merging caller file: ' + superclass.instance_variable_get(:@caller_file).inspect
+                    super_merged << superclass.instance_variable_get(:@caller_file)
+                    merged = super_merged + merged
+                    puts 'merged with superclass=' + merged.inspect
+
+                end
+                SimpleWorker.service.upload(rfile, subclass.name, :merge=>merged)
                 self.class.instance_variable_set(:@uploaded, true)
             else
                 puts 'already uploaded for ' + self.class.name
@@ -126,6 +159,8 @@ module SimpleWorker
                 Kernel.const_get(mw[1]).new.upload
 #                    SimpleWorker.service.upload(mw[0], mw[1])
             end
+
+            after_upload
         end
 
         def sw_get_data
@@ -137,6 +172,5 @@ module SimpleWorker
         end
 
 
-
     end
 end

data/lib/simple_worker.rb

@@ -68,9 +68,10 @@ module SimpleWorker
 
         def build_merged_file(filename, merge)
             merge = merge.dup
-            merge.insert(0, filename)
+            merge << filename
             fname2 = File.join(Dir.tmpdir(), File.basename(filename))
             puts 'fname2=' + fname2
+            puts 'merged_file_array=' + merge.inspect
             File.open(fname2, "w") do |f|
                 merge.each do |m|
                     f.write File.open(m, 'r') { |mo| mo.read }

data/test/test_base.rb

@@ -0,0 +1,31 @@
+require 'test/unit'
+require 'yaml'
+begin
+    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue Exception => ex
+    puts ex.message
+    require 'simple_worker'
+end
+require File.join(File.dirname(__FILE__), "./test_worker")
+require File.join(File.dirname(__FILE__), "./test_worker_2")
+require File.join(File.dirname(__FILE__), "./test_worker_3")
+
+class TestBase < Test::Unit::TestCase
+
+    def setup
+        @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_worker.yml")))
+        #puts @config.inspect
+        @access_key = @config['simple_worker']['access_key']
+        @secret_key = @config['simple_worker']['secret_key']
+
+        @worker = SimpleWorker::Service.new(@access_key, @secret_key)
+        @worker.host = "http://localhost:3000/api/"
+
+        # new style
+        SimpleWorker.configure do |config|
+            config.access_key = @access_key
+            config.secret_key = @secret_key
+            config.host = "http://localhost:3000/api/"
+        end
+    end
+end

data/test/test_inheritance.rb

@@ -1,7 +1,19 @@
+require 'test_base'
 
+class TestInheritance < TestBase
 
-require File.join(File.dirname(__FILE__), "./test_worker_2")
+    def test_who_am_i
 
-worker = TestWorker2.new
-puts worker.who_am_i?
-puts worker.who_am_i2?
+        worker = TestWorker2.new
+        puts "1: " + worker.who_am_i?
+        puts "2: " + worker.who_am_i2?
+
+
+    end
+
+    def test_multi_subs
+        t3 = TestWorker3.new
+        t3.queue
+    end
+
+end

data/test/test_simple_worker.rb

@@ -1,36 +1,9 @@
-require 'test/unit'
-require 'yaml'
-begin
-    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
-rescue Exception => ex
-    puts ex.message
-    require 'simple_worker'
-end
-require File.join(File.dirname(__FILE__), "./test_worker")
-require File.join(File.dirname(__FILE__), "./test_worker_2")
-
-class SimpleWorkerTests < Test::Unit::TestCase
-
-    def setup
-        @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_worker.yml")))
-        #puts @config.inspect
-        @access_key = @config['simple_worker']['access_key']
-        @secret_key = @config['simple_worker']['secret_key']
 
-        @worker = SimpleWorker::Service.new(@access_key, @secret_key)
-        @worker.host = "http://localhost:3000/api/"
 
-        # new style
-        SimpleWorker.configure do |config|
-            config.access_key = @access_key
-            config.secret_key = @secret_key
-            config.host = "http://localhost:3000/api/"
-        end
-    end
+require 'test_base'
 
-    def teardown
+class SimpleWorkerTests < TestBase
 
-    end
 
     def test_new_worker_style
         # Add something to queue, get task ID back

data/test/test_worker_3.rb

@@ -0,0 +1,19 @@
+begin
+    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue Exception => ex
+    puts ex.message
+    require 'simple_worker'
+end
+require 'test_worker_2'
+
+class TestWorker3 < TestWorker2
+
+
+    attr_accessor :s3_key, :times
+
+    def run()
+
+    end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Travis Reeder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,10 +49,12 @@ files:
 - test/models/model_1.rb
 - test/scheduled_worker.rb
 - test/second_worker.rb
+- test/test_base.rb
 - test/test_inheritance.rb
 - test/test_simple_worker.rb
 - test/test_worker.rb
 - test/test_worker_2.rb
+- test/test_worker_3.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_worker
 licenses: []
@@ -91,7 +93,9 @@ test_files:
 - test/models/model_1.rb
 - test/scheduled_worker.rb
 - test/second_worker.rb
+- test/test_base.rb
 - test/test_inheritance.rb
 - test/test_simple_worker.rb
 - test/test_worker.rb
 - test/test_worker_2.rb
+- test/test_worker_3.rb