crontab_rb 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90295009745221e88388bc43c9412b57f01ac563
-  data.tar.gz: 893850a83ed362887a1cd3ad2418816bdf95dd87
+  metadata.gz: 5b60c0a525c46f023908c26bbe2ea37089d5716e
+  data.tar.gz: 2f15e35e88fd24da38870480787bfd13786fed87
 SHA512:
-  metadata.gz: d66381416963cb2535d4f8fbe328bce0d3c9011081028898441ff2db3fbefaca2818bcf012033c6130268a8d21f8d10c8e9affceae3dd91d4af456e866d40ef8
-  data.tar.gz: e1727aadc3daed1765517c82e2d72b28e4735db10868ad9eaec7e24b230b84923461ca263d08a3cfca797ca6159da7dde7df8c519976742747563f1d7f8a7e5f
+  metadata.gz: 5b83653cf9035dd3cdc15bf4726bb30c145ee9302c20ffa17efbd2bd767e97351ab22b2354d633fa7a2e44161eb13582744ed2f52fde70480d178f04967c6f75
+  data.tar.gz: 16492f6abce8b3a0e993fc149ed1d41208cb32cb90f50e236618419bcdc075ee1de168b8e65fb04f0f23d3619673adac218fb48b5ebb4825e8aaa39e5eaf02e5

data/lib/crontab_rb.rb

@@ -1,6 +1,5 @@
 require "crontab_rb/version"
 require "crontab_rb/configuration"
-
 module CrontabRb
   class << self
     attr_accessor :configuration

data/lib/crontab_rb/cron.rb

@@ -71,7 +71,7 @@ module CrontabRb
     end
 
     def write_crontab
-      CrontabRb::Write.write_crontab
+      Write.write_crontab
     end
   end
 end

data/lib/crontab_rb/parse.rb

@@ -5,7 +5,8 @@ module CrontabRb
     end
 
     def initialize
-      @job_template = ":time /bin/bash -l -c 'cd :path && bundle exec bin/rails runner -e #{Rails.env} ':command''"
+      @template     = "cd :path && bundle exec bin/rails runner -e production ':command'"
+      @job_template = "/bin/bash -l -c ':job'"
       @path         = Dir.pwd
     end
 
@@ -18,30 +19,31 @@ module CrontabRb
         options[:type] = record[:time]
         options[:time] = Template::EVERY[options[:time]]
         options[:path] = @path
-        out = process_template(@job_template, options)
-        out = process_template(out, options)
-        contents << out + "\n"
+        job   = process_template(@template, options)
+        task  = process_template(@job_template, options.merge(:job => job))
+        timer = process_timer(options)
+        contents << timer + " " + task + "\n"
       end
       contents.join("\n")
     end
 
     protected
 
+    def process_timer(options)
+      options[:time].gsub(/:\w+/) do |key|
+        if options[:type].to_i/60 <= 1
+          options[:at].to_i
+        else
+          t = options[:at].to_i*60
+          Time.at(t).utc.strftime("%M %H")
+        end
+      end.gsub(/\s+/m, " ").strip
+    end
+
     def process_template(template, options)
       template.gsub(/:\w+/) do |key|
         before_and_after = [$`[-1..-1], $'[0..0]]
-        key_symbol = key.sub(':', '').to_sym
-        option = ''
-        if key_symbol === :at
-          if options[:type].to_i/60 <= 1
-            option = options[:at].to_i
-          else
-            t = options[:at].to_i*60
-            option = Time.at(t).utc.strftime("%M %H")
-          end
-        else
-          option = options[key_symbol] || key
-        end
+        option = options[key.sub(':', '').to_sym] || key
 
         if before_and_after.all? { |c| c == "'" }
           escape_single_quotes(option)

data/lib/crontab_rb/version.rb

@@ -1,3 +1,3 @@
 module CrontabRb
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crontab_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Nguyen Anh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler