iron_worker 2.3.13 → 2.3.14

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012, Iron.io, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.markdown

@@ -63,10 +63,7 @@ This will send it off to the IronWorker cloud.
 Full Documentation
 -----------------
 
-Now that you've got your first worker running, be sure to [check out the full documentation](http://docs.iron.io).
-IronWorker can do so much more!
+Now that you've got your first worker running, be sure to [check out the full documentation](https://github.com/iron-io/iron_worker_ruby/wiki).
+IronWorker can do so much more! 
 
-Discussion Group
-----------------------
-
-Join the discussion group at: https://groups.google.com/forum/#!forum/ironworker-users
+And check out the [Iron.io Dev Center](http://dev.iron.io) for full IronWorker API documentation and and support for other languages.

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 3
-:patch: 13
+:patch: 14
 :build: !!null 

data/lib/iron_worker/base.rb

@@ -70,9 +70,11 @@ module IronWorker
         f2 = IronWorker::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 => f2[:path]}.merge!(params)
+        path_to_layouts = params[:path_to_layouts] || File.join(Rails.root, "app/views/layouts")
+        @merged_mailers[basename] = {:name => basename, :path_to_templates => path_to_templates, :path_to_layouts => path_to_layouts, :filename => f2[:path]}.merge!(params)
       end
 
+
       def merge_folder(path)
         files = []
         #puts "caller_file=" + caller_file
@@ -261,7 +263,12 @@ module IronWorker
     # todo: add a :timeout option
     def wait_until_complete
       check_service
-      IronWorker.service.wait_until_complete(self.task_id)
+      raise "No ID for worker!" if self.task_id.nil? && self.schedule_id.nil?
+      IronWorker.service.wait_until_complete(self.task_id || self.schedule_id, :schedule=>is_schedule?)
+    end
+
+    def is_schedule?
+      !self.schedule_id.nil?
     end
 
     def upload

data/lib/iron_worker/config.rb

@@ -28,7 +28,7 @@ module IronWorker
                   :unmerged,
                   :merged_gems,
                   :unmerged_gems,
-                  :force_upload,
+                  :force_upload, :no_upload,
                   :beta, # for setting beta feature flags
                   :skip_auto_dependencies
 
@@ -88,7 +88,7 @@ module IronWorker
           c2.models = models
           models.each { |model| c2.merge(model) }
           mailers_path = File.join(Rails.root, 'app/mailers/*.rb')
-          Dir.glob(mailers_path).collect { |m| c2.mailers[File.basename(m)] = {:filename=>m, :name => File.basename(m), :path_to_templates=>File.join(Rails.root, "app/views/#{File.basename(m, File.extname(m))}")} }
+          Dir.glob(mailers_path).collect { |m| c2.mailers[File.basename(m)] = {:filename=>m, :name => File.basename(m), :path_to_layouts => File.join(Rails.root, "app/views/layouts"), :path_to_templates=>File.join(Rails.root, "app/views/#{File.basename(m, File.extname(m))}")} }
           c2.extra_requires += ['active_support/core_ext', 'action_mailer']
           #puts 'DB FILE=' + File.join(Rails.root, 'config', 'database.yml').to_s
           if defined?(ActiveRecord) && File.exist?(File.join(Rails.root, 'config', 'database.yml'))
@@ -241,7 +241,7 @@ module IronWorker
         # try relative
         #          p caller
         f2 = File.join(File.dirname(callerr), f)
-        puts 'f2=' + f2
+        #puts 'f2=' + f2
         if File.exist? f2
           exists = true
           f = f2

data/lib/iron_worker/service.rb

@@ -25,7 +25,7 @@ module IronWorker
       options[:logger] = IronWorker.logger
       super("worker-aws-us-east-1.iron.io", token, options)
       self.host = self.config.host if self.config && self.config.host
-      # automerge simple worker gem and dependenices
+      # automerge simple worker gem and dependencies
       self.config.merge_gem('zip')
       self.config.merge_gem('rest-client')
       self.config.merge_gem('rest')
@@ -38,6 +38,10 @@ module IronWorker
     #    - :callback_url
     #    - :merge => array of files to merge in with this file
     def upload(filename, class_name, options={})
+      if self.config.no_upload
+        IronWorker.logger.debug 'NO UPLOAD!'
+        return
+      end
       name = options[:name] || class_name
       project_id = get_project_id(options)
       tmp = Dir.tmpdir()
@@ -401,6 +405,11 @@ end
               zdest = "templates/#{mailer[:name]}/#{file.sub(path+'/', '')}"
               f.add(zdest, file)
             end
+            path = mailer[:path_to_layouts]
+            Dir["#{path}/**/**"].each do |file|
+              zdest = "templates/layouts/#{file.sub(path+'/', '')}"
+              f.add(zdest, file)
+            end
           end
         end
       end
@@ -450,10 +459,16 @@ end
       status = nil
       sleep 1
       while tries < 100
-        status = status(task_id)
+        status = options[:schedule] ? schedule_status(task_id) : status(task_id)
         puts "Waiting... status=" + status["status"]
-        if status["status"] != "queued" && status["status"] != "running"
-          break
+        if options[:schedule]
+          if status["status"] == "complete"
+            break
+          end
+        else
+          if status["status"] != "queued" && status["status"] != "running"
+            break
+          end
         end
         sleep 2
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.3.13
+  version: 2.3.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &19776580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19776580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &19775720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19775720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &19775140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19775140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19774600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19774600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &19774020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19774020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &19773440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19773440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &19772860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19772860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19772320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,12 +133,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19772320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE
 - README.markdown
 files:
 - VERSION.yml
@@ -120,6 +161,7 @@ files:
 - lib/iron_worker/used_in_worker.rb
 - lib/iron_worker/utils.rb
 - rails/init.rb
+- LICENSE
 - README.markdown
 homepage: http://www.iron.io
 licenses: []
@@ -141,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io