simple_worker 1.0.6 → 1.0.7

data/lib/simple_worker/base.rb

@@ -380,7 +380,7 @@ module SimpleWorker
 
         merged, rfile, subclass = SimpleWorker::Base.extract_superclasses_merges(self, merged)
 #if SimpleWorker.config.auto_merge
-        puts "Auto merge Enabled"
+#        puts "Auto merge Enabled"
 #if SimpleWorker.config.models
 #  SimpleWorker.config.models.each do |m|
 #    merged[m] = m

data/lib/simple_worker/server/overrides.rb

@@ -6,23 +6,23 @@ module SimpleWorker
 
   class << self
     def running_class=(rc)
-      @@running_class = rc
+      @running_class = rc
     end
     def running_class
-      @@running_class
+      @running_class
     end
   end
 
   def self.disable_queueing()
-    @@queueing_enabled = false
+    @queueing_enabled = false
   end
 
   def self.enable_queueing()
-    @@queueing_enabled = true
+    @queueing_enabled = true
   end
 
   def self.queueing_enabled?
-    @@queueing_enabled
+    @queueing_enabled
   end
 
 

data/lib/simple_worker/server/runner.rb

@@ -61,30 +61,6 @@ def init_worker_service_for_runner(job_data)
   end
 end
 
-# Find environment (-e)
-dirname = ""
-i = 0
-job_data_file = run_data_file = 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]
-  end
-  if arg == "-p"
-    # path to run data
-    run_data_file = ARGV[i+1]
-  end
-  i+=1
-end
-
-# Change to user directory
-puts 'dirname=' + dirname.inspect
-Dir.chdir(dirname)
 
 run_data = JSON.load(File.open(run_data_file))
 # Load in job data

data/lib/simple_worker/service.rb

@@ -121,10 +121,39 @@ 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|
-        # add some rails stuff if using Rails
+
+        f.write("
+# Find environment (-e)
+dirname = " "
+i = 0
+job_data_file = run_data_file = 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]
+  end
+  if arg == \"-p\"
+    # path to run data
+    run_data_file = ARGV[i+1]
+  end
+  i+=1
+end
+
+# Change to user directory
+puts 'dirname=' + dirname.inspect
+Dir.chdir(dirname)
+")
+
 
         f.write("require 'simple_worker'\n")
 
+
+        # add some rails stuff if using Rails
         if defined?(Rails)
           f.write "module Rails
   def self.version
@@ -148,7 +177,7 @@ end
         end
         #if SimpleWorker.config.auto_merge
         merged_gems.each_pair do |k, gem|
-          SimpleWorker.logger.info "Bundling gem #{gem[:name]}..."
+          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
@@ -159,7 +188,7 @@ end
           elsif gem[:require].is_a?(String)
             gem[:require] = [gem[:require]]
           end
-          puts gem[:require].inspect
+          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"

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 Z
+date: 2011-09-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.9"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: