simple_worker 1.0.5 → 1.0.6

data/README.markdown

@@ -28,6 +28,19 @@ You really just need your access keys.
         config.access_key = ACCESS_KEY
         config.secret_key = SECRET_KEY
     end
+    
+Generate a Worker with Rails
+----------------------------
+If you're rolling on Rails, use the following:    
+
+    rails generate simple_worker worker_class_in_underscore_format
+    
+This will set you up with a worker in ```app/workers```  
+However, this is not autorequired, so a line similar to this will be required in your initializer:  
+
+    Dir.glob("#{Rails.root}/app/workers/*.rb").each{|w| require w}
+    
+This one-liner requires all ```.rb``` files in ```app/workers```  
 
 Write a Worker
 --------------

data/lib/generators/simple_worker/simple_worker_generator.rb

@@ -0,0 +1,13 @@
+class SimpleWorkerGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path("../templates", __FILE__)
+ 
+  desc "Creates a new skeleton worker - NAME is camelized"
+  def create_worker_file
+    # file_name needs to be classified
+    @camel = file_name.camelize
+    if not File.directory? "#{Rails.root}/app/workers"
+      Dir.mkdir "#{Rails.root}/app/workers"
+    end
+    template "template_worker.erb", "app/workers/#{file_name}.rb" 
+  end
+end

data/lib/simple_worker/api.rb

@@ -1,3 +1,5 @@
+require 'rest_client'
+
 module SimpleWorker
   module Api
 
@@ -45,9 +47,9 @@ module SimpleWorker
 
       def process_ex(ex)
         body = ex.http_body
-        puts 'EX BODY=' + body.to_s
-        decoded_ex = JSON.parse(ex.http_body)
-        exception = Exception.new(ex.message+":"+decoded_ex["msg"])
+        @@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"]
         raise exception
       end
@@ -56,7 +58,7 @@ module SimpleWorker
         begin
 #                ClientHelper.run_http(host, access_key, secret_key, :get, method, nil, params)
           parse_response RestClient.get(append_params(url(method), add_params(method, params)), headers), options
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+        rescue RestClient::Exception  => ex
           process_ex(ex)
         end
       end
@@ -64,7 +66,7 @@ module SimpleWorker
       def post_file(method, file, params={}, options={})
         begin
           parse_response RestClient.post(url(method), add_params(method, params).merge!({:file=>file}), :multipart => true), options
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+        rescue RestClient::Exception  => ex
           process_ex(ex)
         end
       end
@@ -73,7 +75,7 @@ module SimpleWorker
         begin
           parse_response RestClient.post(url(method), add_params(method, params).to_json, headers), options
           #ClientHelper.run_http(host, access_key, secret_key, :post, method, nil, params)
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+        rescue RestClient::Exception  => ex
           process_ex(ex)
         end
       end
@@ -83,7 +85,7 @@ module SimpleWorker
         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::BadRequest, RestClient::InternalServerError => ex
+        rescue RestClient::Exception  => ex
           process_ex(ex)
         end
       end
@@ -91,7 +93,7 @@ module SimpleWorker
       def delete(method, params={}, options={})
         begin
           parse_response RestClient.delete(append_params(url(method), add_params(method, params))), options
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+        rescue RestClient::Exception => ex
           process_ex(ex)
         end
       end

data/lib/simple_worker/base.rb

@@ -238,21 +238,9 @@ module SimpleWorker
     # todo: add a :timeout option
     def wait_until_complete
       check_service
-      tries = 0
-      status = nil
-      sleep 1
-      while tries < 100
-        status = self.status
-        puts "Waiting... status=" + status["status"]
-        if status["status"] != "queued" && status["status"] != "running"
-          break
-        end
-        sleep 2
-      end
-      status
+      SimplerWorker.service.wait_until_complete(self.task_id)
     end
 
-
     def upload
       upload_if_needed
     end

data/lib/simple_worker/server/overrides.rb

@@ -1,12 +1,9 @@
-
 # This is used when a bad worker is uploaded.
-class InvalidWorkerError < StandardError
-
-end
-
 
 module SimpleWorker
 
+  class InvalidWorkerError < StandardError; end
+
   class << self
     def running_class=(rc)
       @@running_class = rc
@@ -110,7 +107,7 @@ module SimpleWorker
 
     def user_dir
 #      puts 'user_dir=' + @context.user_dir.to_s
-      @context.user_dir
+      @user_dir || "./"
     end
 
     def sw_set_data(data)

data/lib/simple_worker/server/runner.rb

@@ -13,21 +13,35 @@ def init_database_connection(sw_config)
 end
 
 def get_class_to_run(class_name)
-  runner_class = Kernel.const_get(class_name)
+  runner_class = constantize(class_name)
   return runner_class
 end
 
-def init_runner(runner_class, job_data)
+# File activesupport/lib/active_support/inflector/methods.rb, line 107
+# Shoutout to the MIT License
+def constantize(camel_cased_word)
+  names = camel_cased_word.split('::')
+  names.shift if names.empty? || names.first.empty?
+
+  constant = Object
+  names.each do |name|
+    constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+  end
+  constant
+end
+
+def init_runner(runner_class, job_data, user_dir)
   # ensure initialize takes no arguments
   init_arity = runner_class.instance_method(:initialize).arity
   if init_arity == 0 || init_arity == -1
     # good. -1 can be if it's not defined at all
   else
-    raise InvalidWorkerError, "Worker initialize method must accept zero arguments."
+    raise SimpleWorker::InvalidWorkerError, "Worker initialize method must accept zero arguments."
   end
   runner = runner_class.new
   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)
   runner.sw_set_data(job_data)
   runner
 end
@@ -84,7 +98,7 @@ begin
   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)
+  runner = init_runner(runner_class, job_data, dirname)
   init_worker_service_for_runner(job_data)
   SimpleWorker.enable_queueing()
 

data/lib/simple_worker/service.rb

@@ -56,20 +56,9 @@ module SimpleWorker
       begin
 
         zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:merged_mailers], options[:merged_folders])
-        SimpleWorker.logger.info 'file size to upload: ' + File.size(zip_filename).to_s
 
         if new_code
-          options = {
-              "class_name"=>class_name,
-              "name"=>name,
-              "standalone"=>true,
-              "file_name"=> "runner.rb" # File.basename(filename)
-          }
-          #puts 'options for upload=' + options.inspect
-          SimpleWorker.logger.info "Uploading now..."
-          ret = post_file("code/put", File.new(zip_filename), options)
-          SimpleWorker.logger.info "Done uploading."
-          return ret
+          upload_code(name, zip_filename, 'runner.rb', :runtime=>'ruby')
         end
 
       rescue => ex
@@ -252,7 +241,7 @@ end
                 # todo: should only continue if the gem was auto merged.
                 SimpleWorker.logger.warn "Gem #{gem[:name]} #{gem[:version]} was not found, continuing anyways."
               else
-                raise "Gem #{gem[:name]} #{gem[:version]} was not found, continuing anyways."
+                raise "Gem #{gem[:name]} #{gem[:version]} was not found. This will occour when gem_name.gemspec is not the same as the gems primary require."
               end
 
             end
@@ -292,6 +281,52 @@ end
       fname2
     end
 
+    # This will package up files into a zip file ready for uploading.
+    def package_code(files)
+      fname2 = "package.zip"
+      File.delete(fname2) if File.exist?(fname2)
+      Zip::ZipFile.open(fname2, 'w') do |f|
+        files.each do |file|
+          f.add(file, file)
+        end
+      end
+      fname2
+    end
+
+    # options:
+    #   :runtime => 'ruby', 'python', 'node', 'java', 'go'
+    def upload_code(name, package_file, exec_file, options={})
+      SimpleWorker.logger.info 'file size to upload: ' + File.size(package_file).to_s
+      options = {
+          "name"=>name,
+          "class_name"=>name, # todo: remove this shortly
+          "standalone"=>true,
+          "runtime"=>options[:runtime],
+          "file_name"=> exec_file # File.basename(filename)
+      }
+      #puts 'options for upload=' + options.inspect
+      SimpleWorker.logger.info "Uploading now..."
+      ret = post_file("code/put", File.new(package_file), options)
+      SimpleWorker.logger.info "Done uploading."
+      return ret
+
+    end
+
+    def wait_until_complete(task_id)
+      tries = 0
+      status = nil
+      sleep 1
+      while tries < 100
+        status = status(task_id)
+        puts "Waiting... status=" + status["status"]
+        if status["status"] != "queued" && status["status"] != "running"
+          break
+        end
+        sleep 2
+      end
+      status
+    end
+
     def add_sw_params(hash_to_send)
       # todo: remove secret key??  Can use worker service from within a worker without it now
       hash_to_send["sw_access_key"] = self.access_key

data/lib/simple_worker.rb

@@ -40,8 +40,8 @@ if defined?(Rails)
 #  puts 'Rails=' + Rails.inspect
 #  puts 'vers=' + Rails::VERSION::MAJOR.inspect
   if Rails::VERSION::MAJOR == 2
-    require_relative 'rails2_init.rb'
+    require_relative 'simple_worker/rails2_init.rb'
   else
-    require_relative 'railtie'
+    require_relative 'simple_worker/railtie'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-08-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip
@@ -43,12 +43,13 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- lib/rails2_init.rb
-- lib/railtie.rb
+- lib/generators/simple_worker/simple_worker_generator.rb
 - lib/simple_worker.rb
 - lib/simple_worker/api.rb
 - lib/simple_worker/base.rb
 - lib/simple_worker/config.rb
+- lib/simple_worker/rails2_init.rb
+- lib/simple_worker/railtie.rb
 - lib/simple_worker/server/overrides.rb
 - lib/simple_worker/server/runner.rb
 - lib/simple_worker/service.rb
@@ -79,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: The official SimpleWorker gem for http://www.simpleworker.com