simple_worker 0.5.4 → 0.5.5

data/lib/simple_worker/base.rb

@@ -217,6 +217,10 @@ module SimpleWorker
       SimpleWorker.service.schedule_status(schedule_id)
     end
 
+    def get_log
+      SimpleWorker.service.log(task_id)
+    end
+
     # Callbacks for developer
     def before_upload
 

data/lib/simple_worker/service.rb

@@ -48,6 +48,7 @@ module SimpleWorker
         new_code = true
       else
 #        puts "#{class_name}: same code, not uploading"
+        return
       end
 
 
@@ -120,12 +121,19 @@ module SimpleWorker
       Zip::ZipFile.open(fname2, 'w') do |f|
         if merged_gems
           merged_gems.each do |gem|
+#            puts 'gem=' + gem.inspect
             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)
+#                puts 'gem2=' + gem.inspect
+                zdest = "gems/#{gem[:name]}/#{file.sub(path+'/', '')}"
+#                puts 'gem file=' + file.to_s
+#                puts 'zdest=' + zdest
+                f.add(zdest, file)
               end
+            else
+              raise "Gem #{gem[:name]} #{gem[:version]} was not found."
             end
           end
         end

data/test/awesome_job.rb

@@ -0,0 +1,23 @@
+class AwesomeJob < SimpleWorker::Base
+  merge_gem 'dropbox'
+  # bumpdsfsdfdsfasdf
+
+  def run
+    begin
+      s = Dropbox::Session.new('...', '...')
+    rescue => ex
+      log "Dropbox doesn't like it when you don't have keys"
+    end
+#    s.mode = :dropbox
+#    s.authorizing_user = 'email@gmail.com'
+#    s.authorizing_password = '...'
+#    s.authorize!
+#
+#    tmp_file = Tempfile.new('myfile.txt')
+#    tmp_file.write("blahblah")
+#    tmp_file.close
+#
+#    s.upload tmp_file.path, 'Test'
+#    tmp_file.unlink
+  end
+end

data/test/test_base.rb

@@ -29,4 +29,29 @@ class TestBase < Test::Unit::TestCase
 
     end
   end
+
+  def wait_for_task(params={})
+    tries = 0
+    status = nil
+    sleep 1
+    while  tries < 60
+      status = status_for(params)
+      puts 'status = ' + status.inspect
+      if status["status"] == "complete" || status["status"] == "error"
+        break
+      end
+      sleep 2
+    end
+    status
+  end
+
+  def status_for(ob)
+    if ob.is_a?(Hash)
+      ob[:schedule_id] ? WORKER.schedule_status(ob[:schedule_id]) : WORKER.status(ob[:task_id])
+    else
+      ob.status
+    end
+  end
+
+
 end

data/test/test_gems.rb

@@ -0,0 +1,18 @@
+require_relative 'test_base'
+require_relative 'awesome_job'
+
+
+class TestGems < TestBase
+
+  def test_dropbox_gem
+
+    worker = AwesomeJob.new
+    worker.queue
+
+    wait_for_task(worker)
+
+    puts 'log=' + worker.get_log
+
+  end
+
+end

data/test/test_simple_worker.rb

@@ -98,30 +98,6 @@ class SimpleWorkerTests < TestBase
   end
 
 
-  def wait_for_task(params={})
-    tries = 0
-    status = nil
-    sleep 1
-    while  tries < 60
-      status = status_for(params)
-      puts 'status = ' + status.inspect
-      if status["status"] == "complete" || status["status"] == "error"
-        break
-      end
-      sleep 2
-    end
-    status
-  end
-
-  def status_for(ob)
-    if ob.is_a?(Hash)
-      ob[:schedule_id] ? WORKER.schedule_status(ob[:schedule_id]) : WORKER.status(ob[:task_id])
-    else
-      ob.status
-    end
-  end
-
-
   def test_require_relative_merge
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -07:00
+date: 2011-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - lib/simple_worker/used_in_worker.rb
 - rails/init.rb
 - README.markdown
+- test/awesome_job.rb
 - test/cool_model.rb
 - test/cool_worker.rb
 - test/db_worker.rb
@@ -72,6 +73,7 @@ files:
 - test/scheduled_worker.rb
 - test/second_worker.rb
 - test/test_base.rb
+- test/test_gems.rb
 - test/test_inheritance.rb
 - test/test_no_config.rb
 - test/test_simple_worker.rb
@@ -113,6 +115,7 @@ signing_key:
 specification_version: 3
 summary: The official SimpleWorker gem for http://www.simpleworker.com
 test_files: 
+- test/awesome_job.rb
 - test/cool_model.rb
 - test/cool_worker.rb
 - test/db_worker.rb
@@ -122,6 +125,7 @@ test_files:
 - test/scheduled_worker.rb
 - test/second_worker.rb
 - test/test_base.rb
+- test/test_gems.rb
 - test/test_inheritance.rb
 - test/test_no_config.rb
 - test/test_simple_worker.rb