simple_worker 0.4.1 → 0.5.1

data/lib/rails2_init.rb

@@ -1,8 +1,8 @@
-#puts "Initializing list of Rails models..."
-SimpleWorker.configure do |config|
-  path = File.join(Rails.root, 'app/models/*.rb')
-#  puts 'path=' + path
-  config.models = Dir.glob(path)
-  config.extra_requires += ['active_support/core_ext', 'active_record', 'action_mailer']
-#  puts 'config.models=' + config.models.inspect
-end
+#puts "Initializing list of Rails models..."
+SimpleWorker.configure do |config|
+  path = File.join(Rails.root, 'app/models/*.rb')
+#  puts 'path=' + path
+  config.models = Dir.glob(path)
+  config.extra_requires += ['active_support/core_ext', 'active_record', 'action_mailer']
+#  puts 'config.models=' + config.models.inspect
+end

data/lib/railtie.rb

@@ -1,22 +1,22 @@
-# see http://api.rubyonrails.org/classes/Rails/Railtie.html
-
-require 'simple_worker'
-require 'rails'
-
-module SimpleWorker
-  class Railtie < Rails::Railtie
-#    railtie_name :simple_worker deprecated
-
-    initializer "simple_worker.configure_rails_initialization" do |app|
-      puts "Initializing SimpleWorker for Rails 3..."
-      SimpleWorker.configure do |c2|
-        path = File.join(Rails.root, 'app/models/*.rb')
-#        puts 'path=' + path
-        c2.models = Dir.glob(path)
-        c2.extra_requires += ['active_support/core_ext', 'active_record', 'action_mailer']
-#        puts 'config.models=' + c2.models.inspect
-      end
-
-    end
-  end
-end
+# see http://api.rubyonrails.org/classes/Rails/Railtie.html
+
+require 'simple_worker'
+require 'rails'
+
+module SimpleWorker
+  class Railtie < Rails::Railtie
+#    railtie_name :simple_worker deprecated
+
+    initializer "simple_worker.configure_rails_initialization" do |app|
+      puts "Initializing SimpleWorker for Rails 3..."
+      SimpleWorker.configure do |c2|
+        path = File.join(Rails.root, 'app/models/*.rb')
+#        puts 'path=' + path
+        c2.models = Dir.glob(path)
+        c2.extra_requires += ['active_support/core_ext', 'active_record', 'action_mailer']
+#        puts 'config.models=' + c2.models.inspect
+      end
+
+    end
+  end
+end

data/lib/simple_worker/base.rb

@@ -1,5 +1,3 @@
-# This is an abstract module that developers creating works can mixin/include to use the SimpleWorker special functions.
-
 require 'digest/md5'
 require 'base64'
 
@@ -13,11 +11,13 @@ module SimpleWorker
       attr_accessor :subclass, :caller_file
       @merged = []
       @merged_workers = []
+      @merged_gems = []
       @unmerged = []
 
       def reset!
         @merged = []
         @merged_workers = []
+        @merged_gems = []
         @unmerged = []
       end
 
@@ -64,6 +64,12 @@ module SimpleWorker
         f
       end
 
+      # merges the specified gem.
+      def merge_gem(gem_name, version=nil)
+        @merged_gems << {:name=>gem_name, :version=>version}
+        require gem_name
+      end
+
       # merges the specified files.
       # todo: don't allow multiple files per merge, just one like require
       def merge(*files)
@@ -235,10 +241,11 @@ module SimpleWorker
       before_upload
 
 #      puts 'upload_if_needed ' + self.class.name
-      # Todo, watch for this file changing or something so we can reupload
+      # Todo, watch for this file changing or something so we can reupload (if in dev env)
       unless uploaded?
         merged = self.class.instance_variable_get(:@merged)
         unmerged = self.class.instance_variable_get(:@unmerged)
+        merged_gems = self.class.instance_variable_get(:@merged_gems)
 #        puts 'merged1=' + merged.inspect
 
         subclass = self.class
@@ -257,7 +264,7 @@ module SimpleWorker
 #          puts 'merged with superclass=' + merged.inspect
         end
         merged += SimpleWorker.config.models if SimpleWorker.config.models
-        SimpleWorker.service.upload(rfile, subclass.name, :merge=>merged, :unmerge=>unmerged)
+        SimpleWorker.service.upload(rfile, subclass.name, :merge=>merged, :unmerge=>unmerged, :merged_gems=>merged_gems)
         self.class.instance_variable_set(:@uploaded, true)
       else
         SimpleWorker.logger.debug 'Already uploaded for ' + self.class.name

data/lib/simple_worker/service.rb

@@ -1,236 +1,249 @@
-require 'base64'
-require 'logger'
-require 'appoxy_api'
-
-module SimpleWorker
-
-  @@logger = Logger.new(STDOUT)
-  @@logger.level = Logger::INFO
-
-  def self.logger
-    @@logger
-  end
-
-  class Service < Appoxy::Api::Client
-
-    attr_accessor :config
-
-    def initialize(access_key, secret_key, options={})
-      SimpleWorker.logger.info 'Starting SimpleWorker::Service...'
-      self.config = options[:config] if options[:config]
-      super("http://api.simpleworker.com/api/", access_key, secret_key, options)
-      self.host = self.config.host if self.config && self.config.host
-    end
-
-    # Options:
-    #    - :callback_url
-    #    - :merge => array of files to merge in with this file
-    def upload(filename, class_name, options={})
-#      puts "Uploading #{class_name}"
-      # check whether it should upload again
-      tmp = Dir.tmpdir()
-      md5file = "simple_worker_#{class_name.gsub("::", ".")}_#{access_key[0, 8]}.md5"
-      existing_md5 = nil
-      f = File.join(tmp, md5file)
-      if File.exists?(f)
-        existing_md5 = IO.read(f)
-      end
-
-      # todo: no point in writing the merged file, just use a string, we're just reading it back in anyways
-      filename = build_merged_file(filename, options[:merge], options[:unmerge]) if options[:merge]
-
-#            sys.classes[subclass].__file__
-#            puts '__FILE__=' + Base.subclass.__file__.to_s
-      contents = File.read(filename)
-#      puts 'START CONTENTS:'
-#      puts contents
-#      puts 'END CONTENTS'
-      md5 = Digest::MD5.hexdigest(contents)
-#            puts "new md5=" + md5
-
-      new_code = false
-      if md5 != existing_md5
-        SimpleWorker.logger.info "Uploading #{class_name}, code modified."
-        File.open(f, 'w') { |f| f.write(md5) }
-        new_code = true
-      else
-#        puts "#{class_name}: same code, not uploading"
-      end
-
-      if new_code
-        mystring = nil
-        file = File.open(filename, "r") do |f|
-          mystring = f.read
-        end
-#        mystring = Base64.encode64(mystring)
-#        puts 'code=' + mystring
-        options = {"code"=>mystring, "class_name"=>class_name}
-        ret = post("code/put", options)
-        ret
-      end
-    end
-
-    def build_merged_file(filename, merge, unmerge)
-      merge = merge.dup
-#      merge << filename
-      #puts "merge before uniq! " + merge.inspect
-      merge.uniq!
-      # puts "merge after uniq! " + merge.inspect
-
-      if unmerge
-        unmerge.each do |x|
-          deleted = merge.delete x
-#          puts "Unmerging #{x}. Success? #{deleted}"
-        end
-      end
-
-      fname2 = File.join(Dir.tmpdir(), File.basename(filename))
-#            puts 'fname2=' + fname2
-#            puts 'merged_file_array=' + merge.inspect
-
-      # Let's put the requires from the worker at the top
-      worker_file_contents_array = File.readlines(filename)
-      requires_lines = ""
-      in_comment = false
-      worker_file_contents_array.each do |line|
-        line = line.strip
-#        puts 'checking for requires in ' + line
-        next if line.length == 0
-        next if line[0] == "#"
-#        puts 'line[0, 6]=' + line[0, 6]
-        if in_comment && line[0,4] == "=end"
-          in_comment = false
-          next
-        elsif in_comment
-          next
-        elsif line[0, 6] == "=begin"
-          in_comment = true
-          next
-        end
-        if line.index("require") == 0
-          requires_lines << line + "\n"
-        else
-          break
-        end
-      end
-
-      File.open(fname2, "w") do |f|
-        if SimpleWorker.config.extra_requires
-          SimpleWorker.config.extra_requires.each do |r|
-            f.write "require '#{r}'\n"
-          end
-        end
-#        puts 'Adding requires lines ' + requires_lines.inspect
-        f.write requires_lines
-        merge.each do |m|
-#          puts "merging #{m} into #{filename}"
-          f.write File.open(m, 'r') { |mo| mo.read }
-          f.write "\n\n"
-        end
-        f.write worker_file_contents_array.join("\n")
-      end
-      fname2
-    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
-      hash_to_send["sw_secret_key"] = self.secret_key
-    end
-
-    # class_name: The class name of a previously upload class, eg: MySuperWorker
-    # data: Arbitrary hash of your own data that your task will need to run.
-    def queue(class_name, data={}, options={})
-      puts "Queuing #{class_name}..."
-      if !data.is_a?(Array)
-        data = [data]
-      end
-#      p data
-      hash_to_send = {}
-      hash_to_send["payload"] = data
-      hash_to_send["class_name"] = class_name
-      hash_to_send["priority"] = options[:priority] if options[:priority]
-      hash_to_send["options"] = options
-      add_sw_params(hash_to_send)
-      if defined?(RAILS_ENV)
-        # todo: move this to global_attributes in railtie
-        hash_to_send["rails_env"] = RAILS_ENV
-      end
-      return queue_raw(class_name, hash_to_send)
-
-    end
-
-    def queue_raw(class_name, data={})
-      params = nil
-      hash_to_send = data
-      hash_to_send["class_name"] = class_name
-      ret = post("queue/add", hash_to_send)
-      ret
-
-    end
-
-
-    #
-    # schedule: hash of scheduling options that can include:
-    #     Required:
-    #     - start_at:      Time of first run - DateTime or Time object.
-    #     Optional:
-    #     - run_every:     Time in seconds between runs. If ommitted, task will only run once.
-    #     - delay_type:    Fixed Rate or Fixed Delay. Default is fixed_delay.
-    #     - end_at:        Scheduled task will stop running after this date (optional, if ommitted, runs forever or until cancelled)
-    #     - run_times:     Task will run exactly :run_times. For instance if :run_times is 5, then the task will run 5 times.
-    #
-    def schedule(class_name, data, schedule)
-      puts "Scheduling #{class_name}..."
-      raise "Schedule must be a hash." if !schedule.is_a? Hash
-#            if !data.is_a?(Array)
-#                data = [data]
-#            end
-      hash_to_send = {}
-      hash_to_send["payload"] = data
-      hash_to_send["class_name"] = class_name
-      hash_to_send["schedule"] = schedule
-      add_sw_params(hash_to_send)
-#            puts 'about to send ' + hash_to_send.inspect
-      ret = post("scheduler/schedule", hash_to_send)
-      ret
-    end
-
-    def cancel_schedule(scheduled_task_id)
-      raise "Must include a schedule id." if scheduled_task_id.blank?
-      hash_to_send = {}
-      hash_to_send["scheduled_task_id"] = scheduled_task_id
-      ret = post("scheduler/cancel", hash_to_send)
-      ret
-    end
-
-    def get_schedules()
-      hash_to_send = {}
-      ret = get("scheduler/list", hash_to_send)
-      ret
-    end
-
-    def status(task_id)
-      data = {"task_id"=>task_id}
-      ret = get("task/status", data)
-      ret
-    end
-
-    def schedule_status(schedule_id)
-      data = {"schedule_id"=>schedule_id}
-      ret = get("scheduler/status", data)
-      ret
-    end
-
-    def log(task_id)
-      data = {"task_id"=>task_id}
-      ret = get("task/log", data, {:parse=>false})
-#            puts 'ret=' + ret.inspect
-#            ret["log"] = Base64.decode64(ret["log"])
-      ret
-    end
-
-
-  end
-
+require 'base64'
+require 'logger'
+require 'appoxy_api'
+require 'zip'
+module SimpleWorker
+
+  @@logger       = Logger.new(STDOUT)
+  @@logger.level = Logger::INFO
+
+  def self.logger
+    @@logger
+  end
+
+  def self.api_version
+    3
+  end
+
+  class Service < Appoxy::Api::Client
+
+    attr_accessor :config
+
+    def initialize(access_key, secret_key, options={})
+      SimpleWorker.logger.info 'Starting SimpleWorker::Service...'
+      self.config = options[:config] if options[:config]
+      super("http://api.simpleworker.com/api/", access_key, secret_key, options)
+      self.host = self.config.host if self.config && self.config.host
+    end
+
+    # Options:
+    #    - :callback_url
+    #    - :merge => array of files to merge in with this file
+    def upload(filename, class_name, options={})
+#      puts "Uploading #{class_name}"
+      # check whether it should upload again
+      tmp          = Dir.tmpdir()
+      md5file      = "simple_worker_#{class_name.gsub("::", ".")}_#{access_key[0, 8]}.md5"
+      existing_md5 = nil
+      f            = File.join(tmp, md5file)
+      if File.exists?(f)
+        existing_md5 = IO.read(f)
+      end
+      # Check for code changes.
+      md5      = Digest::MD5.hexdigest(File.read(filename))
+      new_code = false
+      if md5 != existing_md5
+        SimpleWorker.logger.info "Uploading #{class_name}, code modified."
+        File.open(f, 'w') { |f| f.write(md5) }
+        new_code = true
+      else
+#        puts "#{class_name}: same code, not uploading"
+      end
+
+
+      filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems])
+
+#            sys.classes[subclass].__file__
+#            puts '__FILE__=' + Base.subclass.__file__.to_s
+#            puts "new md5=" + md5
+
+
+
+      if new_code
+#        mystring = nil
+#        file     = File.open(filename, "r") do |f|
+#          mystring = f.read
+#        end
+#        mystring = Base64.encode64(mystring)
+#        puts 'code=' + mystring
+        options  = {"class_name"=>class_name, }
+        ret      = post_file("code/put", File.new(filename), options)
+        ret
+      end
+    end
+
+    def get_gem_path(full_gem_name, version=nil)
+      gem_name =(full_gem_name.match(/^[a-zA-Z0-9\-_]+/)[0])
+      puts "Searching #{gem_name}"
+      searcher = Gem::GemPathSearcher.new
+      gems     = searcher.find_all(gem_name)
+      gems = gems.select { |g| g.version.version==version } if version
+      if !gems.empty?
+        gem = gems.first
+        gem.full_gem_path + "/lib"
+      else
+        nil
+      end
+    end
+
+    def build_merged_file(filename, merge, unmerge, merged_gems)
+#      unless (merge && merge.size > 0) || (merged_gems && merged_gems.size > 0)
+#        return filename
+#      end
+      merge = merge.dup
+      if unmerge
+        unmerge.each do |x|
+          deleted = merge.delete x
+#          puts "Unmerging #{x}. Success? #{deleted}"
+        end
+      end
+      merge.uniq!
+      tmp_file = File.join(Dir.tmpdir(), File.basename(filename))
+      File.open(tmp_file, "w") do |f|
+        if SimpleWorker.config.extra_requires
+          SimpleWorker.config.extra_requires.each do |r|
+            f.write "require '#{r}'\n"
+          end
+        end
+        f.write File.open(filename, 'r') { |mo| mo.read }
+      end
+      merge << tmp_file
+      #puts "merge before uniq! " + merge.inspect      
+      # puts "merge after uniq! " + merge.inspect
+
+      fname2 = tmp_file + ".zip"
+#            puts 'fname2=' + fname2
+#            puts 'merged_file_array=' + merge.inspect
+      #File.open(fname2, "w") do |f|
+      File.delete(fname2) if File.exist?(fname2)
+
+      Zip::ZipFile.open(fname2, 'w') do |f|
+        if merged_gems
+          merged_gems.each do |gem|
+            path = get_gem_path(gem[:name], gem[:version])
+            if path
+              puts "Collecting gem #{path}"
+              Dir["#{path}/**/**"].each do |file|
+                f.add('gems/'+"#{gem["name"]}/"+ file.sub(path+'/', ''), file)
+              end
+            end
+          end
+        end
+        merge.each do |m|
+#          puts "merging #{m} into #{filename}"
+          f.add(File.basename(m), m)
+        end
+      end
+      fname2
+    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
+      hash_to_send["sw_secret_key"] = self.secret_key
+      hash_to_send["api_version"]    = SimpleWorker.api_version
+    end
+
+    def check_config
+      if self.config.nil? || self.config.access_key.nil?
+        raise "Invalid SimpleWorker configuration, no access key specified."
+      end
+    end
+
+    # class_name: The class name of a previously upload class, eg: MySuperWorker
+    # data: Arbitrary hash of your own data that your task will need to run.
+    def queue(class_name, data={}, options={})
+      puts "Queuing #{class_name}..."
+      check_config
+      if !data.is_a?(Array)
+        data = [data]
+      end
+#      p data
+      hash_to_send               = {}
+      hash_to_send["payload"]    = data
+      hash_to_send["class_name"] = class_name
+      hash_to_send["priority"] = options[:priority] if options[:priority]
+      hash_to_send["options"] = options
+      add_sw_params(hash_to_send)
+      if defined?(RAILS_ENV)
+        # todo: move this to global_attributes in railtie
+        hash_to_send["rails_env"] = RAILS_ENV
+      end
+      return queue_raw(class_name, hash_to_send)
+
+    end
+
+    def queue_raw(class_name, data={})
+      params                     = nil
+      hash_to_send               = data
+      hash_to_send["class_name"] = class_name
+      ret                        = post("queue/add", hash_to_send)
+      ret
+
+    end
+
+
+    #
+    # schedule: hash of scheduling options that can include:
+    #     Required:
+    #     - start_at:      Time of first run - DateTime or Time object.
+    #     Optional:
+    #     - run_every:     Time in seconds between runs. If ommitted, task will only run once.
+    #     - delay_type:    Fixed Rate or Fixed Delay. Default is fixed_delay.
+    #     - end_at:        Scheduled task will stop running after this date (optional, if ommitted, runs forever or until cancelled)
+    #     - run_times:     Task will run exactly :run_times. For instance if :run_times is 5, then the task will run 5 times.
+    #
+    def schedule(class_name, data, schedule)
+      puts "Scheduling #{class_name}..."
+      raise "Schedule must be a hash." if !schedule.is_a? Hash
+#            if !data.is_a?(Array)
+#                data = [data]
+#            end
+      hash_to_send               = {}
+      hash_to_send["payload"]    = data
+      hash_to_send["class_name"] = class_name
+      hash_to_send["schedule"]   = schedule
+      add_sw_params(hash_to_send)
+#            puts ' about to send ' + hash_to_send.inspect
+      ret = post("scheduler/schedule", hash_to_send)
+      ret
+    end
+
+    def cancel_schedule(scheduled_task_id)
+      raise "Must include a schedule id." if scheduled_task_id.blank?
+      hash_to_send                      = {}
+      hash_to_send["scheduled_task_id"] = scheduled_task_id
+      ret                               = post("scheduler/cancel", hash_to_send)
+      ret
+    end
+
+    def get_schedules()
+      hash_to_send = {}
+      ret          = get("scheduler/list", hash_to_send)
+      ret
+    end
+
+    def status(task_id)
+      data = {"task_id"=>task_id}
+      ret  = get("task/status", data)
+      ret
+    end
+
+    def schedule_status(schedule_id)
+      data = {"schedule_id"=>schedule_id}
+      ret  = get("scheduler/status", data)
+      ret
+    end
+
+    def log(task_id)
+      data = {"task_id"=>task_id}
+      ret  = get("task/log", data, {:parse=>false})
+#            puts ' ret=' + ret.inspect
+#            ret["log"] = Base64.decode64(ret["log"])
+      ret
+    end
+
+
+  end
+
 end

data/lib/simple_worker.rb

@@ -13,11 +13,13 @@ module SimpleWorker
                   :service
 
     def configure()
-      SimpleWorker.config ||= Config.new
       yield(config)
       SimpleWorker.service = Service.new(config.access_key, config.secret_key, :config=>config)
     end
 
+    def config
+      @config ||= Config.new
+    end
  
   end
 

data/test/cool_model.rb

@@ -1,7 +1,7 @@
-require 'simple_record'
-
-class CoolModel < SimpleRecord::Base
-
-  has_strings :name
-
-end
+require 'simple_record'
+
+class CoolModel < SimpleRecord::Base
+
+  has_strings :name
+
+end

data/test/cool_worker.rb

@@ -1,14 +1,14 @@
-
-class CoolWorker < SimpleWorker::Base
-  attr_accessor :array_of_models
-  merge 'cool_model'
-
-
-  def run
-    10.times do |i|
-      puts "HEY THERE PUTS #{i}"
-      log "HEY THERE LOG #{i}"
-      sleep 1
-    end
-  end
-end
+
+class CoolWorker < SimpleWorker::Base
+  attr_accessor :array_of_models
+  merge 'cool_model'
+
+
+  def run
+    10.times do |i|
+      puts "HEY THERE PUTS #{i}"
+      log "HEY THERE LOG #{i}"
+      sleep 1
+    end
+  end
+end

data/test/db_worker.rb

@@ -1,19 +1,18 @@
-require 'mysql2'
-
-# bump asdf
-class DbWorker < SimpleWorker::Base
-  attr_accessor :array_of_models
-  merge 'trace_object'
-
-  def run
-    to = TraceObject.find(:first)
-    log to.inspect
-    @object = to
-  end
-
-  def ob
-    @object
-  end
-
-
-end
+require 'mysql2'
+
+class DbWorker < SimpleWorker::Base
+  attr_accessor :array_of_models
+  merge 'trace_object'
+
+  def run
+    to = TraceObject.find(:first)
+    log to.inspect
+    @object = to
+  end
+
+  def ob
+    @object
+  end
+
+
+end

data/test/models/model_1.rb

@@ -1,7 +1,7 @@
 begin
     require File.join(File.dirname(__FILE__), '../../lib/simple_worker')
 rescue Exception => ex
-    puts 'Could not load relative simple_worker: ' + ex.message
+    puts 'ERROR!!! ' + ex.message
 #    require 'simple_worker'
 end
 

data/test/models/model_2.rb

@@ -1,22 +1,22 @@
-begin
-    require File.join(File.dirname(__FILE__), '../../lib/simple_worker')
-rescue Exception => ex
-    puts 'Could not load relative simple_worker: ' + ex.message
-#    require 'simple_worker'
-end
-
-
-class Model2
-    attr_accessor :heidi, :ho
-
-    include SimpleWorker::UsedInWorker
-
-    def say_hello
-        log "Hi there sir"
-    end
-
-    # testk laksdfj klasj df
-    def test
-        log 'test'
-    end
-end
+begin
+    require File.join(File.dirname(__FILE__), '../../lib/simple_worker')
+rescue Exception => ex
+    puts 'ERROR!!! ' + ex.message
+#    require 'simple_worker'
+end
+
+
+class Model2
+    attr_accessor :heidi, :ho
+
+    include SimpleWorker::UsedInWorker
+
+    def say_hello
+        log "Hi there sir"
+    end
+
+    # testk laksdfj klasj df
+    def test
+        log 'test'
+    end
+end

data/test/requiring_worker.rb

@@ -1,4 +1,4 @@
-
-
-require_relative 'models/model_1.rb'
-
+
+
+require_relative 'models/model_1.rb'
+

data/test/test_no_config.rb

@@ -1,25 +1,25 @@
-require 'test/unit'
-begin
-  require File.join(File.dirname(__FILE__), '../lib/simple_worker')
-rescue Exception => ex
-  puts ex.message
-  require 'simple_worker'
-end
-require_relative "test_worker"
-require_relative "test_worker_2"
-
-
-class SimpleWorkerTests < Test::Unit::TestCase
-
-  def test_no_conf
-    # Add something to queue, get task ID back
-    tw        = TestWorker.new
-    tw.s3_key = "active style runner"
-    tw.times  = 3
-
-    tw.run_local
-
-  end
-
-end
-
+require 'test/unit'
+begin
+  require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue Exception => ex
+  puts ex.message
+  require 'simple_worker'
+end
+require_relative "test_worker"
+require_relative "test_worker_2"
+
+
+class SimpleWorkerTests < Test::Unit::TestCase
+
+  def test_no_conf
+    # Add something to queue, get task ID back
+    tw        = TestWorker.new
+    tw.s3_key = "active style runner"
+    tw.times  = 3
+
+    tw.run_local
+
+  end
+
+end
+

data/test/test_simple_worker.rb

@@ -28,7 +28,7 @@ class SimpleWorkerTests < TestBase
     puts 'queuing ' + tw.inspect
 
     response_hash_single = nil
-    1.times do |i|
+    5.times do |i|
       begin
         response_hash_single = tw.queue
       rescue => ex
@@ -38,7 +38,7 @@ class SimpleWorkerTests < TestBase
 
     puts 'response_hash=' + response_hash_single.inspect
     puts 'task_id=' + tw.task_id
-    20.times do |i|
+    10.times do |i|
       puts "status #{i}: " + tw.status.inspect
       break if tw.status["status"] == "complete"
       sleep 2

data/test/test_worker.rb

@@ -1,29 +1,29 @@
-#begin
-#    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
-#rescue Exception => ex
-#    puts ex.message
-#    require 'simple_worker'
-#end
-# Bump for new checksum.
-class TestWorker < SimpleWorker::Base
-
-    attr_accessor :s3_key, :times
-
-    def run
-        log 'running the test worker for moi '.upcase
-        log 's3_key instance_variable = ' + self.s3_key.to_s
-
-        @times.times do |i|
-            log 'running at ' + i.to_s
-            sleep 1
-            set_progress(:percent=> (i / @times * 100))
-        end
-    end
-
-    def set_complete(params=nil)
-        log 'SET COMPLETE YAY!' + params[:task_set_id]
-    end
-
-
-end
-
+#begin
+#    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+#rescue Exception => ex
+#    puts ex.message
+#    require 'simple_worker'
+#end
+# Bump for new checksum.
+class TestWorker < SimpleWorker::Base
+
+    attr_accessor :s3_key, :times
+
+    def run
+        log 'running the test worker for moi '.upcase
+        log 's3_key instance_variable = ' + self.s3_key.to_s
+
+        @times.times do |i|
+            log 'running at ' + i.to_s
+            sleep 1
+            set_progress(:percent=> (i / @times * 100))
+        end
+    end
+
+    def set_complete(params=nil)
+        log 'SET COMPLETE YAY!' + params[:task_set_id]
+    end
+
+
+end
+

data/test/test_worker_2.rb

@@ -7,10 +7,7 @@ rescue Exception => ex
 end
 =end
 
-# Bump for new checksum.sdf adsfjlaksdjf d
-
-require 'json'
-
+# Bump for new checksum.sdf adsfjlaksdjf dasfasdfadsf
 class TestWorker2 < SimpleWorker::Base
 
     merge File.join(File.dirname(__FILE__), 'models', 'model_1.rb')
@@ -40,7 +37,7 @@ class TestWorker2 < SimpleWorker::Base
 
         second_workers = []
         now = Time.now
-        1.times do |i|
+        10.times do |i|
             second_worker = SecondWorker.new
             second_worker.start_time = now
             second_worker.num = i

data/test/trace_object.rb

@@ -1,6 +1,6 @@
-class TraceObject < ActiveRecord::Base
-    belongs_to :tracking_device
-    has_many :location_updates
-
-
-end
+class TraceObject < ActiveRecord::Base
+    belongs_to :tracking_device
+    has_many :location_updates
+
+
+end

data/test/zip_vs_gzip.rb

@@ -0,0 +1,26 @@
+require 'zip'
+require 'zlib'
+
+dir = Dir.new("./")
+started_at = Time.now
+fname2 = "zipped.zip"
+Zip::ZipFile.open(fname2, 'w') do |f|
+  dir.each do |fname|
+    puts "merging #{fname} into #{fname2}"
+    f.add(File.basename(fname), fname)
+  end
+end
+ended_at = Time.now
+puts "zip duration=#{(ended_at.to_f - started_at.to_f)}"
+
+# todo: need to tar these first.
+started_at = Time.now
+fname2 = "gzipped.gzip"
+Zlib::GzipWriter.open(fname2) do |gz|
+   dir.each do |fname|
+    puts "merging #{fname} into #{fname2}"
+    gz.write(File.basename(fname), fname)
+  end
+end
+ended_at = Time.now
+puts "gzip duration=#{(ended_at.to_f - started_at.to_f)}"

metadata

@@ -1,35 +1,44 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: simple_worker
-version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
-authors:
+authors: 
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-07 00:00:00.000000000 -08:00
+
+date: 2011-03-26 00:00:00 -07:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: appoxy_api
-  requirement: &22838376 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *22838376
+  version_requirements: *id001
 description: The official SimpleWorker gem for http://www.simpleworker.com
 email: travis@appoxy.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - lib/rails2_init.rb
 - lib/railtie.rb
 - lib/simple_worker.rb
@@ -55,32 +64,40 @@ files:
 - test/test_worker_2.rb
 - test/test_worker_3.rb
 - test/trace_object.rb
+- test/zip_vs_gzip.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_worker
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The official SimpleWorker gem for http://www.simpleworker.com
-test_files:
+test_files: 
 - test/cool_model.rb
 - test/cool_worker.rb
 - test/db_worker.rb
@@ -97,3 +114,4 @@ test_files:
 - test/test_worker_2.rb
 - test/test_worker_3.rb
 - test/trace_object.rb
+- test/zip_vs_gzip.rb