crontabinator 0.0.2 → 0.0.3

data/lib/crontabinator/built-in.rb

@@ -1,6 +1,6 @@
-set :crontab_log_level,             "info"
 set :crontab_logs_path,             -> { shared_path.join('log') }
 set :crontab_templates_path,        "templates/crontab"
 set :crontab_lockfile_path,         -> { "#{fetch(:crontab_templates_path)}/crontab.lock" }
 set :crontab_scripts_path,          -> { "#{fetch(:crontab_templates_path)}/scripts.d" }
 set :crontab_server_scripts_path,   -> { current_path.join('script') }
+

data/lib/crontabinator/check.rb

@@ -6,11 +6,11 @@ namespace :crontab do
         files = Dir.glob("#{fetch(:crontab_scripts_path)}/*\.erb")
         set :crontab_script_files, files.collect { |f| File.expand_path(f) }
         fetch(:crontab_script_files).each do |file|
-          hash = eval(File.read(file).lines.to_a.shift)
-          if hash.nil? or hash[:user].nil? or hash[:schedule].nil?
+          hash = eval(File.read(file).lines.to_a.shift).deep_symbolize_keys
+          if hash.nil? or hash[:user].nil? or hash[:schedule].nil? or hash[:stages].nil?
             fatal "Error reading the first line of #{file}"
             fatal "Ensure the first line is a Ruby hash in the form: " +
-              "\"{ :user => \"www-data\", :schedule => \"* * * * *\" }\""
+              "\"{ :user => \"www-data\", :schedule => \"* * * * *\", :stages => [:production, :staging] }\""
             fatal "Your shebang line directly next"
             exit
           end
@@ -51,3 +51,11 @@ namespace :crontab do
 
   end
 end
+
+class Object
+  def deep_symbolize_keys
+    return self.inject({}){|memo,(k,v)| memo[k.to_sym] = v.deep_symbolize_keys; memo} if self.is_a? Hash
+    return self.inject([]){|memo,v    | memo           << v.deep_symbolize_keys; memo} if self.is_a? Array
+    return self
+  end
+end

data/lib/crontabinator/crontab.rb

@@ -1,7 +1,7 @@
 namespace :crontab do
 
   # sets :user_crontab_hash in the form:
-  # { :"user" => ["#!/bin/bash", "/bin/echo 'asdf' >> /tmp/test.log"] }
+  # { :"username" => ["#!/bin/bash", "/bin/echo 'asdf' >> /tmp/test.log"] }
   task :read_all_settings => ['crontab:check:scripts'] do
     run_locally do
       user_crontab_hash = {}
@@ -9,9 +9,12 @@ namespace :crontab do
       # Auto entries
       auto_entries = []
       fetch(:crontab_script_files).each do |file|
-        hash = eval(File.read(file).lines.to_a.shift)
-        path = "#{fetch(:crontab_server_scripts_path)}/#{File.basename(file, '.erb')}"
-        auto_entries += [{ :user => hash[:user], :schedule => hash[:schedule], :path => path }]
+        hash = eval(File.read(file).lines.to_a.shift).deep_symbolize_keys
+        hash[:stages] = hash[:stages].collect { |stage| stage.to_sym }
+        if hash[:stages].include? fetch(:stage)
+          path = "#{fetch(:crontab_server_scripts_path)}/#{File.basename(file, '.erb')}"
+          auto_entries += [{ :user => hash[:user], :schedule => hash[:schedule], :path => path }]
+        end
       end
       auto_entries.each do |entry|
         name = File.basename(entry[:path], '.erb')
@@ -49,14 +52,17 @@ namespace :crontab do
     on roles(:cron) do |host|
       fetch(:crontab_script_files).each do |path|
         lines = File.read(path).lines.to_a
-        lines.shift
-        file = ERB.new(lines.join, nil, '-').result(binding)
-        as :root do execute("rm", "/tmp/script", "-f") end
-        upload! StringIO.new(file), "/tmp/script"
-        final_path = "#{fetch(:crontab_server_scripts_path)}/#{File.basename(path, '.erb')}"
-        as :root do
-          execute("mv", "/tmp/script", final_path)
-          execute("chmod", "750", final_path)
+        hash = eval(lines.shift).deep_symbolize_keys
+        hash[:stages] = hash[:stages].collect { |stage| stage.to_sym }
+        if hash[:stages].include? fetch(:stage).to_sym
+          file = ERB.new(lines.join, nil, '-').result(binding)
+          as :root do execute("rm", "/tmp/script", "-f") end
+          upload! StringIO.new(file), "/tmp/script"
+          final_path = "#{fetch(:crontab_server_scripts_path)}/#{File.basename(path, '.erb')}"
+          as :root do
+            execute("mv", "/tmp/script", final_path)
+            execute("chmod", "750", final_path)
+          end
         end
       end
     end
@@ -64,10 +70,6 @@ namespace :crontab do
 
   desc "Idempotently setup Crontabs."
   task :setup => ['crontab:check:settings', :read_all_settings, :upload_scripts] do
-    log_level = SSHKit.config.output_verbosity
-    log_level = "info" if log_level.nil?
-    SSHKit.config.output_verbosity = fetch(:crontab_log_level)
-
     on roles(:cron) do |host|
       # New
       fetch(:user_crontab_hash).each do |user, lines|
@@ -90,7 +92,7 @@ namespace :crontab do
       # Old
       fetch(:crontabs_to_remove).each do |user|
         as :root do
-          execute "crontab", "-u", user, "-r"
+          test "crontab", "-u", user, "-r"
         end
       end
       content = [
@@ -104,7 +106,6 @@ namespace :crontab do
         warn "Updated '#{fetch(:crontab_lockfile_path)}', add it to version control"
       end
     end
-    SSHKit.config.output_verbosity = log_level
   end
 
   if Rake::Task.task_defined?("deploy:publishing")
@@ -113,10 +114,6 @@ namespace :crontab do
 
   desc "Check the status of the Crontabs."
   task :status => [:read_all_settings] do
-    log_level = SSHKit.config.output_verbosity
-    log_level = "info" if log_level.nil?
-    SSHKit.config.output_verbosity = fetch(:crontab_log_level)
-
     on roles(:cron) do
       fetch(:user_crontab_hash).each do |user, _|
         as :root do
@@ -128,8 +125,6 @@ namespace :crontab do
         end
       end
     end
-
-    SSHKit.config.output_verbosity = log_level
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crontabinator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano