simple_worker 0.1.2 → 0.3.0

data/lib/simple_worker/base.rb

@@ -0,0 +1,114 @@
+# This is an abstract module that developers creating works can mixin/include to use the SimpleWorker special functions.
+
+require 'digest/md5'
+
+module SimpleWorker
+
+    class Base
+
+        attr_accessor :task_set_id, :task_id, :schedule_id
+
+        class << self
+            attr_accessor :subclass, :caller_file
+        end
+
+        def self.inherited(subclass)
+            puts "New subclass: #{subclass}"
+            puts "subclass.inspect=" + subclass.inspect
+            puts 'existing caller=' + (subclass.class_variable_defined?(:@@caller_file) ? subclass.class_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
+            # don't need these class_variables anymore probably
+            subclass.class_variable_set(:@@caller_file, caller_file)
+
+        end
+
+
+        def log(str)
+            puts str.to_s
+        end
+
+        def set_progress(hash)
+            puts 'set_progress: ' + hash.inspect
+        end
+
+        def who_am_i?
+            return self.class.name
+        end
+
+        def uploaded?
+            self.class.class_variable_defined?(:@@uploaded) && self.class.class_variable_get(:@@uploaded)
+        end
+
+
+        # Will send in all instance_variables.
+        def queue
+            upload_if_needed
+
+            response = SimpleWorker.service.queue(self.class.name, sw_get_data)
+            puts 'queue response=' + response.inspect
+            @task_set_id = response["task_set_id"]
+            @task_id = response["tasks"][0]["task_id"]
+            response
+        end
+
+        def status
+            SimpleWorker.service.status(task_id)
+        end
+
+
+        def schedule(schedule)
+            upload_if_needed
+
+            response = SimpleWorker.service.schedule(self.class.name, sw_get_data, schedule)
+            puts 'schedule response=' + response.inspect
+            @schedule_id = response["schedule_id"]
+            response
+        end
+
+        def schedule_status
+            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] ==
+#}
+            unless uploaded?
+                subclass = self.class
+                rfile = subclass.class_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)
+                self.class.class_variable_set(:@@uploaded, true)
+            else
+                puts 'already uploaded for ' + self.class.name
+            end
+        end
+
+        def sw_get_data
+            data = {}
+            self.instance_variables.each do |iv|
+                data[iv] = instance_variable_get(iv)
+            end
+            return data
+        end
+
+
+    end
+end

data/lib/simple_worker/config.rb

@@ -0,0 +1,9 @@
+module SimpleWorker
+    class Config
+        attr_accessor :access_key,
+                      :secret_key,
+                      :host
+    end
+
+end
+

data/lib/simple_worker.rb

@@ -1,19 +1,57 @@
 require 'appoxy_api'
-require File.join(File.dirname(__FILE__), 'worker')
-
+require File.join(File.dirname(__FILE__), 'simple_worker', 'base')
+require File.join(File.dirname(__FILE__), 'simple_worker', 'config')
 
 module SimpleWorker
 
+    class << self
+        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)
+    end
+
     class Service < Appoxy::Api::Client
 
+        attr_accessor :config
+
         def initialize(access_key, secret_key, options={})
             puts 'Starting SimpleWorker::Service...'
+            self.config = options[:config] if options[:config]
             super("http://api.simpleworkr.com/api/", access_key, secret_key, options)
+            self.host = self.config.host if self.config && self.config.host
         end
 
         # Options:
         #    - :callback_url
         def upload(filename, class_name, options={})
+
+            # check whether it should upload again
+            tmp = Dir.tmpdir()
+            puts 'tmp=' + tmp.to_s
+            md5file = "simple_workr_#{class_name.gsub("::", ".")}.md5"
+            existing_md5 = nil
+            f = File.join(tmp, md5file)
+            if File.exists?(f)
+                existing_md5 = IO.read(f)
+                puts 'existing_md5=' + existing_md5
+            end
+#            sys.classes[subclass].__file__
+#            puts '__FILE__=' + Base.subclass.__file__.to_s
+            md5 = Digest::MD5.hexdigest(File.read(filename))
+            puts "new md5=" + md5
+            if md5 != existing_md5
+                puts 'new code, so uploading'
+                File.open(f, 'w') { |f| f.write(md5) }
+            else
+                puts 'same code, not uploading'
+            end
+
             mystring = nil
             file = File.open(filename, "r") do |f|
                 mystring = f.read
@@ -23,8 +61,13 @@ module SimpleWorker
             ret
         end
 
-        #
-        # data: 
+        def add_sw_params(hash_to_send)
+            hash_to_send["sw_access_key"] = self.access_key
+            hash_to_send["sw_secret_key"] = self.secret_key
+        end
+
+        # class_name: The class name of a previously upload class, eg: MySuperWorker
+        # data: Arbitrary hash of your own data that your task will need to run.
         def queue(class_name, data={})
             if !data.is_a?(Array)
                 data = [data]
@@ -32,6 +75,7 @@ module SimpleWorker
             hash_to_send = {}
             hash_to_send["payload"] = data
             hash_to_send["class_name"] = class_name
+            add_sw_params(hash_to_send)
             if defined?(RAILS_ENV)
                 hash_to_send["rails_env"] = RAILS_ENV
             end
@@ -68,7 +112,8 @@ module SimpleWorker
             hash_to_send["payload"] = data
             hash_to_send["class_name"] = class_name
             hash_to_send["schedule"] = schedule
-            puts 'about to send ' + hash_to_send.inspect
+            add_sw_params(hash_to_send)
+#            puts 'about to send ' + hash_to_send.inspect
             ret = post("scheduler/schedule", hash_to_send)
             ret
         end
@@ -93,6 +138,12 @@ module SimpleWorker
             ret
         end
 
+        def schedule_status(schedule_id)
+            data = {"schedule_id"=>schedule_id}
+            ret = get("scheduler/status", data)
+            ret
+        end
+
         def log(task_id)
             data = {"task_id"=>task_id}
             ret = get("task/log", data)

data/test/test_inheritance.rb

@@ -0,0 +1,7 @@
+
+
+require File.join(File.dirname(__FILE__), "./test_worker_2")
+
+worker = TestWorker2.new
+puts worker.who_am_i?
+puts worker.who_am_i2?

data/test/test_simple_worker.rb

@@ -1,6 +1,12 @@
 require 'test/unit'
 require 'yaml'
-require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+begin
+    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue
+    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
 
@@ -12,12 +18,51 @@ class SimpleWorkerTests < Test::Unit::TestCase
 
         @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
 
     def teardown
 
     end
 
+    def test_new_worker_style
+        # Add something to queue, get task ID back
+        tw = TestWorker2.new
+        tw.s3_key = "active style runner"
+        tw.times = 3
+        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
+
+        # queue up a task
+        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
+        10.times do |i|
+            puts "status #{i}: " + tw.status.inspect
+            break if tw.status["status"] == "complete"
+            sleep 2
+        end
+
+        assert tw.status["status"] == "complete"
+
+    end
+
+
     def test_queue
 
 
@@ -74,5 +119,6 @@ class SimpleWorkerTests < Test::Unit::TestCase
         puts 'response_hash=' + response_hash.inspect
 
     end
+
 end
 

data/test/test_worker.rb

@@ -1,10 +1,18 @@
-require 'simple_worker'
-
+begin
+    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue Exception
+    require 'simple_worker'
+end
 # Bump for new checksum.
 class TestWorker < SimpleWorker::Base
 
+    attr_accessor :s3_key, :times
+
     def run(data=nil)
         log 'running the runner for leroy '.upcase + ' with data: ' + data.inspect
+
+        log 's3_key instance_variable = ' + self.s3_key
+
         @times = data["times"].to_i
         @times.times do |i|
             log 'running at ' + i.to_s

data/test/test_worker_2.rb

@@ -0,0 +1,32 @@
+begin
+    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue Exception
+    require 'simple_worker'
+end
+
+# Bump for new checksum.
+class TestWorker2 < SimpleWorker::Base
+
+    attr_accessor :s3_key, :times, :x
+
+    def who_am_i2?
+        return self.class.name
+    end
+
+    def run(data=nil)
+        log 'running the runner for leroy '.upcase + ' with data: ' + data.inspect
+
+        log 's3_key instance_variable = ' + self.s3_key
+        times.times do |i|
+            log 'running at ' + i.to_s
+            sleep 1
+            set_progress(:percent=> (i / times * 100))
+        end
+    end
+
+    def set_complete(params=nil)
+        log 'SET COMPLETE YAY!' + params[:task_set_id]
+    end
+
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 2
-  version: 0.1.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 -07:00
+date: 2010-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,7 +39,8 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - lib/simple_worker.rb
-- lib/worker.rb
+- lib/simple_worker/base.rb
+- lib/simple_worker/config.rb
 - README.markdown
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_worker
@@ -73,5 +74,7 @@ specification_version: 3
 summary: Classified
 test_files: 
 - test/scheduled_worker.rb
+- test/test_inheritance.rb
 - test/test_simple_worker.rb
 - test/test_worker.rb
+- test/test_worker_2.rb

data/lib/worker.rb

@@ -1,14 +0,0 @@
-# This is an abstract module that developers creating works can mixin/include to use the SimpleWorker special functions.
-module SimpleWorker
-
-    class Base
-
-        def log(str)
-            puts str.to_s
-        end
-
-        def set_progress(hash)
-            puts 'set_progress: ' + hash.inspect
-        end
-    end
-end