rocketjob 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec9bde80b380f421336e84defb46c1367b1a7ead
-  data.tar.gz: 34e4de3851b868ddb8e999e10d90c874ee12e839
+  metadata.gz: b6cc91f7e665fcbe24f0ff2fd388540e5dc04274
+  data.tar.gz: 2c7277a7216c799d0ad59c645a5d3100079bf8f9
 SHA512:
-  metadata.gz: 55d9e58c078a3a0f8ee327356b54bd10d8164e4bcc57380e53fcb9d94072ab02bfc0b071371579d1795a291e14b18e149789a5ab5b06b5566fd74be0dac0e0fd
-  data.tar.gz: 54ade8c803a098df3f809de92900371ca1ea0e68b07bae839ba94f22f50cf4d26530cc2193a6d9c583235e367c98a03621becaf28f11bbdeb606984ef061128c
+  metadata.gz: 69f216ca8f7b62df4fd72bae9f8ef5d4bfbdcff166df82ae494ca8986cd9cc0360e5fb1886334697a5144c3c70b34ce054e36ac0ccde66aa009aab6e71a5a727
+  data.tar.gz: c600c821b1c881c428930f4f9e9133413205ce87811cd001d3b0ceba8c27455bc131d3d7695582f3e1a802872646f1a34c985297847f55a9ecb2495d93a1bec4

data/Rakefile

@@ -1,3 +1,7 @@
+# Setup bundler to avoid having to run bundle exec all the time.
+require 'rubygems'
+require 'bundler/setup'
+
 require 'rake/testtask'
 require_relative 'lib/rocket_job/version'
 
@@ -18,4 +22,10 @@ Rake::TestTask.new(:test) do |t|
   t.warning = false
 end
 
-task default: :test
+# By default run tests against all appraisals
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  require 'appraisal'
+  task default: :appraisal
+else
+  task default: :test
+end

data/lib/rocket_job/dirmon_entry.rb

@@ -78,7 +78,7 @@ module RocketJob
     #          -> :failed   -> :active
     #                       -> :disabled
     #          -> :disabled -> :active
-    aasm column: :state do
+    aasm column: :state, whiny_persistence: true do
       # DirmonEntry is `pending` until it is approved
       state :pending, initial: true
 
@@ -236,7 +236,7 @@ module RocketJob
           next if file_name.include?(self.class.default_archive_directory)
 
           # Security check?
-          if (whitelist_paths.size > 0) && whitelist_paths.none? { |whitepath| file_name.start_with?(whitepath) }
+          if (whitelist_paths.size > 0) && whitelist_paths.none? { |whitepath| file_name.to_s.start_with?(whitepath) }
             logger.error "Skipping file: #{file_name} since it is not in any of the whitelisted paths: #{whitelist_paths.join(', ')}"
             next
           end

data/lib/rocket_job/plugins/job/model.rb

@@ -253,6 +253,12 @@ module RocketJob
           h
         end
 
+        # Returns [Boolean] whether the worker runs on a particular server.
+        def worker_on_server?(server_name)
+          return false unless worker_name.present? && server_name.present?
+          worker_name.start_with?(server_name)
+        end
+
       end
     end
   end

data/lib/rocket_job/plugins/job/state_machine.rb

@@ -19,7 +19,7 @@ module RocketJob
           #                       -> :aborted
           #                       -> :queued (when a worker dies)
           #           -> :aborted
-          aasm column: :state do
+          aasm column: :state, whiny_persistence: true do
             # Job has been created and is queued for processing ( Initial state )
             state :queued, initial: true
 
@@ -76,7 +76,7 @@ module RocketJob
 
             event :requeue do
               transitions from: :running, to: :queued,
-                if:             -> server_name { worker_name.to_s.start_with?(server_name) },
+                if:             -> server_name { worker_on_server?(server_name) },
                 after:          :rocket_job_clear_started_at
             end
           end

data/lib/rocket_job/plugins/job/worker.rb

@@ -169,7 +169,7 @@ module RocketJob
 
         # Returns [Hash<String:[Array<ActiveWorker>]>] All servers actively working on this job
         def rocket_job_active_workers(server_name = nil)
-          return [] if !running? || (server_name && !worker_name.start_with(server_name))
+          return [] if !running? || (server_name && !worker_on_server?(server_name))
           [ActiveWorker.new(worker_name, started_at, self)]
         end
 

data/lib/rocket_job/plugins/rufus/cron_line.rb

@@ -85,7 +85,7 @@ module RocketJob::Plugins::Rufus
 
         fail ArgumentError.new(
           "invalid cronline: '#{line}'"
-        ) if es && es.find { |e| ! e.is_a?(Fixnum) }
+        ) if es && es.find { |e| ! e.is_a?(Integer) }
       end
 
       if @days && @days.include?(0) # gh-221
@@ -517,4 +517,3 @@ module RocketJob::Plugins::Rufus
     end
   end
 end
-

data/lib/rocket_job/plugins/rufus/zo_time.rb

@@ -39,7 +39,10 @@ module RocketJob::Plugins::Rufus
       fail ArgumentError.new(
         "cannot determine timezone from #{zone.inspect}" +
           " (etz:#{ENV['TZ'].inspect},tnz:#{Time.now.zone.inspect}," +
-          "tzid:#{defined?(TZInfo::Data).inspect})"
+          "tzid:#{defined?(TZInfo::Data).inspect})\n" +
+          "Try setting `ENV['TZ'] = 'Continent/City'` in your script " +
+          "(see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)" +
+          (defined?(TZInfo::Data) ? '' : " and adding 'tzinfo-data' to your gems")
       ) unless @zone
 
       @time = nil # cache for #to_time result
@@ -277,6 +280,7 @@ module RocketJob::Plugins::Rufus
     end
 
     def self.get_tzone(str)
+
       return str if str.is_a?(::TZInfo::Timezone)
 
       # discard quickly when it's certainly not a timezone
@@ -284,10 +288,19 @@ module RocketJob::Plugins::Rufus
       return nil if str == nil
       return nil if str == '*'
 
+      ostr = str
+      str = :current if str == :local
+
+      # use Rails' zone by default if Rails is present
+
+      return Time.zone.tzinfo if (
+      ENV['TZ'].nil? && str == :current &&
+        Time.respond_to?(:zone) && Time.zone.respond_to?(:tzinfo)
+      )
+
       # ok, it's a timezone then
 
-      ostr = str
-      str = ENV['TZ'] || Time.now.zone if str == :current || str == :local
+      str = ENV['TZ'] || Time.now.zone if str == :current
 
       # utc_offset
 
@@ -298,7 +311,7 @@ module RocketJob::Plugins::Rufus
         str = (sc > 0 ? "%s%02d:%02d:%02d" : "%s%02d:%02d") % [ sn, hr, mn, sc ]
       end
 
-      return nil if str.nil? || str.index('#')
+      return nil if str.index('#')
       # counters "sun#2", etc... On OSX would go all the way to true
 
       # vanilla time zones
@@ -363,11 +376,14 @@ module RocketJob::Plugins::Rufus
         ) if hr
       end
 
-      # last try with ENV['TZ']
+      # try with ENV['TZ']
 
-      z =
-        (ostr == :local || ostr == :current) &&
-          (::TZInfo::Timezone.get(ENV['TZ']) rescue nil)
+      z = ostr == :current && (::TZInfo::Timezone.get(ENV['TZ']) rescue nil)
+      return z if z
+
+      # ask the system
+
+      z = ostr == :current && (debian_tz || centos_tz || osx_tz)
       return z if z
 
       # so it's not a timezone.
@@ -375,6 +391,39 @@ module RocketJob::Plugins::Rufus
       nil
     end
 
+    def self.debian_tz
+
+      path = '/etc/timezone'
+
+      File.exist?(path) &&
+        (::TZInfo::Timezone.get(File.read(path).strip) rescue nil)
+    end
+
+    def self.centos_tz
+
+      path = '/etc/sysconfig/clock'
+
+      File.open(path, 'rb') do |f|
+        until f.eof?
+          m = f.readline.match(/ZONE="([^"]+)"/)
+          return (::TZInfo::Timezone.get(m[1]) rescue nil) if m
+        end
+      end if File.exist?(path)
+
+      nil
+    end
+
+    def self.osx_tz
+
+      path = '/etc/localtime'
+
+      return nil unless File.exist?(path)
+
+      ::TZInfo::Timezone.get(
+        File.readlink(path).split('/')[4..-1].join('/')
+      ) rescue nil
+    end
+
     def self.local_tzone
 
       get_tzone(:local)

data/lib/rocket_job/server.rb

@@ -61,7 +61,7 @@ module RocketJob
     # States
     #   :starting -> :running -> :paused
     #                         -> :stopping
-    aasm column: :state do
+    aasm column: :state, whiny_persistence: true do
       state :starting, initial: true
       state :running
       state :paused

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob #:nodoc
-  VERSION = '3.0.3'
+  VERSION = '3.0.4'
 end

data/lib/rocket_job/worker.rb

@@ -40,7 +40,7 @@ module RocketJob
         @shutdown = false
       end
       @name             = "#{server_name}:#{id}"
-      @re_check_seconds = re_check_seconds || 60
+      @re_check_seconds = (re_check_seconds || 60).to_f
       @re_check_start   = Time.now
       @filter           = filter || {}
       @current_filter   = @filter.dup
@@ -96,15 +96,12 @@ module RocketJob
     # Process the next available job
     # Returns [Boolean] whether any job was actually processed
     def process_available_jobs
-      # Only clear out the current_filter after every `re_check_seconds`
-      time = Time.now
-      if (time - @re_check_start) > re_check_seconds.to_f
-        @re_check_start     = time
-        self.current_filter = filter.dup
-      end
-
       processed = false
-      while (job = Job.rocket_job_next_job(name, current_filter)) && !shutdown?
+      while !shutdown?
+        reset_filter_if_expired
+        job = Job.rocket_job_next_job(name, current_filter)
+        break unless job
+
         logger.fast_tag("job:#{job.id}") do
           unless job.rocket_job_work(self, false, current_filter)
             processed = true
@@ -114,6 +111,16 @@ module RocketJob
       processed
     end
 
+    # Resets the current job filter if the relevant time interval has passed
+    def reset_filter_if_expired
+      # Only clear out the current_filter after every `re_check_seconds`
+      time = Time.now
+      if (time - @re_check_start) > re_check_seconds
+        @re_check_start     = time
+        self.current_filter = filter.dup
+      end
+    end
+
   end
 end
 

data/test/plugins/state_machine_test.rb

@@ -12,7 +12,7 @@ module Plugins
       field :state, type: String
       validates_presence_of :name, :state
 
-      aasm column: :state do
+      aasm column: :state, whiny_persistence: true do
         state :pending, initial: true
         state :enabled
 
@@ -31,19 +31,23 @@ module Plugins
         @doc.destroy if @doc && !@doc.new_record?
       end
 
-      describe '#aasm_write_state' do
+      describe '#create!' do
         it 'raises an exception when a validation fails on create!' do
           assert_raises Mongoid::Errors::Validations do
             @doc = Test.create!
           end
         end
+      end
 
+      describe '#save!' do
         it 'raises an exception when a validation fails on save' do
           assert_raises Mongoid::Errors::Validations do
             @doc.save!
           end
         end
+      end
 
+      describe '#transition!' do
         it 'raises an exception when a validation fails on state transition with save' do
           assert_raises Mongoid::Errors::Validations do
             @doc.enable!
@@ -51,12 +55,13 @@ module Plugins
           assert @doc.pending?
           refute @doc.valid?
         end
+      end
 
+      describe '#transition' do
         it 'does not raise an exception when a validation fails on state transition without save' do
           @doc.enable
           assert @doc.enabled?
         end
-
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby