simple_worker 1.0.11 → 1.0.12

data/lib/generators/simple_worker/templates/template_worker.erb

@@ -0,0 +1,7 @@
+class <%= @camel %> < SimpleWorker::Base
+
+  def run
+    log "Your code goes in this bit"
+  end
+
+end

data/lib/simple_worker/base.rb

@@ -64,7 +64,7 @@ module SimpleWorker
         f2 = SimpleWorker::MergeHelper.check_for_file(mailer, @caller_file)
         basename = File.basename(mailer, f2[:extname])
         path_to_templates = params[:path_to_templates] || File.join(Rails.root, "app/views/#{basename}")
-        @merged_mailers[basename] = {:name=>basename, :path_to_templates=>path_to_templates, :filename => mailer}.merge!(params)
+        @merged_mailers[basename] = {:name=>basename, :path_to_templates=>path_to_templates, :filename => f2[:path]}.merge!(params)
       end
 
       def merge_folder(path)

data/lib/simple_worker/server/runner.rb

@@ -1,11 +1,9 @@
 # This is the file that gets executed on the server.
 
-
 def init_database_connection(sw_config)
   if sw_config
     db_config = sw_config['database']
     if db_config
-      #@logger.info "Connecting to database using ActiveRecord..."
       require 'active_record'
       ActiveRecord::Base.establish_connection(db_config)
     end
@@ -77,22 +75,3 @@ def init_worker_service_for_runner(job_data)
   end
 end
 
-
-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)
-puts '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

@@ -122,13 +122,18 @@ 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
-puts \"args for single file=\" + ARGV.inspect
+#puts \"args for single file=\" + ARGV.inspect
 ARGV.each do |arg|
   if arg == \"-d\"
     # the user's writable directory
@@ -145,9 +150,21 @@ ARGV.each do |arg|
   i+=1
 end
 
+
 # Change to user directory
-puts 'dirname=' + dirname.inspect
+#puts 'dirname=' + dirname.inspect
 Dir.chdir(dirname)
+require 'json'
+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)
+#puts 'job_data=' + job_data.inspect
+
+sw_config = job_data['sw_config']
+init_database_connection(sw_config)
+init_mailer(sw_config)
+
 ")
 
 
@@ -221,11 +238,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)
+  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_'
@@ -304,6 +330,7 @@ end
           # puts " MERGED MAILERS" + merged_mailers.inspect
           merged_mailers.each_pair do |k, mailer|
             SimpleWorker.logger.debug "Collecting mailer #{mailer[:name]}"
+            puts "MAILER #{mailer.inspect}"
             f.add(File.basename(mailer[:filename]), mailer[:filename])
             path = mailer[:path_to_templates]
             Dir["#{path}/**/**"].each do |file|

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 Z
+date: 2011-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - lib/generators/simple_worker/simple_worker_generator.rb
+- lib/generators/simple_worker/templates/template_worker.erb
 - lib/simple_worker.rb
 - lib/simple_worker/api.rb
 - lib/simple_worker/base.rb