simple_worker 2.0.0.beta.7 → 2.0.0.beta.8

data/lib/simple_worker/api.rb

@@ -33,17 +33,18 @@ module SimpleWorker
       attr_accessor :host, :port, :token, :version, :config
 
       def initialize(host, token, options={})
-        @host = host
         @config = options[:config]
+        @scheme = options[:scheme] || @config.scheme || "https"
+        @host = options[:host] || @config.host || host
         @port = options[:port] || @config.port || 80
-        @token = token
+        @token = options[:token] || @config.token || token
         @version = options[:version]
         @logger = options[:logger]
 
       end
 
       def url(command_path)
-        url = "http://#{host}:#{port}/#{@version}/#{command_path}"
+        url = "#{@scheme}://#{host}:#{port}/#{@version}/#{command_path}"
         # @logger.debug "url: " + url.to_s
         url
       end
@@ -73,10 +74,12 @@ 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
-          parse_response RestClient.post(url(method) + "?oauth=" + token, {:data => data, :file => file}, :content_type => 'application/json', :accept => :json), options
+          parse_response RestClient.post(url, {: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)
@@ -90,7 +93,7 @@ module SimpleWorker
         @logger.debug "token = "+ token.inspect
         begin
           url = url(method) + "?oauth=" + token
-          @logger.debug 'post url=' + url
+          @logger.warn '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}")

data/lib/simple_worker/config.rb

@@ -12,6 +12,7 @@ module SimpleWorker
   class Config
     attr_accessor :token,
                   :project_id,
+                :scheme,
                   :host,
                   :port,
                   :global_attributes,
@@ -157,6 +158,7 @@ module SimpleWorker
       config_data['database'] = self.database if self.database
       config_data['mailer'] = self.mailer if self.mailer
       config_data['global_attributes'] = self.global_attributes if self.global_attributes
+      config_data['scheme'] = self.scheme if self.scheme
       config_data['host'] = self.host if self.host
       config_data['port'] = self.port if self.port
       config_data

data/lib/simple_worker/server/overrides.rb

@@ -98,7 +98,8 @@ module SimpleWorker
     end
 
     def set_progress(hash)
-      SimpleWorker.service.set_progress(@job_data["task_id"], hash)
+      #puts 'set_progress self=' + self.inspect
+      SimpleWorker.service.set_progress(self.task_id, hash)
     end
 
     def something

data/lib/simple_worker/server/runner.rb

@@ -1,6 +1,5 @@
 # This is the file that gets executed on the server.
 
-
 def init_database_connection(sw_config)
   if sw_config
     db_config = sw_config['database']
@@ -42,7 +41,7 @@ def constantize(camel_cased_word)
   constant
 end
 
-def init_runner(runner_class, job_data, user_dir)
+def init_runner(runner_class, job_data, user_dir, task_id)
   # ensure initialize takes no arguments
   init_arity = runner_class.instance_method(:initialize).arity
   if init_arity == 0 || init_arity == -1
@@ -51,6 +50,7 @@ def init_runner(runner_class, job_data, user_dir)
     raise SimpleWorker::InvalidWorkerError, "Worker initialize method must accept zero arguments."
   end
   runner = runner_class.new
+  runner.instance_variable_set(:@task_id, task_id)
   runner.instance_variable_set(:@job_data, job_data)
   runner.instance_variable_set(:@sw_config, job_data['sw_config'])
   runner.instance_variable_set(:@user_dir, user_dir)
@@ -63,7 +63,7 @@ def init_worker_service_for_runner(job_data)
     sw_config = job_data['sw_config']
     config.token = sw_config['token']
     config.project_id = sw_config['project_id']
-    #puts 'Setting host to ' + host.inspect
+    config.scheme = sw_config['scheme'] if sw_config['scheme']
     config.host = sw_config['host'] if sw_config['host']
     config.port = sw_config['port'] if sw_config['port']
     db_config = sw_config['database']
@@ -78,22 +78,3 @@ def init_worker_service_for_runner(job_data)
   end
 end
 
-# SimpleWorker.logger.level ==  Logger::DEBUG
-run_data = JSON.load(File.open(run_data_file))
-# Load in job data
-job_data = JSON.load(File.open(job_data_file))
-job_data.merge!(run_data)
-SimpleWorker.logger.debug 'job_data=' + job_data.inspect
-
-sw_config = job_data['sw_config']
-init_database_connection(sw_config)
-init_mailer(sw_config)
-SimpleWorker.disable_queueing()
-runner_class = get_class_to_run(job_data['class_name'])
-SimpleWorker.running_class = runner_class
-runner = init_runner(runner_class, job_data, dirname)
-init_worker_service_for_runner(job_data)
-SimpleWorker.enable_queueing()
-
-# Let's run it!
-runner_return_data = runner.run

data/lib/simple_worker/service.rb

@@ -125,38 +125,72 @@ module SimpleWorker
       #tmp_file = File.join(Dir.tmpdir(), File.basename(filename))
       tmp_file = File.join(Dir.tmpdir(), 'runner.rb')
       File.open(tmp_file, "w") do |f|
+        File.open(File.join(File.dirname(__FILE__), "server", 'runner.rb'), 'r') do |fr|
+          while line = fr.gets
+            f.write line
+          end
+        end
         f.write("begin\n")#error handling block start
         f.write("
 # Find environment (-e)
 dirname = ''
 i = 0
-job_data_file = run_data_file = nil
+task_data_file = nil
+task_id = nil
 #puts \"args for single file=\" + ARGV.inspect
 ARGV.each do |arg|
   if arg == \"-d\"
     # the user's writable directory
     dirname = ARGV[i+1]
   end
-  if arg == \"-j\"
-    # path to job data
-    job_data_file = ARGV[i+1]
+  if arg == \"-id\"
+    # task_id
+    task_id = ARGV[i+1]
   end
-  if arg == \"-p\"
-    # path to run data
-    run_data_file = ARGV[i+1]
+  if arg == \"-payload\"
+    # path to job data
+    task_data_file = ARGV[i+1]
   end
   i+=1
 end
+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]
+          SimpleWorker.logger.debug 'writing requires: ' + gem[:require].inspect
+          if gem[:require].nil?
+            gem[:require] = []
+          elsif gem[:require].is_a?(String)
+            gem[:require] = [gem[:require]]
+          end
+          SimpleWorker.logger.debug "gem[:require]: " + gem[:require].inspect
+          gem[:require].each do |r|
+            SimpleWorker.logger.debug 'adding require to file ' + r.to_s
+            f.write "require '#{r}'\n"
+          end
+#              end
+         end
 
+        # load job data
+f.write("
 # Change to user directory
 #puts 'dirname=' + dirname.inspect
 Dir.chdir(dirname)
+# Load in job data
+job_data = JSON.load(File.open(task_data_file))
+puts 'job_data=' + job_data.inspect
+sw_config = job_data['sw_config']
+init_database_connection(sw_config)
+init_mailer(sw_config)
 ")
 
-
         f.write("require 'simple_worker'\n")
 
-
         # add some rails stuff if using Rails
         if defined?(Rails)
           f.write "module Rails
@@ -180,25 +214,6 @@ end
           f.write "ActionMailer::Base.prepend_view_path('templates')\n"
         end
         #if SimpleWorker.config.auto_merge
-        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]
-          SimpleWorker.logger.debug 'writing requires: ' + gem[:require].inspect
-          if gem[:require].nil?
-            gem[:require] = []
-          elsif gem[:require].is_a?(String)
-            gem[:require] = [gem[:require]]
-          end
-          SimpleWorker.logger.debug "gem[:require]: " + gem[:require].inspect
-          gem[:require].each do |r|
-            SimpleWorker.logger.debug 'adding require to file ' + r.to_s
-            f.write "require '#{r}'\n"
-          end
-#              end
-        end
 
         if SimpleWorker.config.extra_requires
           SimpleWorker.config.extra_requires.each do |r|
@@ -224,11 +239,20 @@ end
         #f.write File.open(filename, 'r') { |mo| mo.read }
         f.write("require_relative '#{File.basename(filename)}'")
 
-        File.open(File.join(File.dirname(__FILE__), "server", 'runner.rb'), 'r') do |fr|
-          while line = fr.gets
-            f.write line
-          end
-        end
+
+
+        f.write("
+  SimpleWorker.disable_queueing()
+  runner_class = get_class_to_run(job_data['class_name'])
+  SimpleWorker.running_class = runner_class
+  runner = init_runner(runner_class, job_data, dirname, task_id)
+  init_worker_service_for_runner(job_data)
+  SimpleWorker.enable_queueing()
+
+# Let's run it!
+  runner_return_data = runner.run
+")
+
         #error handling block - end
         f.write("\nrescue Exception => ex
                 $stderr.puts '_error_from_sw_'
@@ -343,7 +367,7 @@ end
       }
       #puts 'options for upload=' + options.inspect
       SimpleWorker.logger.info "Uploading now..."
-      ret = post_file("#{project_url_prefix(get_project_id(options))}workers", File.new(package_file), options)
+      ret = post_file("#{project_url_prefix(get_project_id(options))}codes", File.new(package_file), options)
       SimpleWorker.logger.info "Done uploading."
       return ret
     end
@@ -420,7 +444,7 @@ end
       hash_to_send = data
       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"
+      uri = project_url_prefix(get_project_id(options)) + "tasks"
       SimpleWorker.logger.debug 'queue_raw , uri = ' + uri
       ret = post(uri, hash_to_send)
       ret
@@ -480,9 +504,9 @@ end
       ret
     end
 
-    def get_workers(options={})
+    def get_codes(options={})
       hash_to_send = {}
-      uri = "projects/" + get_project_id(options) + "/workers/"
+      uri = "projects/" + get_project_id(options) + "/codes/"
       ret = get(uri, hash_to_send)
       ret
     end
@@ -496,7 +520,7 @@ end
 
     def get_jobs(options={})
       hash_to_send = {}
-      uri = "projects/" + get_project_id(options) + "/jobs/"
+      uri = "projects/" + get_project_id(options) + "/tasks/"
       ret = get(uri, hash_to_send)
       ret
     end
@@ -507,14 +531,14 @@ end
 
     def log(task_id, options={})
       data = {}
-      ret = get("#{project_url_prefix(get_project_id(options))}jobs/#{task_id}/log", data, :parse=>false)
+      ret = get("#{project_url_prefix(get_project_id(options))}tasks/#{task_id}/log", data, :parse=>false)
       ret
     end
 
 
     def status(task_id, options={})
       data = {"task_id"=>task_id}
-      ret = get("#{project_url_prefix(get_project_id(options))}jobs/#{task_id}", data)
+      ret = get("#{project_url_prefix(get_project_id(options))}tasks/#{task_id}", data)
       ret
     end
 
@@ -527,7 +551,7 @@ end
     # 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)
+      post("#{project_url_prefix(get_project_id(options))}tasks/#{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.7
+  version: 2.0.0.beta.8
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-01 00:00:00 Z
+date: 2011-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip