crontab_rb 0.2.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c278bcd55709539e1dd44c32586b83dc6675b6
-  data.tar.gz: 6fe08b678086ca5fd6fb2e510f141919d8e96f32
+  metadata.gz: e783a42e7534104e29a1189d441279d752000694
+  data.tar.gz: '086aa3c2557aeb29b9456c9e3c3eec150bb99d20'
 SHA512:
-  metadata.gz: baaf3561948a48335d927d85e4f811b803ae24316213da1234f1124c705ccfbe2cdf66271503974f471e3018640714523152288932f71debf06f70925cb538c6
-  data.tar.gz: 91ee610bab6525da0843f97a51110269d8a2d70bf51c68f0f47ff9cead2d0318169dda79dbe33ce1912e89b9b5b78e8b5fe62cade25dfb96c4250bee96e84693
+  metadata.gz: 6b39bd65061b88f4b9cf223372dc7f8ab033635974e2200d5a02b761feff3e87baf5ef57188b61cc3b1657794056f5398ce4cb6e1947a009684edcda9df61849
+  data.tar.gz: e5636e5a5041cdac57c0aeb4aa77a0ca85268480f6101fdec72d03e1849410d1a7b274ec50ca027a88fc09d004e6148ae725588bc86736b072be5bf3fb606053

data/crontab_rb.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry", "~> 0.12.2"
-
+  spec.add_dependency 'whenever'
 end

data/lib/crontab_rb.rb

@@ -1,23 +1,19 @@
 require "crontab_rb/version"
 require "crontab_rb/configuration"
-
 module CrontabRb
   class << self
     attr_accessor :configuration
   end
-  
+
   def self.configuration
     @configuration ||= Configuration.new
   end
-  
+
   def self.configure
     yield(configuration)
   end
 end
 
 require "crontab_rb/database"
-require "crontab_rb/template"
-require "crontab_rb/parse"
 require "crontab_rb/write"
 require "crontab_rb/cron"
-

data/lib/crontab_rb/configuration.rb

@@ -6,4 +6,4 @@ module CrontabRb
       @path_storage = "#{Dir.home}/.crontab_rb/"
     end
   end
-end
+end

data/lib/crontab_rb/cron.rb

@@ -9,17 +9,16 @@ module CrontabRb
 
     def initialize(attributes={})
       @id          = attributes[:id]
-      @name        = attributes[:name]
-      @command     = attributes[:command]
-      @time        = attributes[:time]
-      @at          = attributes[:at]
+      @name        = attributes[:name]    || ''
+      @command     = attributes[:command] || ''
+      @time        = attributes[:time]    || ''
+      @at          = attributes[:at]      || ''
       @updated_at  = attributes[:updated_at]
     end
 
     def self.create(options={})
       options = convert_to_symbol(options)
       cron = new(options)
-      cron.validate
       record          = Database.create(options)
       cron.id         = record[:id]
       cron.updated_at = record[:updated_at]
@@ -47,7 +46,6 @@ module CrontabRb
       record[:time]    = options[:time]    || record[:time]
       record[:at]      = options[:at]      || record[:at]
       cron = new(record)
-      cron.validate
       Database.new(record).save
       cron.write_crontab
       cron
@@ -62,16 +60,12 @@ module CrontabRb
       cron
     end
 
-    def validate
-      raise "Time attribute of crontab_rb only accept #{CrontabRb::Template::EVERY.keys.join(",")}" unless CrontabRb::Template::EVERY.keys.include?(time)
-    end
-
     def self.convert_to_symbol(hash)
       Hash[hash.map{|k, v| [k.to_sym, v]}]
     end
 
     def write_crontab
-      CrontabRb::Write.write_crontab
+      Write.write_crontab
     end
   end
 end

data/lib/crontab_rb/version.rb

@@ -1,3 +1,3 @@
 module CrontabRb
-  VERSION = "0.2.0"
+  VERSION = "1.1.0"
 end

data/lib/crontab_rb/write.rb

@@ -1,8 +1,38 @@
+require 'whenever'
 module CrontabRb
   class Write
-    def self.write_crontab
-      contents = CrontabRb::Parse.from_database
-      command = "crontab -"
+      def self.write_crontab
+      command = 'crontab -'
+      shortcut_jobs, regular_jobs = [], []
+      contents = ''
+      records = Database.all
+      records.each do |record|
+        options = {
+          at: record[:at].presence,
+          job_template: "/bin/bash -l -c ':job'",
+          template: "cd :path && :bundle_command :runner_command -e :environment ':task' :output",
+          environment_variable: 'RAILS_ENV',
+          environment: 'production',
+          path: Dir.pwd,
+          chronic_options: {},
+          runner_command: "bin/rails runner",
+          bundle_command: "bundle exec",
+          task: record[:command],
+          mailto: ''
+        }
+        job = Whenever::Job.new(options)
+        Whenever::Output::Cron.output(record[:time], job, chronic_options: {}) do |cron|
+          cron << "\n\n"
+          if cron[0,1] == "@"
+            shortcut_jobs << cron
+          else
+            regular_jobs << cron
+          end
+        end
+      end
+      contents = shortcut_jobs.join + combine(regular_jobs).join
+
+
       IO.popen(command, 'r+') do |crontab|
         crontab.write(contents)
         crontab.close_write
@@ -12,5 +42,25 @@ module CrontabRb
         puts "[write] crontab file updated"
       end
     end
+
+    def self.combine(entries)
+      entries.map! { |entry| entry.split(/ +/, 6) }
+      0.upto(4) do |f|
+        (entries.length-1).downto(1) do |i|
+          next if entries[i][f] == '*'
+          comparison = entries[i][0...f] + entries[i][f+1..-1]
+          (i-1).downto(0) do |j|
+            next if entries[j][f] == '*'
+            if comparison == entries[j][0...f] + entries[j][f+1..-1]
+              entries[j][f] += ',' + entries[i][f]
+              entries.delete_at(i)
+              break
+            end
+          end
+        end
+      end
+
+      entries.map { |entry| entry.join(' ') }
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: crontab_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nguyen Anh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.2
+- !ruby/object:Gem::Dependency
+  name: whenever
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easy and safe way to manage your crontab file via CRUD
 email:
 - cauut2117610@gmail.com
@@ -71,8 +85,6 @@ files:
 - lib/crontab_rb/configuration.rb
 - lib/crontab_rb/cron.rb
 - lib/crontab_rb/database.rb
-- lib/crontab_rb/parse.rb
-- lib/crontab_rb/template.rb
 - lib/crontab_rb/version.rb
 - lib/crontab_rb/write.rb
 homepage: https://github.com/Nguyenanh/crontab_rb

data/lib/crontab_rb/parse.rb

@@ -1,65 +0,0 @@
-module CrontabRb
-  class Parse
-    def self.from_database
-      new.call
-    end
-
-    def initialize
-      @job_template = ":time /bin/bash -l -c 'cd :path && bundle exec bin/rails runner ':command''"
-      @path         = Dir.pwd
-    end
-
-    def call
-      records = Database.all
-      return "\n" if records.empty?
-      contents = []
-      records.each do |record|
-        options = record
-        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"
-      end
-      contents.join("\n")
-    end
-
-    protected
-
-    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
-
-        if before_and_after.all? { |c| c == "'" }
-          escape_single_quotes(option)
-        elsif before_and_after.all? { |c| c == '"' }
-          escape_double_quotes(option)
-        else
-          option
-        end
-      end.gsub(/\s+/m, " ").strip
-    end
-
-    def escape_single_quotes(str)
-      str.gsub(/'/) { "'\\''" }
-    end
-
-    def escape_double_quotes(str)
-      str.gsub(/"/) { '\"' }
-    end
-
-  end
-end

data/lib/crontab_rb/template.rb

@@ -1,10 +0,0 @@
-module CrontabRb
-  module Template
-    EVERY= {
-      "1"     => "*/:at * * * *",
-      "60"    => ":at * * * *",
-      "1440"  => ":at * * *",
-      "4320"  => ":at */3 * *"
-    }
-  end
-end