simple_worker 0.5.6 → 0.5.8

data/README.markdown

@@ -225,7 +225,7 @@ uploaded separately and treated as distinctly separate workers.
 Merging Gems
 ---------------------
 
-This allows you to use any gem you'd like with SimpleWorker. 
+This allows you to use any gem you'd like with SimpleWorker. This uses the same syntax as bundler gem files.
 
     merge_gem "some_gem"
     merge_gem "some_gem_with_version", "1.2.3"

data/lib/simple_worker/base.rb

@@ -66,8 +66,14 @@ module SimpleWorker
 
       # merges the specified gem.
       def merge_gem(gem_name, version=nil)
-        @merged_gems << {:name=>gem_name, :version=>version}
-        require gem_name
+        gem_info = {:name=>gem_name}
+        if version.is_a?(Hash)
+          gem_info.merge!(version)
+        else
+          gem_info[:version] = version
+        end
+        @merged_gems << gem_info
+        require gem_info[:require] || gem_name
       end
 
       # merges the specified files.

data/lib/simple_worker/service.rb

@@ -70,18 +70,19 @@ module SimpleWorker
             "class_name"=>class_name,
             "file_name"=> File.basename(filename)
         }
-        puts 'options for upload=' + options.inspect
+        #puts 'options for upload=' + options.inspect
         ret = post_file("code/put", File.new(zip_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}"
+    def get_gem_path(gem_info)
+      gem_name =(gem_info[:require] || gem_info[:name].match(/^[a-zA-Z0-9\-_]+/)[0])
+      puts "Searching for #{gem_name}..."
       searcher = Gem::GemPathSearcher.new
       gems = searcher.find_all(gem_name)
-      gems = gems.select { |g| g.version.version==version } if version
+      # puts 'gems found=' + gems.inspect
+      gems = gems.select { |g| g.version.version==gem_info[:version] } if gem_info[:version]
       if !gems.empty?
         gem = gems.first
         gem.full_gem_path + "/lib"
@@ -125,7 +126,7 @@ module SimpleWorker
         if merged_gems
           merged_gems.each do |gem|
 #            puts 'gem=' + gem.inspect
-            path = get_gem_path(gem[:name], gem[:version])
+            path = get_gem_path(gem)
             if path
               puts "Collecting gem #{path}"
               Dir["#{path}/**/**"].each do |file|

data/test/awesome_job.rb

@@ -1,6 +1,8 @@
+
 class AwesomeJob < SimpleWorker::Base
   merge_gem 'dropbox' # , '1.2.3'
   # bumpdsfsdfdsfasdf
+  merge_gem 'mongoid_i18n', :require => 'mongoid/i18n'
 
   def run
     begin

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Travis Reeder