minicron 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 392144921cb0e216156a91d61a09cc108966a0bc
-  data.tar.gz: 684fceac9707235b31bff2c86d6099ddc82f6d5a
+  metadata.gz: 4247c7b0a2874ba3c658df32d6d1dd9182e6b210
+  data.tar.gz: 1832c47897e9f2933a0a42e7c21476633293319a
 SHA512:
-  metadata.gz: a381f1c8f5231e3fabaa66be75995d9254d915ff92623081225fa1ce49d7ce00e522eb790e28f9faf07a6dd4c775db86b7967536b95a998da0f12f85df6e3ec1
-  data.tar.gz: e343cdc83191d441d5d72ba222e5886168f79ca2a8d817ae8d8b26ae0a9f02aa3a0f918cf7f5fe27356d2cd19e5474d11d0a5360348d5eca8b51c9eb601e7971
+  metadata.gz: d196437be5ebebdd185a176a8d384dd619479684927e52b35e6dc096150c4975745cbfee3cdb351aed65dfd07126c3423db27e82669cc2e3987e610b4bed1552
+  data.tar.gz: 3e0a20f945bd05b1474ae6b53dbc843a7035ad239028554780edda6be137d04740d803a197f5f590826bd726fe09e610e0331e7f0b7d9ba7ef12238ea2ef7b16

data/README.md

@@ -107,7 +107,7 @@ but I encourage you to give it a try in a non critical environment and help me t
 
 2. On some distributions you may need to install the ````ruby-dev```` and ````build-essential```` packages
 
-3. To install the latest release (currently 0.7.4) you can ````gem install minicron````, depending on your ruby setup
+3. To install the latest release (currently 0.7.5) you can ````gem install minicron````, depending on your ruby setup
    you may need to run this with ````sudo````
 
 4. Set your database configuration options in ````/etc/minicron.toml````, you can use the [minicron.toml](https://github.com/jamesrwhite/minicron/blob/master/config/minicron.toml) as a guide on what options are configurable

data/lib/minicron.rb

@@ -23,7 +23,9 @@ module Minicron
       'host' => '0.0.0.0',
       'port' => 9292,
       'path' => '/',
-      'debug' => false
+      'debug' => false,
+      'pid_file' => '/tmp/minicron.pid',
+      'cron_file' => '/etc/crontab',
     },
     'database' => {
       'type' => 'sqlite'

data/lib/minicron/cli.rb

@@ -41,7 +41,8 @@ module Minicron
           'port' => opts.port,
           'path' => opts.path,
           'debug' => opts.debug,
-          'pid_file' => opts.pid_file
+          'pid_file' => opts.pid_file,
+          'cron_file' => opts.cron_file
         }
       )
     end

data/lib/minicron/cli/commands.rb

@@ -52,14 +52,14 @@ module Minicron
 
       # Add the `minicron server` command
       def self.add_server_cli_command(cli)
-        default_pid_file = '/tmp/minicron.pid'
         cli.command :server do |c|
           c.syntax = 'minicron server [start|stop|restart|status]'
           c.description = 'Controls the minicron server.'
           c.option '--host STRING', String, "The host for the server to listen on. Default: #{Minicron.config['server']['host']}"
           c.option '--port STRING', Integer, "How port for the server to listed on. Default: #{Minicron.config['server']['port']}"
           c.option '--path STRING', String, "The path on the host. Default: #{Minicron.config['server']['path']}"
-          c.option '--pid_file STRING', String, "The path for daemon's PID file. Default: #{Minicron.config['server']['pid_file'] || default_pid_file}"
+          c.option '--pid_file STRING', String, "The path for daemon's PID file. Default: #{Minicron.config['server']['pid_file']}"
+          c.option '--cron_file STRING', String, "The path to the cron file. Default: #{Minicron.config['server']['cron_file']}"
           c.option '--debug', "Enable debug mode. Default: #{Minicron.config['server']['debug']}"
 
           c.action do |args, opts|
@@ -71,23 +71,23 @@ module Minicron
 
             # Get an instance of insidious and set the pid file
             insidious = Insidious.new(
-              :pid_file => Minicron.config['server']['pid_file'] || default_pid_file,
+              :pid_file => Minicron.config['server']['pid_file'],
               :daemonize => Minicron.config['server']['debug'] == false
             )
 
             case action
             when 'start'
               insidious.start! do
-              # Run the execution monitor (this runs in a separate thread)
-              monitor = Minicron::Monitor.new
-              monitor.start!
-
-              # Start the server!
-              Minicron::Transport::Server.start!(
-                Minicron.config['server']['host'],
-                Minicron.config['server']['port'],
-                Minicron.config['server']['path']
-              )
+                # Run the execution monitor (this runs in a separate thread)
+                monitor = Minicron::Monitor.new
+                monitor.start!
+
+                # Start the server!
+                Minicron::Transport::Server.start!(
+                  Minicron.config['server']['host'],
+                  Minicron.config['server']['port'],
+                  Minicron.config['server']['path'],
+                )
               end
             when 'stop'
               insidious.stop!
@@ -167,11 +167,21 @@ module Minicron
                 case output[:type]
                 when :status
                   unless Minicron.config['cli']['dry_run']
-                    faye.send(:job_id => ids[:job_id], :execution_id => ids[:execution_id], :type => :status, :message => output[:output])
+                    faye.send(
+                      :job_id => ids[:job_id],
+                      :execution_id => ids[:execution_id],
+                      :type => :status,
+                      :message => output[:output]
+                    )
                   end
                 when :command
                   unless Minicron.config['cli']['dry_run']
-                    faye.send(:job_id => ids[:job_id], :execution_id => ids[:execution_id], :type => :output, :message => output[:output])
+                    faye.send(
+                      :job_id => ids[:job_id],
+                      :execution_id => ids[:execution_id],
+                      :type => :output,
+                      :message => output[:output]
+                    )
                   end
                 end
 
@@ -180,7 +190,12 @@ module Minicron
             rescue Exception => e
               # Send the exception message to the server and yield it
               unless Minicron.config['cli']['dry_run']
-                faye.send(:job_id => ids[:job_id], :execution_id => ids[:execution_id], :type => :output, :message => e.message)
+                faye.send(
+                  :job_id => ids[:job_id],
+                  :execution_id => ids[:execution_id],
+                  :type => :output,
+                  :message => e.message
+                )
               end
 
               raise Exception, e

data/lib/minicron/constants.rb

@@ -1,6 +1,6 @@
 # The minicron module
 module Minicron
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
   DEFAULT_CONFIG_FILE = '/etc/minicron.toml'
   BASE_PATH = File.expand_path('../../../', __FILE__)
   LIB_PATH = File.expand_path('../../', __FILE__)

data/lib/minicron/cron.rb

@@ -40,10 +40,10 @@ module Minicron
       etc_execute = conn.exec!("/bin/sh -c 'test -x /etc && echo \"y\" || echo \"n\"'").strip
 
       # Check if the crontab is readable
-      crontab_read = conn.exec!("/bin/sh -c 'test -r /etc/crontab && echo \"y\" || echo \"n\"'").strip
+      crontab_read = conn.exec!("/bin/sh -c 'test -r #{Minicron.config['server']['cron_file']} && echo \"y\" || echo \"n\"'").strip
 
       # Check if the crontab is writeable
-      crontab_write = conn.exec!("/bin/sh -c 'test -w /etc/crontab && echo \"y\" || echo \"n\"'").strip
+      crontab_write = conn.exec!("/bin/sh -c 'test -w #{Minicron.config['server']['cron_file']} && echo \"y\" || echo \"n\"'").strip
 
       {
         :connect => true,
@@ -76,10 +76,10 @@ module Minicron
       raise Exception, "Unable to connect to host, reason: unknown" if !test[:connect]
 
       # Check the crontab is readable
-      raise Exception, "Insufficient permissions to read from /etc/crontab" if !test[:crontab][:read]
+      raise Exception, "Insufficient permissions to read from the cron file" if !test[:crontab][:read]
 
       # Check the crontab is writeable
-      raise Exception, "Insufficient permissions to write to /etc/crontab" if !test[:crontab][:write]
+      raise Exception, "Insufficient permissions to write to the cron file" if !test[:crontab][:write]
 
       # Check /etc is writeable
       raise Exception, "/etc is not writeable by the current user" if !test[:etc][:write]
@@ -88,13 +88,13 @@ module Minicron
       raise Exception, "/etc is not executable by the current user" if !test[:etc][:execute]
 
       # Get the full crontab
-      crontab = conn.exec!('cat /etc/crontab').to_s.strip
+      crontab = conn.exec!("cat #{Minicron.config['server']['cron_file']}").to_s.strip
 
       # Replace the full string with the replacement string
       begin
         crontab[find] = replace
       rescue Exception => e
-        raise Exception, "Unable to replace '#{find}' with '#{replace}' in the crontab, reason: #{e}"
+        raise Exception, "Unable to replace '#{find}' with '#{replace}' in the cron file, reason: #{e}"
       end
 
       # Echo the crontab back to the tmp crontab
@@ -107,7 +107,7 @@ module Minicron
 
         # Throw an exception if we can't see our new line at the end of the file
         if grep != replace
-          fail Exception, "Expected to find nothing when grepping crontab but found #{grep}"
+          fail Exception, "Expected to find nothing when grepping the cron file but found #{grep}"
         end
       else
         # Check the updated line is there
@@ -115,15 +115,15 @@ module Minicron
 
         # Throw an exception if we can't see our new line at the end of the file
         if grep != replace
-          fail Exception, "Expected to find '#{replace}' when grepping crontab but found #{grep}"
+          fail Exception, "Expected to find '#{replace}' when grepping the cron file but found #{grep}"
         end
       end
 
       # And finally replace the crontab with the new one now we now the change worked
-      move = conn.exec!("/bin/sh -c 'mv /tmp/minicron_crontab /etc/crontab && echo \"y\" || echo \"n\"'").to_s.strip
+      move = conn.exec!("/bin/sh -c 'mv /tmp/minicron_crontab #{Minicron.config['server']['cron_file']} && echo \"y\" || echo \"n\"'").to_s.strip
 
       if move != 'y'
-        fail Exception, 'Unable to move /tmp/minicron_crontab to /etc/crontab, check the permissions?'
+        fail Exception, "Unable to move /tmp/minicron_crontab to #{Minicron.config['server']['cron_file']}, check the permissions?"
       end
     end
 
@@ -139,13 +139,13 @@ module Minicron
       # Prepare the line we are going to write to the crontab
       line = build_minicron_command(schedule, job.user, job.command)
       escaped_line = line.shellescape
-      echo_line = "echo #{escaped_line} >> /etc/crontab"
+      echo_line = "echo #{escaped_line} >> #{Minicron.config['server']['cron_file']}"
 
       # Append it to the end of the crontab
       conn.exec!(echo_line).to_s.strip
 
       # Check the line is there
-      tail = conn.exec!('tail -n 1 /etc/crontab').to_s.strip
+      tail = conn.exec!("tail -n 1 #{Minicron.config['server']['cron_file']}").to_s.strip
 
       # Throw an exception if we can't see our new line at the end of the file
       if tail != line
@@ -213,9 +213,9 @@ module Minicron
       conn ||= @ssh.open
 
       # Loop through each job and delete them one by one
-      # TODO: what if one schedule removal fails but others don't? Should
-      # we try and rollback somehow or just return the job with half its
-      # schedules deleted?
+      # TODO: what if one job removal fails but others don't? Should
+      # we try and rollback somehow or just return the host with half its
+      # jobs deleted?
       host.jobs.each do |job|
         delete_job(job, conn)
       end

data/spec/minicron_spec.rb

@@ -79,6 +79,7 @@ describe Minicron do
             'path' => '/',
             'debug' => false,
             'pid_file' => '/tmp/minicron.pid'
+            'cron_file' => '/etc/crontab'
           },
           'database' => {
             'type' => 'sqlite'

data/spec/valid_config.toml

@@ -20,6 +20,7 @@ port = 9292
 path = "/"
 debug = false
 pid_file = "/tmp/minicron.pid"
+cron_file = "/etc/crontab"
 
 # Database options
 [database]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minicron
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - James White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow