simple_job 0.1.0 → 0.2.0

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Simple Job
 
+== Version 0.2.0
+* Added :max_executions option to SQSJobQueue#poll
+* Bug fix to :replace_existing option of JobDefinition::register_simple_job declaration - wasn't properly leaving old definitions
+
 == Version 0.1.0
 * Added AWS CloudWatch monitors for job execution
 * Added :replace_existing option to register_simple_job

data/lib/simple_job/job_definition.rb

@@ -129,23 +129,25 @@ module JobDefinition
     def register_simple_job(options = {})
       default_type = self.name.split('::').last.underscore.to_sym
 
-      replace_existing = options.delete(:replace_existing) || true
+      replace_existing = options.delete(:replace_existing)
+      replace_existing = true if replace_existing.nil?
 
-      @definition = {
+      new_definition = {
         :class => self,
         :type => default_type,
         :versions => [ '1' ],
       }.merge(options)
 
-      @definition[:type] = @definition[:type].to_sym
-      @definition[:versions] = Array(@definition[:versions])
-      @definition[:versions].collect! { |value| value.to_s }
+      new_definition[:type] = new_definition[:type].to_sym
+      new_definition[:versions] = Array(new_definition[:versions])
+      new_definition[:versions].collect! { |value| value.to_s }
 
       if replace_existing
-        ::SimpleJob::JobDefinition.job_definitions.delete_if { |item| item[:type] == default_type }
+        ::SimpleJob::JobDefinition.job_definitions.delete(@definition)
+        @definition = new_definition
       end
 
-      ::SimpleJob::JobDefinition.job_definitions << @definition
+      ::SimpleJob::JobDefinition.job_definitions << new_definition
     end
 
     def job_queue(queue_type = nil)

data/lib/simple_job/sqs_job_queue.rb

@@ -93,7 +93,8 @@ class SQSJobQueue < JobQueue
       :attributes => [ :sent_at, :receive_count, :first_received_at ],
       :raise_exceptions => false,
       :idle_timeout => nil,
-      :poll_interval => DEFAULT_POLL_INTERVAL
+      :poll_interval => DEFAULT_POLL_INTERVAL,
+      :max_executions => nil
     }.merge(options)
 
     message_handler = block || lambda do |definition, message|
@@ -114,7 +115,9 @@ class SQSJobQueue < JobQueue
 
     last_message_at = Time.now
 
+    max_executions = options[:max_executions]
     loop do
+      break if max_executions && (max_executions <= 0)
       last_message = nil
       current_start_milliseconds = get_milliseconds
       current_job_type = 'unknown'
@@ -147,6 +150,7 @@ class SQSJobQueue < JobQueue
           logger.error(e.backtrace.join("\n  "))
         end
       end
+      max_executions -= 1 if max_executions
       break if exit_next
     end
 

data/lib/simple_job/version.rb

@@ -1,3 +1,3 @@
 module SimpleJob
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_job
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Dawson