simple_worker 0.6.2 → 0.6.3

data/README.markdown

@@ -20,6 +20,20 @@ You really just need your access keys.
         config.secret_key = SECRET_KEY
     end
 
+
+Configure SimpleWorker in Rails
+----------------------
+
+If you're using Rails you could set additional config option - "auto_merge=true".
+It will automatically merge all models,mailers,gems and database configuration from your Rails app.
+
+    SimpleWorker.configure do |config|
+        config.access_key = ACCESS_KEY
+        config.secret_key = SECRET_KEY
+        config.auto_merge = true
+    end
+
+
 Write a Worker
 --------------
 
@@ -211,6 +225,11 @@ Or simpler yet, try using relative paths:
     merge "../models/user"
     merge "../models/account.rb"
 
+Also you could use wildcards and path in merge_folder
+
+    merge_folder "./foldername/"     #will merge all *.rb files from foldername
+    merge_folder "../lib/**/"        # will merge all *.rb files from lib and all subdirectories
+
 The opposite can be done as well with "unmerge" and can be useful when using Rails to exclude classes that are automatically
 merged.
 

data/lib/simple_worker/base.rb

@@ -13,6 +13,7 @@ module SimpleWorker
       @merged_workers = []
       @merged_gems = []
       @merged_mailers = []
+      @merged_folders = {}
       @unmerged = []
 
       def reset!
@@ -20,6 +21,7 @@ module SimpleWorker
         @merged_workers = []
         @merged_gems = []
         @merged_mailers = []
+        @merged_folders = {}
         @unmerged = []
       end
 
@@ -86,6 +88,15 @@ module SimpleWorker
         @merged_mailers << {:name=>basename, :path_to_templates=>path_to_templates, :filename => mailer}.merge!(params)
       end
 
+      def merge_folder(path)
+        files = []
+        Dir["#{path}*.rb"].each do |f|
+          f = check_for_file(f)
+          files<<f
+        end
+        @merged_folders[path]=files unless files.empty?
+        SimpleWorker.logger.info  "Merged folders! #{@merged_folders.inspect}"
+      end
       # merges the specified files.
       # todo: don't allow multiple files per merge, just one like require
       def merge(*files)
@@ -326,6 +337,7 @@ module SimpleWorker
         unmerged = self.class.instance_variable_get(:@unmerged)
         merged_gems = self.class.instance_variable_get(:@merged_gems)
         merged_mailers = self.class.instance_variable_get(:@merged_mailers)
+        merged_folders = self.class.instance_variable_get(:@merged_folders)
 #        puts 'merged1=' + merged.inspect
 
         subclass = self.class
@@ -357,7 +369,7 @@ module SimpleWorker
         end
         merged.uniq!
         merged_mailers.uniq!
-        SimpleWorker.service.upload(rfile, subclass.name, :merge=>merged, :unmerge=>unmerged, :merged_gems=>merged_gems, :merged_mailers=>merged_mailers)
+        SimpleWorker.service.upload(rfile, subclass.name, :merge=>merged, :unmerge=>unmerged, :merged_gems=>merged_gems, :merged_mailers=>merged_mailers,:merged_folders=>merged_folders)
         self.class.instance_variable_set(:@uploaded, true)
       else
         SimpleWorker.logger.debug 'Already uploaded for ' + self.class.name

data/lib/simple_worker/service.rb

@@ -52,7 +52,7 @@ module SimpleWorker
       end
 
 
-      zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:merged_mailers])
+      zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:merged_mailers], options[:merged_folders])
 
 #            sys.classes[subclass].__file__
 #            puts '__FILE__=' + Base.subclass.__file__.to_s
@@ -97,7 +97,7 @@ module SimpleWorker
       end
     end
 
-    def build_merged_file(filename, merge, unmerge, merged_gems, merged_mailers)
+    def build_merged_file(filename, merge, unmerge, merged_gems, merged_mailers,merged_folders)
 #      unless (merge && merge.size > 0) || (merged_gems && merged_gems.size > 0)
 #        return filename
 #      end
@@ -168,7 +168,20 @@ module SimpleWorker
               raise "Gem #{gem[:name]} #{gem[:version]} was not found."
             end
           end
+          end
+        if merged_folders && merged_folders.size > 0
+          merged_folders.each do |folder, files|
+            SimpleWorker.logger.debug "Collecting folder #{folder}"
+            if files and files.size>0
+              files.each do |file|
+                zdest = "#{Digest::MD5.hexdigest(folder)}/#{file.sub(':','_').sub('/','_')}"
+                puts 'put file to=' + zdest
+                f.add(zdest, file)
+              end
+            end
+          end
         end
+
         merge.each do |m|
 #          puts "merging #{m} into #{filename}"
           f.add(File.basename(m), m)

data/lib/simple_worker.rb

@@ -15,7 +15,9 @@ module SimpleWorker
 
     def configure()
       yield(config)
-      SimpleWorker.service ||= Service.new(config.access_key, config.secret_key, :config=>config)
+      if config && config.access_key && config.secret_key
+        SimpleWorker.service ||= Service.new(config.access_key, config.secret_key, :config=>config)
+      end
     end
 
     def config

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
+  prerelease: 
+  version: 0.6.3
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 -07:00
-default_executable: 
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip
@@ -25,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -62,7 +53,6 @@ files:
 - lib/simple_worker/used_in_worker.rb
 - rails/init.rb
 - README.markdown
-has_rdoc: true
 homepage: http://github.com/appoxy/simple_worker
 licenses: []
 
@@ -76,21 +66,17 @@ required_ruby_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 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: The official SimpleWorker gem for http://www.simpleworker.com