simple_worker 2.0.0.beta.15 → 2.0.0.beta.16

data/README.markdown

@@ -18,6 +18,7 @@ You really just need your token, which you can get [here][2]
 
     SimpleWorker.configure do |config|
         config.token = TOKEN
+        config.project_id = MY_PROJECT_ID
     end
     
 Generate a Worker with Rails

data/lib/simple_worker/api.rb

@@ -52,7 +52,7 @@ module SimpleWorker
         @port = options[:port] || @config.port || 443
         @token = options[:token] || @config.token || token
         @version = options[:version]
-        @logger = options[:logger]
+        #@logger = options[:logger]
 
         @base_url = "#{@scheme}://#{@host}:#{@port}/#{@version}"
 
@@ -72,15 +72,22 @@ module SimpleWorker
       end
 
       def url(command_path)
+        # @logger.debug "url: " + url.to_s
+        "/#{command_path}"
+      end
+
+      # Used for RestClient ones that haven't been converted to patron yet
+       def url_full(command_path)
         url = "#{base_url}/#{command_path}"
         # @logger.debug "url: " + url.to_s
         url
       end
 
       def process_ex(ex)
+        logger.error "EX #{ex.class.name}: #{ex.message}"
         body = ex.http_body
-        @logger.debug 'EX http_code: ' + ex.http_code.to_s
-        @logger.debug 'EX BODY=' + body.to_s
+        logger.debug 'EX http_code: ' + ex.http_code.to_s
+        logger.debug 'EX BODY=' + body.to_s
         decoded_ex = JSON.parse(body)
         exception = Exception.new(ex.message + ": " + decoded_ex["msg"])
         exception.set_backtrace(decoded_ex["backtrace"].split(",")) if decoded_ex["backtrace"]
@@ -106,7 +113,7 @@ module SimpleWorker
         full_url = url(method)
         all_params = add_params(method, params)
         url_plus_params = append_params(full_url, all_params)
-        @logger.debug 'get url=' + url_plus_params
+        logger.debug 'get url=' + url_plus_params
         response = @http_sess.request(:get, url_plus_params,
                                       {},
                                       {})
@@ -119,39 +126,39 @@ module SimpleWorker
       def post_file(method, file, params={}, options={})
         begin
           data = add_params(method, params).to_json
-          url = url(method) + "?oauth=" + token
-          @logger.debug "post_file url = " + url
-          @logger.debug "data = " + data
-          @logger.debug "params = " + params.inspect
-          @logger.debug "options = " + options.inspect
+          url = url_full(method)
+          logger.debug "post_file url = " + url
+          logger.debug "data = " + data
+          logger.debug "params = " + params.inspect
+          logger.debug "options = " + options.inspect
           # todo: replace with patron
-          parse_response(RestClient.post(append_params(url(method), add_params(method, params)), {:data => data, :file => file}, :content_type => 'application/json'), options)
-        rescue Exception => ex
+          parse_response(RestClient.post(append_params(url, add_params(method, params)), {:data => data, :file => file}, :content_type => 'application/json'), options)
+        rescue RestClient::Exception => ex
           process_ex(ex)
         end
       end
 
       def post(method, params={}, options={})
-        @logger.debug "params = " + params.inspect
-        @logger.debug "options = " + options.inspect
-        @logger.debug "params.payload = " + params[:payload].inspect
-        @logger.debug "token = "+ token.inspect
+        logger.debug "params = " + params.inspect
+        logger.debug "options = " + options.inspect
+        logger.debug "params.payload = " + params[:payload].inspect
+        logger.debug "token = "+ token.inspect
         begin
           url = url(method) + "?oauth=" + token
-          @logger.debug 'post url=' + url
+          logger.debug 'post url=' + url
           json = add_params(method, params).to_json
-          @logger.debug 'body=' + json
+          logger.debug 'body=' + json
           response = @http_sess.post(url, json, {"Content-Type" => 'application/json'})
           check_response(response)
-          @logger.debug 'response: ' + response.inspect
+          logger.debug 'response: ' + response.inspect
           body = response.body
           parse_response(body, options)
         rescue SimpleWorker::RequestError => ex
           # let it throw, came from check_response
           raise ex
         rescue Exception => ex
-          @logger.warn("Exception in post! #{ex.message}")
-          @logger.warn(ex.backtrace.join("\n"))
+          logger.warn("Exception in post! #{ex.message}")
+          logger.warn(ex.backtrace.join("\n"))
           process_ex(ex)
         end
       end
@@ -160,7 +167,7 @@ module SimpleWorker
       def put(method, body, options={})
         begin
           # todo: replace with patron
-          parse_response RestClient.put(url(method), add_params(method, body).to_json, headers), options
+          parse_response RestClient.put(url_full(method), add_params(method, body).to_json, headers), options
         rescue RestClient::Exception => ex
           process_ex(ex)
         end
@@ -169,7 +176,7 @@ module SimpleWorker
       def delete(method, params={}, options={})
         begin
           # todo: replace with patron
-          parse_response RestClient.delete(append_params(url(method), add_params(method, params))), options
+          parse_response RestClient.delete(append_params(url_full(method), add_params(method, params))), options
         rescue RestClient::Exception => ex
           process_ex(ex)
         end

data/lib/simple_worker/base.rb

@@ -6,6 +6,7 @@ module SimpleWorker
   class Base
 
     attr_accessor :task_set_id, :task_id, :schedule_id
+    attr_reader :response
 
     class << self
       attr_accessor :subclass, :caller_file
@@ -218,6 +219,7 @@ module SimpleWorker
 
       response = SimpleWorker.service.queue(self.class.name, sw_get_data, options)
       SimpleWorker.service.logger.debug 'queue response=' + response.inspect
+      @response = response
       @task_id = response["tasks"][0]["id"]
       response
     end

data/lib/simple_worker/config.rb

@@ -12,7 +12,7 @@ module SimpleWorker
   class Config
     attr_accessor :token,
                   :project_id,
-                :scheme,
+                  :scheme,
                   :host,
                   :port,
                   :global_attributes,
@@ -28,7 +28,7 @@ module SimpleWorker
                   :unmerged,
                   :merged_gems,
                   :unmerged_gems,
-        :force_upload
+                  :force_upload
 
 
     def initialize
@@ -134,7 +134,7 @@ module SimpleWorker
             end
           end
         else
-           SimpleWorker.logger.warn "Could not find '#{gem_info[:name]}' specified in Bundler, continuing anyways."
+          SimpleWorker.logger.warn "Could not find '#{gem_info[:name]}' specified in Bundler, continuing anyways."
         end
 #        else
 #          SimpleWorker.logger.warn "Could not find gem spec for #{gem_info[:name]}"

data/lib/simple_worker/service.rb

@@ -126,7 +126,6 @@ module SimpleWorker
       tmp_file = File.join(Dir.tmpdir(), 'runner.rb')
       File.open(tmp_file, "w") do |f|
 
-        f.write("begin\n") #error handling block start
         f.write("
 # Find environment (-e)
 dirname = ''
@@ -154,10 +153,7 @@ require 'json'
                            # require merged gems
         merged_gems.each_pair do |k, gem|
           SimpleWorker.logger.debug "Bundling gem #{gem[:name]}..."
-          if gem[:merge]
-            f.write "$LOAD_PATH << File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib')\n"
-          end
-          #              unless gem[:no_require]
+          f.write "$LOAD_PATH << File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib')\n"
           SimpleWorker.logger.debug 'writing requires: ' + gem[:require].inspect
           if gem[:require].nil?
             gem[:require] = []
@@ -246,13 +242,6 @@ end
   runner_return_data = runner.run
 ")
 
-        #error handling block - end
-        f.write("\nrescue Exception => ex
-                $stderr.puts '_error_from_sw_'
-                 raise ex
-                end
-                ")
-
       end
       #puts 'funner.rb=' + tmp_file
       merge['runner.rb'] = {:path=>tmp_file}
@@ -396,8 +385,8 @@ end
     end
 
     def check_config
-      if self.config.nil? || self.config.token.nil?
-        raise "Invalid SimpleWorker configuration, no access key specified."
+      if self.config.nil? || self.config.token.nil? || self.config.project_id.nil?
+        raise "Invalid SimpleWorker configuration, token and project_id required."
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta.15
+  version: 2.0.0.beta.16
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 Z
+date: 2011-11-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip