simple_worker 2.0.0.beta.5 → 2.0.0.beta.6

data/lib/simple_worker/api.rb

@@ -59,54 +59,42 @@ module SimpleWorker
       end
 
       def get(method, params={}, options={})
-        #begin
-#                ClientHelper.run_http(host, access_key, secret_key, :get, method, nil, params)
-          full_url = url(method)
-          all_params = add_params(method,params)
-
-          url_plus_params = append_params(full_url, all_params)
-          resp = RestClient.get(url_plus_params, headers)
-
-          parse_response(resp, options)
-        
-          # Was: 
-          #parse_response RestClient.get(append_params(url(method), add_params(method, params)), headers), options
-        #rescue RestClient::Exception  => ex
-        #  process_ex(ex)
-        #end
+        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
+        resp = RestClient.get(url_plus_params, headers)
+
+        parse_response(resp, options)
+
       end
 
       def post_file(method, file, params={}, options={})
         begin
-          #params.delete("runtime")
-          #params["runtime"]='ruby'
-          #params.delete("file_name")
-          #params["file_name"] = "runner.rb"
           data = add_params(method, params).to_json
           @logger.debug "data = " + data
           @logger.debug "params = " + params.inspect
           @logger.debug "options = " + options.inspect
-          token = params["oauth"]
-          parse_response RestClient.post(url(method) + "?oauth="+token, {:data => data, :file => file}, :content_type => 'application/json', :accept => :json), options
-          #parse_response(RestClient.post(append_params(url(method), add_params(method, params)), {:data => data, :file => file}, :content_type => 'application/json'), options)
-        rescue RestClient::Exception  => ex
+          parse_response RestClient.post(url(method) + "?oauth=" + token, {:data => data, :file => file}, :content_type => 'application/json', :accept => :json), options
+            #parse_response(RestClient.post(append_params(url(method), 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
-          token = params["token"]
-          @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
-          # here's what get() does:
-          #parse_response RestClient.get(append_params(url(method), add_params(method, params)), headers), options
-          parse_response(RestClient.post(url(method)+"?oauth="+token, add_params(method, params).to_json, headers.merge!({:content_type=>'application/json', :accept => "json"})), options)
-          # was , add_params(method, params).to_json, headers.merge!({:content_type=>'application/json'})), options)
-          #ClientHelper.run_http(host, access_key, secret_key, :post, method, nil, params)
-        rescue RestClient::Exception  => ex
+          url = url(method) + "?oauth=" + token
+          @logger.debug 'post url=' + url
+          parse_response(RestClient.post(url, add_params(method, params).to_json, headers.merge!({:content_type=>'application/json', :accept => "json"})), options)
+        rescue RestClient::Exception => ex
+          @logger.warn("Exception in post! #{ex.message}")
+          @logger.warn(ex.backtrace.join("\n"))
           process_ex(ex)
         end
       end
@@ -115,8 +103,7 @@ module SimpleWorker
       def put(method, body, options={})
         begin
           parse_response RestClient.put(url(method), add_params(method, body).to_json, headers), options
-          #ClientHelper.run_http(host, access_key, secret_key, :put, method, body, nil)
-        rescue RestClient::Exception  => ex
+        rescue RestClient::Exception => ex
           process_ex(ex)
         end
       end
@@ -130,9 +117,7 @@ module SimpleWorker
       end
 
       def add_params(command_path, hash)
-        v = version || "2.0"
-        ts = SimpleWorker::Api::Signatures.generate_timestamp(Time.now.gmtime)
-        extra_params = {'version'=>v, 'timestamp' => ts, 'oauth' => token}
+        extra_params = {'oauth' => token}
         hash.merge!(extra_params)
       end
 

data/lib/simple_worker/base.rb

@@ -378,34 +378,17 @@ module SimpleWorker
         end
       end
 
-#      puts 'upload_if_needed ' + self.class.name
-# Todo, watch for this file changing or something so we can reupload (if in dev env)
-      unless uploaded?
+      if !uploaded?
         unmerged = self.class.instance_variable_get(:@unmerged)
         merged_gems = self.class.instance_variable_get(:@merged_gems)
         merged_mailers = self.class.instance_variable_get(:@merged_mailers)
         merged_folders = self.class.instance_variable_get(:@merged_folders)
-#        puts 'merged1=' + merged.inspect
-
         merged, rfile, subclass = SimpleWorker::Base.extract_superclasses_merges(self, merged)
-#if SimpleWorker.config.auto_merge
-#        puts "Auto merge Enabled"
-#if SimpleWorker.config.models
-#  SimpleWorker.config.models.each do |m|
-#    merged[m] = m
-#  end
-#end
         merged_mailers = merged_mailers.merge(SimpleWorker.config.mailers) if SimpleWorker.config.mailers
-#SimpleWorker.config.gems.each do |gem|
-#  merged_gems[gem[:name]] = gem
-#end
-#end
         unless merged_gems.size == 0
           merged_gems = gems_to_merge(merged_gems)
-          #merged_gems.uniq!
         end
-#merged.uniq!
-#        merged_mailers.uniq!
+
         options_for_upload = {:merge=>merged, :unmerge=>unmerged, :merged_gems=>merged_gems, :merged_mailers=>merged_mailers, :merged_folders=>merged_folders}
         options_for_upload.merge!(options)
         SimpleWorker.service.upload(rfile, subclass.name, options_for_upload)
@@ -414,7 +397,6 @@ module SimpleWorker
         SimpleWorker.logger.debug 'Already uploaded for ' + self.class.name
       end
 
-
       after_upload
     end
 

data/lib/simple_worker/config.rb

@@ -26,7 +26,8 @@ module SimpleWorker
                   :merged,
                   :unmerged,
                   :merged_gems,
-                  :unmerged_gems
+                  :unmerged_gems,
+        :force_upload
 
 
     def initialize
@@ -157,6 +158,7 @@ module SimpleWorker
       config_data['mailer'] = self.mailer if self.mailer
       config_data['global_attributes'] = self.global_attributes if self.global_attributes
       config_data['host'] = self.host if self.host
+      config_data['port'] = self.port if self.port
       config_data
     end
 

data/lib/simple_worker/server/overrides.rb

@@ -175,8 +175,8 @@ module SimpleWorker
     end
 
     def add_sw_params(hash_to_send)
-      hash_to_send["token"] = self.config['token']
-      hash_to_send["project_id"] = self.config['project_id']
+      hash_to_send["token"] = self.config.token
+      hash_to_send["project_id"] = self.config.project_id
       hash_to_send["api_version"] = SimpleWorker.api_version
     end
   end

data/lib/simple_worker/server/runner.rb

@@ -65,7 +65,7 @@ def init_worker_service_for_runner(job_data)
     config.project_id = sw_config['project_id']
     #puts 'Setting host to ' + host.inspect
     config.host = sw_config['host'] if sw_config['host']
-    config.host = sw_config['port'] if sw_config['port']
+    config.port = sw_config['port'] if sw_config['port']
     db_config = sw_config['database']
     if db_config
       config.database = db_config

data/lib/simple_worker/service.rb

@@ -24,6 +24,7 @@ module SimpleWorker
       options[:logger] = SimpleWorker.logger
       super("api2.simpleworker.com", token, options)
       self.host = self.config.host if self.config && self.config.host
+      self.config.merge_gem('simple_worker')#automerge simple worker gem
       SimpleWorker.logger.info 'SimpleWorker initialized.'
       SimpleWorker.logger.debug ' host = ' + self.host.inspect
     end
@@ -46,7 +47,7 @@ module SimpleWorker
 # Check for code changes.
       md5 = Digest::MD5.hexdigest(File.read(filename))
       new_code = false
-      if md5 != existing_md5
+      if self.config.force_upload || md5 != existing_md5
         SimpleWorker.logger.info "Uploading #{class_name}, code modified."
         File.open(md5_f, 'w') { |f| f.write(md5) }
         new_code = true
@@ -90,7 +91,7 @@ module SimpleWorker
       SimpleWorker.logger.debug 'gems found=' + gems.inspect
       gems = gems.select { |g| g.version.version==gem_info[:version] } if gem_info[:version]
       if !gems.empty?
-        gem = gems.first
+        gem = gems.last
         gem.full_gem_path
       else
         return nil
@@ -420,7 +421,7 @@ end
       hash_to_send["class_name"] = class_name unless hash_to_send["class_name"]
       hash_to_send["name"] = class_name unless hash_to_send["name"]
       uri = project_url_prefix(get_project_id(options)) + "jobs"
-      SimpleWorker.logger.info 'queue_raw , uri = ' + uri
+      SimpleWorker.logger.debug 'queue_raw , uri = ' + uri
       ret = post(uri, hash_to_send)
       ret
     end
@@ -523,10 +524,10 @@ end
       ret
     end
 
-    # data is a hash, should include 'percent' and 'message'
-    def set_progress(task_id, data)
-      data={"data"=>data, "task_id"=>task_id}
-      post("task/setstatus", data)
+    # data is a hash, should include 'percent' and 'msg'
+    def set_progress(task_id, options={})
+      #data={"data"=>data, "task_id"=>task_id}
+      post("#{project_url_prefix(get_project_id(options))}jobs/#{task_id}/progress", options)
     end
 
 

metadata

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