minicron 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e56bf6a4890ec60c50ff3843130e356c62a4205
-  data.tar.gz: a99ba6773693386d61f30607f2198af48704ac38
+  metadata.gz: f28365c7bfec3d1aee7154ca2c0d92c71c9606b3
+  data.tar.gz: 0764cab857b36939ca2a24482549a48fd2e5f0e8
 SHA512:
-  metadata.gz: a5bd6f87272cd992a266bcee8b13b12cb7152f45a2ff93d9a4c32c3dd97e38e3baccd68cc107b4aa4748a8b9eeb86dd6c419a1ad6527de8819d7375535715e20
-  data.tar.gz: cf7f3861b4efff02d9eb7e67ded6c3f1f34702825cdfe3f27c34306bc87fd63c302756e5b7839f66be30e4df76de4bd19057927425553f3073ef55ec9e00101f
+  metadata.gz: 68942a54bad7846305ce191398a84def24ba9ecad774edd83ab9195a148363ab4b22faa51bc1ae1eb1d198a2aa31afd6f5c4f401c997dd7be8978d7534ff9247
+  data.tar.gz: 11736bb3645b87ed55ae95744a61022f0044f7706c1d51071cd5aaf211929b2b6056edbd17b53059488747cc37f1b6f54faa21c339e88d44e4077d406123b235

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.6) you can ````gem install minicron````, depending on your ruby setup
+3. To install the latest release (currently 0.7.7) 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/constants.rb

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

data/lib/minicron/cron.rb

@@ -149,7 +149,7 @@ module Minicron
 
       # Throw an exception if we can't see our new line at the end of the file
       if tail != line
-        fail Exception, "Expected to find '#{line}' at eof but found '#{tail}'"
+        fail Exception, "Expected to find '#{line}' at EOF but found '#{tail}'"
       end
     end
 
@@ -173,6 +173,31 @@ module Minicron
       find_and_replace(conn, find, replace)
     end
 
+    # Update the user for a job and all its schedules
+    #
+    # @param job [Minicron::Hub::Job] an instance of a job model including the schedule relation
+    # @param old_user [String] the old job user as a string
+    # @param new_user [String] the new job user as a string
+    # @param conn an instance of an open ssh connection
+    def update_user(job, old_user, new_user, conn = nil)
+      conn ||= @ssh.open
+
+      # Loop through each schedule and delete them one by one
+      # TODO: what if one schedule update fails but others don't? Should
+      # we try and rollback somehow or just return the job with half its
+      # schedules deleted?
+      job.schedules.each do |schedule|
+        # We are looking for the current value of the schedule
+        find = build_minicron_command(schedule.formatted, old_user, job.command)
+
+        # And replacing it with the updated value
+        replace = build_minicron_command(schedule.formatted, new_user, job.command)
+
+        # Replace the old schedule with the new schedule
+        find_and_replace(conn, find, replace)
+      end
+    end
+
     # Remove the schedule for this job from the crontab
     #
     # @param job [Minicron::Hub::Job] an instance of a job model

data/lib/minicron/hub/assets/app/controllers/hosts.js

@@ -23,14 +23,15 @@
 
   function testConnection(self, host) {
     self.set('test_connection', 'Testing..');
+    var path_prefix = window.config.path === '/' ? '' : window.config.path;
 
-    jQuery.getJSON(window.config.path + '/api/hosts/' + host.id + '/test_ssh').done(function(data) {
+    jQuery.getJSON(path_prefix + '/api/hosts/' + host.id + '/test_ssh').done(function(data) {
       // Could we at least connect to the host?
       if (data.connect) {
         // TODO: make this use a bootstrap model as a component
         var results = 'Test Results\n\n';
             results += 'connect:                     ' + data.connect + '\n';
-            results += '/etc writeable:           ' + data.etc.write + '\n';
+            results += '/etc writeable:            ' + data.etc.write + '\n';
             results += '/etc executable:         ' + data.etc.execute + '\n';
             results += 'crontab readable:       ' + data.crontab.read + '\n';
             results += 'crontab writeable:      ' + data.crontab.write;

data/lib/minicron/hub/controllers/api/jobs.rb

@@ -58,21 +58,45 @@ class Minicron::Hub::App
   put '/api/jobs/:id' do
     content_type :json
     begin
-      # Load the JSON body
-      request_body = Oj.load(request.body)
+      Minicron::Hub::Job.transaction do
+        # Load the JSON body
+        request_body = Oj.load(request.body)
 
-      # Find the job
-      job = Minicron::Hub::Job.includes(:host, :schedules, :executions => :job_execution_outputs)
-                              .find(params[:id])
+        # Find the job
+        job = Minicron::Hub::Job.includes(:host, :schedules, :executions => :job_execution_outputs)
+                                .find(params[:id])
 
-      # Update the name and user
-      job.name = request_body['job']['name']
-      job.user = request_body['job']['user']
+        # Store a copy of the current job user in case we need to change it
+        old_user = job.user
 
-      job.save!
+        # Update the name and user
+        job.name = request_body['job']['name']
+        job.user = request_body['job']['user']
 
-      # Return the new job
-      Minicron::Hub::JobSerializer.new(job).serialize.to_json
+        # Only update the job user if it has changed
+        if old_user != job.user
+          ssh = Minicron::Transport::SSH.new(
+            :user => job.host.user,
+            :host => job.host.host,
+            :port => job.host.port,
+            :private_key => "~/.ssh/minicron_host_#{job.host.id}_rsa"
+          )
+
+          # Get an instance of the cron class
+          cron = Minicron::Cron.new(ssh)
+
+          # Update the job schedules in the crontab
+          cron.update_user(job, old_user, job.user)
+
+          # Tidy up
+          ssh.close
+        end
+
+        job.save!
+
+        # Return the new job
+        Minicron::Hub::JobSerializer.new(job).serialize.to_json
+      end
     # TODO: nicer error handling here with proper validation before hand
     rescue Exception => e
       status 422

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minicron
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - James White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -104,20 +104,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement