simple_worker 0.0.1 → 0.0.2

data/lib/http_enabled.rb

@@ -15,7 +15,7 @@ end
 
 module SimpleWorker
 
-    DEFAULT_HOST = "http://simpleworker.appoxy.com/api/v1/"
+    DEFAULT_HOST = "http://simpleworker.appoxy.com/api/"
 
     module HttpEnabled
 
@@ -49,7 +49,7 @@ module SimpleWorker
             else
                 parameters = {} if parameters.nil?
                 parameters.update(extra_params)
-                puts 'params=' + parameters.inspect
+#                puts 'params=' + parameters.inspect
 
             end
 

data/lib/simple_worker.rb

@@ -0,0 +1,53 @@
+require File.join(File.dirname(__FILE__), 'http_enabled')
+require File.join(File.dirname(__FILE__), 'api_auth')
+
+module SimpleWorker
+
+    class Base < SimpleWorker::ApiAuth
+
+        include SimpleWorker::HttpEnabled
+
+        def initialize(access_key, secret_key)
+            super(access_key, secret_key)
+        end
+
+        # Options:
+        #    - :callback_url
+        def upload(filename, class_name, options={})
+            mystring = nil
+            file = File.open(filename, "r") do |f|
+                mystring = f.read
+            end
+            options = {"code"=>mystring, "class_name"=>class_name}
+            response = run_http(@access_key, @secret_key, :post, "code/put", nil, options)
+            puts "response=" + response
+            return ActiveSupport::JSON.decode(response)
+        end
+
+
+        def queue(class_name, data={})
+
+            params = nil
+            if !data.is_a?(Array)
+                data = [data]
+            end
+            hash_to_send = {}
+            hash_to_send["data"] = data
+            hash_to_send["class_name"] = class_name
+            puts 'hash_to_send=' + hash_to_send.inspect
+            response = run_http(@access_key, @secret_key, :put, "queue/add", hash_to_send, params)
+            puts "response=" + response
+            return ActiveSupport::JSON.decode(response)
+        end
+
+
+        def status(task_id)
+            data = {"task_id"=>task_id}
+            #puts run_http(@access_key, @secret_key, :post, "queue/status", nil, {"task_id"=>@task_id})
+            response = run_http(@access_key, @secret_key, :get, "queue/status", nil, data)
+            puts "response=" + response
+            return ActiveSupport::JSON.decode(response)
+        end
+
+    end
+end

data/test/simple_worker_tests.rb

@@ -1,9 +1,11 @@
 require 'test/unit'
+require 'yaml'
+require File.join(File.dirname(__FILE__), '../lib/simple_worker')
 
 class SimpleWorkerTests < Test::Unit::TestCase
 
     def setup
-        @config = YAML::load(File.open(File.expand_path("~/.testconfigs/simple_worker.yml")))
+        @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']
@@ -15,22 +17,27 @@ class SimpleWorkerTests < Test::Unit::TestCase
 
     def test_queue
 
+        worker = SimpleWorker::Base.new(@access_key, @secret_key)
+
         # Upload latest runner code
-        uploader = SimpleWorker::Uploader.new(@access_key, @secret_key)
-        uploader.put("../workers/test_runner.rb", "TestRunner")
+        worker.upload(File.join(File.dirname(__FILE__), "./test_runner.rb"), "TestRunner")
 
         # Add something to queue, get task ID back
-        queue = SimpleWorker::Queue.new(@access_key, @secret_key)
         # Single task
-        response_hash = queue.add("TestRunner", {"s3_key"=>"single runner", "times"=>10})
+        response_hash = worker.queue("TestRunner", {"s3_key"=>"single runner", "times"=>10})
         # task set
-        response_hash = queue.add("TestRunner", [{"id"=>"local_id", "s3_key"=>"some key", "times"=>4}, {"s3_key"=>"some key2", "times"=>3}, {"s3_key"=>"some key", "times"=>2}])
+        response_hash = worker.queue("TestRunner", [{"id"=>"local_id", "s3_key"=>"some key", "times"=>4}, {"s3_key"=>"some key2", "times"=>3}, {"s3_key"=>"some key", "times"=>2}])
 
         # Check status
-        status = SimpleWorker::Status.new(@access_key, @secret_key)
         tasks = response_hash["tasks"]
-        tasks.each do |t|
-            status.check(t["task_id"])
+        while tasks.size > 0
+            tasks.each do |t|
+                status_response = worker.status(t["task_id"])
+                puts 'status for ' + t["task_id"] + ' = ' + status_response["status"]
+                if status_response["status"] == "complete"
+                    tasks.delete(t)
+                end
+            end
         end
 
 

data/test/test_runner.rb

@@ -0,0 +1,28 @@
+
+class TestRunner
+
+
+    def run(data=nil)
+        puts 'running the runner for leroy '.upcase + ' with data: ' + data.inspect
+        @times = data["times"].to_i
+        @times.times do |i|
+            puts 'running at ' + i.to_s
+            sleep 1
+        end
+    end
+
+    def set_complete(params=nil)
+        puts 'SET COMPLETE YAY!' + params[:task_set_id]
+    end
+
+    def progress
+        if @count
+            return @count / @times
+        end
+        return 0.0
+    end
+
+
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 -07:00
+date: 2009-11-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - lib/api_auth.rb
 - lib/http_enabled.rb
 - lib/queue.rb
+- lib/simple_worker.rb
 - lib/status.rb
 - lib/uploader.rb
 - README.markdown
@@ -58,3 +59,4 @@ specification_version: 3
 summary: Classified
 test_files: 
 - test/simple_worker_tests.rb
+- test/test_runner.rb