simple_worker 1.0.2 → 1.0.3.beta

data/README.markdown

@@ -270,6 +270,9 @@ This allows you to use any gem you'd like with SimpleWorker. This uses the same
     merge_gem "some_gem_with_version", "1.2.3"
     # or if gem has poor naming scheme
     merge_gem 'mongoid_i18n', :require => 'mongoid/i18n'
+    # of if gem requires other directories outside lib
+    merge_gem 'prawn', :include_dirs=>['data']
+
 
 [Check here for more info on merge_gem](http://support.simpleworker.com/kb/working-with-simpleworker/merging-gems-into-your-worker).
 

data/lib/simple_worker/base.rb

@@ -43,7 +43,7 @@ module SimpleWorker
         @merged_gems[gem_name.to_s] = gem_info
         #puts 'before require ' + (options[:require] || gem_name)
         begin
-          require options[:require] || gem_name
+          require gem_info[:require]
         rescue LoadError=>ex
           raise "Gem #{gem_name} was found, but we could not load the file '#{options[:require] || gem_name}.rb'. You may need to use :require=>x.........."
         end
@@ -61,8 +61,8 @@ module SimpleWorker
 
       #merge action_mailer mailers
       def merge_mailer(mailer, params={})
-        f2 = SimpleWorker::MergeHelper.check_for_file mailer, @caller_file
-        basename = File.basename(mailer, File.extname(mailer))
+        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)
       end
@@ -93,10 +93,9 @@ module SimpleWorker
       #
       # Example: merge 'models/my_model'
       def merge(f)
-        ret = nil
         f2 = SimpleWorker::MergeHelper.check_for_file(f, @caller_file)
-        fbase = File.basename(f2)
-        ret = {:name=>fbase, :path=>f2}
+        fbase = f2[:basename]
+        ret = f2
         @merged[fbase] = ret
         ret
       end
@@ -105,8 +104,8 @@ module SimpleWorker
       # where a lot of things are auto-merged by default like your models.
       def unmerge(f)
         f2 = SimpleWorker::MergeHelper.check_for_file(f, @caller_file)
-        fbase = File.basename(f2)
-        @unmerged[fbase] = {:name=>fbase, :path=>f2}
+        fbase = f2[:basename]
+        @unmerged[fbase] = f2
         @merged.delete(fbase)
       end
 

data/lib/simple_worker/config.rb

@@ -153,16 +153,16 @@ module SimpleWorker
 
     def merge(file)
       f2 = SimpleWorker::MergeHelper.check_for_file(file, caller[2])
-      fbase = File.basename(f2)
-      ret = {:name=>fbase, :path=>f2}
+      fbase = f2[:basename]
+      ret = f2
       @merged[fbase] = ret
       ret
     end
 
     def unmerge(file)
       f2 = SimpleWorker::MergeHelper.check_for_file(file, caller[2])
-      fbase = File.basename(f2)
-      @unmerged[fbase] = {:name=>fbase, :path=>f2}
+      fbase = f2[:basename]
+      @unmerged[fbase] =f2
       @merged.delete(fbase)
     end
 
@@ -189,8 +189,10 @@ module SimpleWorker
     def self.check_for_file(f, callerr)
       SimpleWorker.logger.debug 'Checking for ' + f.to_s
       f = f.to_str
-      unless Utils.ends_with?(f, ".rb")
-        f << ".rb"
+      f_ext = File.extname(f)
+      if f_ext.empty?
+        f_ext = ".rb"
+        f << f_ext
       end
       exists = false
       if File.exist? f
@@ -209,8 +211,13 @@ module SimpleWorker
         raise "File not found: " + f
       end
       f = File.expand_path(f)
-      require f
-      f
+      require f if f_ext == '.rb'
+      ret = {}
+      ret[:path] = f
+      ret[:extname] = f_ext
+      ret[:basename] = File.basename(f)
+      ret[:name] = ret[:basename]
+      ret
     end
 
     def self.create_gem_info(gem_name, options={})
@@ -220,6 +227,10 @@ module SimpleWorker
       else
         gem_info[:version] = options
       end
+      gem_info[:require] ||= gem_name
+      if options[:include_dirs]
+        gem_info[:include_dirs] = options[:include_dirs].is_a?(Array) ? options[:include_dirs] : [options[:include_dirs]]
+      end
       path = SimpleWorker::Service.get_gem_path(gem_info)
       SimpleWorker.logger.debug "Gem path=#{path}"
       if !path

data/lib/simple_worker/service.rb

@@ -36,16 +36,16 @@ module SimpleWorker
       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)
+      md5_f = File.join(tmp, md5file)
+      if File.exists?(md5_f)
+        existing_md5 = IO.read(md5_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) }
+        File.open(md5_f, 'w') { |f| f.write(md5) }
         new_code = true
         # todo: delete md5 file if error occurs during upload process
       else
@@ -53,21 +53,29 @@ module SimpleWorker
         return
       end
 
-      zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:merged_mailers], options[:merged_folders])
-      SimpleWorker.logger.info 'file size to upload: ' + File.size(zip_filename).to_s
-
-      if new_code
-        options = {
-            "class_name"=>class_name,
-            "name"=>name,
-            "standalone"=>true,
-            "file_name"=> "runner.rb" # File.basename(filename)
-        }
-        #puts 'options for upload=' + options.inspect
-        SimpleWorker.logger.info "Uploading now..."
-        ret = post_file("code/put", File.new(zip_filename), options)
-        SimpleWorker.logger.info "Done uploading."
-        ret
+      begin
+
+        zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:merged_mailers], options[:merged_folders])
+        SimpleWorker.logger.info 'file size to upload: ' + File.size(zip_filename).to_s
+
+        if new_code
+          options = {
+              "class_name"=>class_name,
+              "name"=>name,
+              "standalone"=>true,
+              "file_name"=> "runner.rb" # File.basename(filename)
+          }
+          #puts 'options for upload=' + options.inspect
+          SimpleWorker.logger.info "Uploading now..."
+          ret = post_file("code/put", File.new(zip_filename), options)
+          SimpleWorker.logger.info "Done uploading."
+          return ret
+        end
+
+      rescue => ex
+        # if it errors, let's delete md5 since it wouldn't have uploaded.
+        File.delete(md5_f)
+        raise ex
       end
     end
 
@@ -107,14 +115,16 @@ module SimpleWorker
           SimpleWorker.logger.debug "Unmerging #{x}. Success? #{deleted}"
         end
       end
+      merged = merge
+      SimpleWorker.logger.debug 'merged=' + merged.inspect
 
       merged_gems = merged_gems.merge(SimpleWorker.config.merged_gems)
-      puts 'merged_gems=' + merged_gems.inspect
+      SimpleWorker.logger.debug 'merged_gems=' + merged_gems.inspect
       SimpleWorker.config.unmerged_gems.each_pair do |k, v|
-        puts 'unmerging gem=' + k.inspect
+        SimpleWorker.logger.debug 'unmerging gem=' + k.inspect
         merged_gems.delete(k)
       end
-      puts 'merged_gems_after=' + merged_gems.inspect
+      SimpleWorker.logger.debug 'merged_gems_after=' + merged_gems.inspect
 
       merged_mailers ||= {}
       merged_mailers = merged_mailers.merge(SimpleWorker.config.mailers) if SimpleWorker.config.mailers
@@ -145,12 +155,12 @@ end
         end
         #if SimpleWorker.config.auto_merge
         merged_gems.each_pair do |k, gem|
-          puts "Bundling gem #{gem[:name]}..."
+          SimpleWorker.logger.info "Bundling gem #{gem[:name]}..."
           if gem[:merge]
             f.write "$LOAD_PATH << File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib')\n"
           end
 #              unless gem[:no_require]
-          puts 'writing requires: ' + gem[:require].inspect
+          SimpleWorker.logger.debug 'writing requires: ' + gem[:require].inspect
           if gem[:require].nil?
             gem[:require] = []
           elsif gem[:require].is_a?(String)
@@ -158,7 +168,7 @@ end
           end
           puts gem[:require].inspect
           gem[:require].each do |r|
-            puts 'adding require to file ' + r.to_s
+            SimpleWorker.logger.debug 'adding require to file ' + r.to_s
             f.write "require '#{r}'\n"
           end
 #              end
@@ -177,7 +187,9 @@ end
         end
 
         merged.each_pair do |k, v|
-          f.write "require_relative '#{File.basename(v[:path])}'\n"
+          if v[:extname] == ".rb"
+            f.write "require_relative '#{File.basename(v[:path])}'\n"
+          end
         end
         merged_mailers.each_pair do |k, mailer|
           f.write "require_relative '#{mailer[:name]}'\n"
@@ -214,7 +226,15 @@ end
             path = gem[:path] # get_gem_path(gem)
             if path
               SimpleWorker.logger.debug "Collecting gem #{path}"
-              Dir["#{path}/*", "#{path}/lib/**/**"].each do |file|
+              paths_to_use = ["#{path}/*", "#{path}/lib/**/**"]
+              if gem[:include_dirs]
+                SimpleWorker.logger.debug "including extra dirs: " + gem[:include_dirs].inspect
+                gem[:include_dirs].each do |dir|
+                  paths_to_use << "#{path}/#{dir}/**/**"
+                end
+              end
+              SimpleWorker.logger.debug 'paths_to_use: ' + paths_to_use.inspect
+              Dir.glob(paths_to_use).each do |file|
                 # todo: could check if directory and it not lib, skip it
                 SimpleWorker.logger.debug 'file for gem=' + file.inspect
 #                puts 'gem2=' + gem.inspect
@@ -247,9 +267,9 @@ end
           end
         end
 
-        puts "merge=" + merge.inspect
+        SimpleWorker.logger.debug "merge=" + merge.inspect
         merge.each_pair do |k, v|
-          puts "merging k=#{k.inspect} v=#{v.inspect} into #{filename}"
+          SimpleWorker.logger.debug "merging k=#{k.inspect} v=#{v.inspect} into #{filename}"
           f.add(File.basename(v[:path]), v[:path])
         end
         if merged_mailers && merged_mailers.size > 0

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.2
+  prerelease: 6
+  version: 1.0.3.beta
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 Z
+date: 2011-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: zip
@@ -73,9 +73,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: