simple_worker 0.3.0 → 0.3.3

data/lib/simple_worker/base.rb

@@ -10,19 +10,38 @@ module SimpleWorker
 
         class << self
             attr_accessor :subclass, :caller_file
-        end
+            @merged = []
+
+            def reset!
+                @merged = []
+            end
+
+            def inherited(subclass)
+                subclass.reset!
 
-        def self.inherited(subclass)
-            puts "New subclass: #{subclass}"
-            puts "subclass.inspect=" + subclass.inspect
-            puts 'existing caller=' + (subclass.class_variable_defined?(:@@caller_file) ? subclass.class_variable_get(:@@caller_file).inspect : "nil")
-            puts "caller=" + caller.inspect
-            splits = caller[0].split(":")
-            caller_file = splits[0] + ":" + splits[1]
-            puts 'caller_file=' + caller_file
-            # don't need these class_variables anymore probably
-            subclass.class_variable_set(:@@caller_file, caller_file)
+                puts "New subclass: #{subclass}"
+                puts "subclass.inspect=" + subclass.inspect
+                puts 'existing caller=' + (subclass.instance_variable_defined?(:@caller_file) ? subclass.instance_variable_get(:@caller_file).inspect : "nil")
+                puts "caller=" + caller.inspect
+                splits = caller[0].split(":")
+                caller_file = splits[0] + ":" + splits[1]
+                puts 'caller_file=' + caller_file
+                # don't need these class_variables anymore probably
+                subclass.instance_variable_set(:@caller_file, caller_file)
 
+                super
+            end
+
+            # merges the specified files.
+            def merge(*files)
+                files.each do |f|
+                    unless File.exist? f
+                        raise "File not found: " + f
+                    end
+                    require f
+                    @merged << File.expand_path(f)
+                end
+            end
         end
 
 
@@ -39,7 +58,7 @@ module SimpleWorker
         end
 
         def uploaded?
-            self.class.class_variable_defined?(:@@uploaded) && self.class.class_variable_get(:@@uploaded)
+            self.class.instance_variable_defined?(:@uploaded) && self.class.instance_variable_get(:@uploaded)
         end
 
 
@@ -91,11 +110,11 @@ module SimpleWorker
 #}
             unless uploaded?
                 subclass = self.class
-                rfile = subclass.class_variable_get(:@@caller_file) # Base.caller_file # File.expand_path(Base.subclass)
+                rfile = subclass.instance_variable_get(:@caller_file) # Base.caller_file # File.expand_path(Base.subclass)
                 puts 'rfile=' + rfile.inspect
                 puts 'self.class.name=' + subclass.name
-                SimpleWorker.service.upload(rfile, subclass.name)
-                self.class.class_variable_set(:@@uploaded, true)
+                SimpleWorker.service.upload(rfile, subclass.name, :merge=>self.class.instance_variable_get(:@merged))
+                self.class.instance_variable_set(:@uploaded, true)
             else
                 puts 'already uploaded for ' + self.class.name
             end
@@ -110,5 +129,6 @@ module SimpleWorker
         end
 
 
+
     end
 end

data/lib/simple_worker/used_in_worker.rb

@@ -0,0 +1,9 @@
+module SimpleWorker
+    module UsedInWorker
+
+        def log(str)
+            puts 'gem usedinowrker log=' + str.to_s
+#            puts str.to_s
+        end
+    end
+end

data/lib/simple_worker.rb

@@ -1,6 +1,7 @@
 require 'appoxy_api'
 require File.join(File.dirname(__FILE__), 'simple_worker', 'base')
 require File.join(File.dirname(__FILE__), 'simple_worker', 'config')
+require File.join(File.dirname(__FILE__), 'simple_worker', 'used_in_worker')
 
 module SimpleWorker
 
@@ -29,6 +30,7 @@ module SimpleWorker
 
         # Options:
         #    - :callback_url
+        #    - :merge => array of files to merge in with this file
         def upload(filename, class_name, options={})
 
             # check whether it should upload again
@@ -41,6 +43,9 @@ module SimpleWorker
                 existing_md5 = IO.read(f)
                 puts 'existing_md5=' + existing_md5
             end
+
+            filename = build_merged_file(filename, options[:merge]) if options[:merge]
+
 #            sys.classes[subclass].__file__
 #            puts '__FILE__=' + Base.subclass.__file__.to_s
             md5 = Digest::MD5.hexdigest(File.read(filename))
@@ -61,6 +66,20 @@ module SimpleWorker
             ret
         end
 
+        def build_merged_file(filename, merge)
+            merge = merge.dup
+            merge.insert(0, filename)
+            fname2 = File.join(Dir.tmpdir(), File.basename(filename))
+            puts 'fname2=' + fname2
+            File.open(fname2, "w") do |f|
+                merge.each do |m|
+                    f.write File.open(m, 'r') { |mo| mo.read }
+                    f.write "\n\n"
+                end
+            end
+            fname2
+        end
+
         def add_sw_params(hash_to_send)
             hash_to_send["sw_access_key"] = self.access_key
             hash_to_send["sw_secret_key"] = self.secret_key

data/test/models/model_1.rb

@@ -0,0 +1,21 @@
+begin
+    require File.join(File.dirname(__FILE__), '../lib/simple_worker')
+rescue Exception
+    require 'simple_worker'
+end
+
+
+class Model1
+    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/test_worker.rb

@@ -11,7 +11,7 @@ class TestWorker < SimpleWorker::Base
     def run(data=nil)
         log 'running the runner for leroy '.upcase + ' with data: ' + data.inspect
 
-        log 's3_key instance_variable = ' + self.s3_key
+        log 's3_key instance_variable = ' + self.s3_key.to_s
 
         @times = data["times"].to_i
         @times.times do |i|

data/test/test_worker_2.rb

@@ -7,8 +7,11 @@ end
 # Bump for new checksum.
 class TestWorker2 < SimpleWorker::Base
 
+    merge "models/model_1.rb"
+
     attr_accessor :s3_key, :times, :x
 
+
     def who_am_i2?
         return self.class.name
     end
@@ -22,6 +25,9 @@ class TestWorker2 < SimpleWorker::Base
             sleep 1
             set_progress(:percent=> (i / times * 100))
         end
+        m1 = Model1.new
+        log "I made a new model1"
+        m1.say_hello
     end
 
     def set_complete(params=nil)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -07:00
+date: 2010-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: appoxy_api
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -41,7 +44,14 @@ files:
 - lib/simple_worker.rb
 - lib/simple_worker/base.rb
 - lib/simple_worker/config.rb
+- lib/simple_worker/used_in_worker.rb
 - README.markdown
+- test/models/model_1.rb
+- test/scheduled_worker.rb
+- test/test_inheritance.rb
+- test/test_simple_worker.rb
+- test/test_worker.rb
+- test/test_worker_2.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_worker
 licenses: []
@@ -52,27 +62,32 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Classified
 test_files: 
+- test/models/model_1.rb
 - test/scheduled_worker.rb
 - test/test_inheritance.rb
 - test/test_simple_worker.rb