simple_worker 0.1.0 → 0.1.1

data/lib/simple_worker.rb

@@ -1,18 +1,14 @@
-require File.join(File.dirname(__FILE__), 'http_enabled')
-require File.join(File.dirname(__FILE__), 'api_auth')
+require 'appoxy_api'
 require File.join(File.dirname(__FILE__), 'worker')
-require File.join(File.dirname(__FILE__), 'simple_worker_error')
 
 
 module SimpleWorker
 
-    class Service < SimpleWorker::ApiAuth
-
-        include SimpleWorker::HttpEnabled
+    class Service < Appoxy::Api::Client
 
         def initialize(access_key, secret_key, options={})
             puts 'Starting SimpleWorker::Service...'
-            super(access_key, secret_key, options)
+            super("http://api.simpleworkr.com/api/", access_key, secret_key, options)
         end
 
         # Options:
@@ -23,26 +19,22 @@ module SimpleWorker
                 mystring = f.read
             end
             options = {"code"=>mystring, "class_name"=>class_name}
-            response = run_http(@host, @access_key, @secret_key, :post, "code/put", nil, options)
-#            puts "response=" + response
-            parse_response response
+            ret = post("code/put", options)
+            ret
         end
 
         #
         # data: 
         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["payload"] = data
             hash_to_send["class_name"] = class_name
             if defined?(RAILS_ENV)
                 hash_to_send["rails_env"] = RAILS_ENV
             end
-#            puts 'hash_to_send=' + hash_to_send.inspect
             return queue_raw(class_name, hash_to_send)
 
         end
@@ -50,21 +42,10 @@ module SimpleWorker
         def queue_raw(class_name, data={})
             params = nil
             hash_to_send = data
-            #            puts 'hash_to_send=' + hash_to_send.inspect
-            response = run_http(@host, @access_key, @secret_key, :put, "queue/add", hash_to_send, params)
-            #            puts "response=" + response
-
-            parse_response response
-
-        end
+            hash_to_send["class_name"] = class_name
+            ret = post("queue/add", hash_to_send)
+            ret
 
-        def parse_response(response)
-            begin
-                return ActiveSupport::JSON.decode(response)
-            rescue => ex
-                puts 'response that caused error = ' + response.to_s
-                raise ex
-            end
         end
 
 
@@ -80,52 +61,43 @@ module SimpleWorker
         #
         def schedule(class_name, data, schedule)
             raise "Schedule must be a hash." if !schedule.is_a? Hash
-            params = nil
-            if !data.is_a?(Array)
-                data = [data]
-            end
+#            if !data.is_a?(Array)
+#                data = [data]
+#            end
             hash_to_send = {}
-            hash_to_send["data"] = data
+            hash_to_send["payload"] = data
             hash_to_send["class_name"] = class_name
             hash_to_send["schedule"] = schedule
-#            puts 'hash_to_send=' + hash_to_send.inspect
-            response = run_http(@host, @access_key, @secret_key, :put, "queue/schedule", hash_to_send, params)
-#            puts "response=" + response
-            parse_response response
+            puts 'about to send ' + hash_to_send.inspect
+            ret = post("scheduler/schedule", hash_to_send)
+            ret
         end
 
-        #
-        #
-        #
-        def get_scheduled_tasks(schedule_id)
-            params = nil
-            if !data.is_a?(Array)
-                data = [data]
-            end
+        def cancel_schedule(scheduled_task_id)
+            raise "Must include a schedule id." if scheduled_task_id.blank?
             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(@host, @access_key, @secret_key, :put, "queue/add", hash_to_send, params)
-#            puts "response=" + response
-            parse_response response
+            hash_to_send["scheduled_task_id"] = scheduled_task_id
+            ret = post("scheduler/cancel", hash_to_send)
+            ret
+        end
+
+        def get_schedules()
+            hash_to_send = {}
+            ret = get("scheduler/list", hash_to_send)
+            ret
         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(@host, @access_key, @secret_key, :get, "task/status", nil, data)
-#            puts "response=" + response
-            parse_response response
+            ret = get("task/status", data)
+            ret
         end
 
         def log(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(@host, @access_key, @secret_key, :get, "task/log", nil, data)
-#            puts "response=" + response
-            ret = parse_response response
-            ret["log"] = Base64.decode64(ret["log"])
+            ret = get("task/log", data)
+            puts 'ret=' + ret.inspect
+#            ret["log"] = Base64.decode64(ret["log"])
             ret
         end
 

data/test/scheduled_worker.rb

@@ -3,7 +3,8 @@ require 'simple_worker'
 class ScheduledWorker < SimpleWorker::Base
 
     def scheduled_run(data=nil)
-        
+        log "This is scheduled yes it is"
+        log data.inspect
     end
 
 end

data/test/{simple_worker_tests.rb → test_simple_worker.rb}

@@ -22,16 +22,16 @@ class SimpleWorkerTests < Test::Unit::TestCase
 
 
         # Upload latest runner code
-        @worker.upload(File.join(File.dirname(__FILE__), "./test_runner.rb"), "TestWorker")
+        @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("TestRunner", {"s3_key"=>"single runner", "times"=>10})
+        response_hash_single = @worker.queue("TestWorker", {"s3_key"=>"single runner", "times"=>10})
 
         # task set
-        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
+        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"]
         while tasks.size > 0
             tasks.each do |t|
@@ -46,28 +46,29 @@ class SimpleWorkerTests < Test::Unit::TestCase
         # lets try to get the log now too
         task_id = response_hash_single["tasks"][0]["task_id"]
         puts 'task_id=' + task_id
-        puts 'log=' + @worker.log(task_id).inspect
+        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_runner.rb"), "ScheduledWorker")
+        @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("TestRunner", {"msg"=>"One time test."}, {:start_at=>start_at})
+        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("TestRunner", {"msg"=>"Run times test"}, {:start_at=>start_at, :run_every=>30, :run_times=>3})
+        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("TestRunner", {"msg"=>"End at test"}, {:start_at=>start_at, :run_every=>30, :end_at=>end_at, :run_times=>20})
+        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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,10 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 -08:00
+date: 2010-04-16 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: appoxy_api
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: I could tell you, but then I'd have to...
 email: travis@appoxy.com
 executables: []
@@ -22,10 +38,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- lib/api_auth.rb
-- lib/http_enabled.rb
 - lib/simple_worker.rb
-- lib/simple_worker_error.rb
 - lib/worker.rb
 - README.markdown
 has_rdoc: true
@@ -41,22 +54,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Classified
 test_files: 
 - test/scheduled_worker.rb
-- test/simple_worker_tests.rb
+- test/test_simple_worker.rb
 - test/test_worker.rb

data/lib/api_auth.rb

@@ -1,15 +0,0 @@
-module SimpleWorker
-
-    class ApiAuth
-
-        attr_accessor :host
-
-        def initialize(access_key, secret_key, options={})
-            @access_key = access_key
-            @secret_key = secret_key
-            @host = options[:host] || "http://simpleworker.appoxy.com/api/"
-
-        end
-    end
-
-end

data/lib/http_enabled.rb

@@ -1,119 +0,0 @@
-require 'rubygems'
-require 'active_support'
-require 'net/http'
-require 'base64'
-
-require File.join(File.dirname(__FILE__), 'simple_worker_error')
-
-begin
-    require 'digest/hmac'
-    USE_EMBEDDED_HMAC = false
-rescue
-    puts "HMAC, not found in standard lib." + $!.message
-    require 'hmac-sha1'
-    USE_EMBEDDED_HMAC = true
-end
-
-module SimpleWorker
-
-
-    module HttpEnabled
-
-        # body is a hash
-        def run_http(host, access_key, secret_key, http_method, command_path, body=nil, parameters={}, extra_headers=nil)
-            ts = generate_timestamp(Time.now.gmtime)
-            # puts 'timestamp = ' + ts
-            sig = generate_signature_v0(command_path, ts, secret_key)
-            # puts "My signature = " + sig
-            url = host + command_path
-            # puts url
-
-            user_agent = "Ruby Client"
-            headers = {'User-Agent' => user_agent}
-
-            if !extra_headers.nil?
-                extra_headers.each_pair do |k, v|
-                    headers[k] = v
-                end
-            end
-
-            extra_params = {'sigv'=>"0.1", 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
-            if http_method == :put
-                body.update(extra_params)
-            else
-                parameters = {} if parameters.nil?
-                parameters.update(extra_params)
-#                puts 'params=' + parameters.inspect
-
-            end
-
-
-            uri = URI.parse(url)
-            #puts 'body=' + body.to_s
-            if (http_method == :put)
-                req = Net::HTTP::Put.new(uri.path)
-                body = ActiveSupport::JSON.encode(body)
-                req.body = body unless body.nil?
-            elsif (http_method == :post)
-                req = Net::HTTP::Post.new(uri.path)
-                if !parameters.nil?
-                    req.set_form_data(parameters)
-                else
-                    req.body = body unless body.nil?
-                end
-            elsif (http_method == :delete)
-                req = Net::HTTP::Delete.new(uri.path)
-                if !parameters.nil?
-                    req.set_form_data(parameters)
-                end
-            else
-                req = Net::HTTP::Get.new(uri.path)
-                if !parameters.nil?
-                    req.set_form_data(parameters)
-                end
-            end
-            headers.each_pair do |k, v|
-                req[k] = v
-            end
-            # req.each_header do |k, v|
-            # puts 'header ' + k + '=' + v
-            #end
-            res = Net::HTTP.start(uri.host, uri.port) do |http|
-                http.request(req)
-            end
-
-            ret = ''
-            case res
-                when Net::HTTPSuccess
-                    # puts 'response body=' + res.body
-                    ret = res.body
-                when Net::HTTPClientError
-                    raise SimpleWorker::ClientError.new(res.class.name, ActiveSupport::JSON.decode(res.body))
-                else
-                    #res.error
-                    raise SimpleWorker::ServiceError.new(res.class.name, res.body)
-            end
-            return ret
-        end
-
-        def generate_timestamp(gmtime)
-            return gmtime.strftime("%Y-%m-%dT%H:%M:%SZ")
-        end
-
-        def generate_signature_v0(operation, timestamp, secret_key)
-            HttpEnabled.generate_signature_v0(operation, timestamp, secret_key)
-        end
-
-        def self.generate_signature_v0(operation, timestamp, secret_key)
-            if USE_EMBEDDED_HMAC
-                my_sha_hmac = HMAC::SHA1.digest(secret_key, operation + timestamp)
-            else
-                my_sha_hmac = Digest::HMAC.digest(operation + timestamp, secret_key, Digest::SHA1)
-            end
-            my_b64_hmac_digest = Base64.encode64(my_sha_hmac).strip
-            return my_b64_hmac_digest
-        end
-    end
-
-end
-

data/lib/simple_worker_error.rb

@@ -1,22 +0,0 @@
-module SimpleWorker
-    class ClientError < StandardError
-
-        attr_reader :response_hash
-
-        def initialize(class_name, response_hash)
-            puts 'response-hash=' + response_hash.inspect
-            super("#{class_name} - #{response_hash["msg"]}")
-            @response_hash = response_hash
-        end
-    end
-
-    class ServiceError < StandardError
-        attr_reader :body
-
-        def initialize(class_name, body)
-            super("#{class_name}")
-            @body = body
-
-        end
-    end
-end