crono_trigger 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efcd9ba0f357498e090d327a1b9ef3af54437501
-  data.tar.gz: ca3c3b5c144479f64c8cb6e39ea2904da63b8e2d
+  metadata.gz: 9fab2315a80e4be9236cf9434376391a1c6094db
+  data.tar.gz: 81c83e45ab1dc7807da2aa37b32ae7a2eae29be2
 SHA512:
-  metadata.gz: 2ec6528498231a77d1a2b255e1cf04fe43ed0a035dac4009a3b8cdc099acb28d8a16663b0a793fe3aa27de9d5091c86dd3bdbaed9e9f77e01c1cd674da02a2a2
-  data.tar.gz: c0a0edce5e9601db48f9585bb88cd964a06bb81458bbce1d83f601a7d916247c5f4c60b3528de0ba434e8c12a53de0b889834016c6c36d4d785a4d86cb78f4d9
+  metadata.gz: 70ae8e8e74eb754c58276dd009ba7b186039f47bbf06271040e274e1c7f636048a90bf6583aea7541b961e001ccb1a898583de320415afc69d3abfb29bcfb15c
+  data.tar.gz: a98c18cd51895f6cdfc190988cd66990b405875b8daec137f74e51d4f72d4caac643b5622adf7fdc14b8544840254a916b0a88624fd4c454cf3004bb75ae7619

data/README.md

@@ -122,7 +122,7 @@ $ crono_trigger MailNotification
 $ crono_trigger --help
 Usage: crono_trigger [options] MODEL [MODEL..]
     -f, --config-file=CONFIG         Config file (ex. ./crono_trigger.rb)
-    -e, --envornment=ENV             Set environment name (ex. development, production)
+    -e, --environment=ENV            Set environment name (ex. development, production)
     -p, --polling-thread=SIZE        Polling thread size (Default: 1)
     -i, --polling-interval=SECOND    Polling interval seconds (Default: 5)
     -c, --concurrency=SIZE           Execute thread size (Default: 25)

data/lib/crono_trigger/cli.rb

@@ -14,7 +14,7 @@ opt_parser = OptionParser.new do |opts|
     options[:config] = cfg
   end
 
-  opts.on("-e", "--envornment=ENV", "Set environment name (ex. development, production)") do |env|
+  opts.on("-e", "--environment=ENV", "Set environment name (ex. development, production)") do |env|
     options[:env] = env
   end
 

data/lib/crono_trigger/schedulable.rb

@@ -114,12 +114,21 @@ module CronoTrigger
     def activate_schedule!(at: Time.current)
       time = calculate_next_execute_at || at
 
+      attributes = {}
+      unless self[crono_trigger_column_name(:next_execute_at)]
+        attributes[crono_trigger_column_name(:next_execute_at)] = time
+      end
+
+      if self.class.column_names.include?(crono_trigger_column_name(:started_at))
+        unless self[crono_trigger_column_name(:started_at)]
+          attributes[crono_trigger_column_name(:started_at)] = time
+        end
+      end
+
       if new_record?
-        self[crono_trigger_column_name(:next_execute_at)] ||= time
+        self.attributes = attributes
       else
-        unless self[crono_trigger_column_name(:next_execute_at)]
-          update_column(crono_trigger_column_name(:next_execute_at), time)
-        end
+        update_columns(attributes)
       end
     end
 
@@ -185,7 +194,7 @@ module CronoTrigger
     def calculate_next_execute_at(now = Time.current)
       if self[crono_trigger_column_name(:cron)]
         tz = self[crono_trigger_column_name(:timezone)].try { |zn| TZInfo::Timezone.get(zn) }
-        base = [now, self[crono_trigger_column_name(:started_at)]].max
+        base = [now, self[crono_trigger_column_name(:started_at)]].compact.max
         cron_now = tz ? base.in_time_zone(tz) : base
         Chrono::NextTime.new(now: cron_now, source: self[crono_trigger_column_name(:cron)]).to_time
       end

data/lib/crono_trigger/version.rb

@@ -1,3 +1,3 @@
 module CronoTrigger
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/generators/crono_trigger/migration/templates/create_table_migration.rb

@@ -28,7 +28,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration<%= Rails::VERSION::M
       t.timestamps<%= Rails::VERSION::MAJOR >=5 ? " null: false" : "" %>
 <% end -%>
     end
-    <% attributes.select { |attribute| attribute.respond_to?(:token?) && attribute.token? }.each do |attribute| -%>
+<% attributes.select { |attribute| attribute.respond_to?(:token?) && attribute.token? }.each do |attribute| -%>
     add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
 <% end -%>
 <% attributes_with_index.each do |attribute| -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono_trigger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrono
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: In Service Asynchronous Job Scheduler for Rails