minicron 0.3 → 0.4

data/lib/minicron/hub/app.rb

@@ -23,6 +23,10 @@ module Minicron::Hub
       # Disable internal middleware for presenting errors
       # as useful HTML pages
       set :show_exceptions, false
+
+      # Used to enable asset compression, currently nothing else
+      # relies on this
+      set :environment, :production
     end
 
     # Configure how we server assets
@@ -32,6 +36,8 @@ module Minicron::Hub
       serve '/fonts', :from => 'assets/fonts'
       serve '/app',   :from => 'assets/app'
 
+      js_compression :simple
+
       # Set up the application css
       css :app, '/css/all.css', [
         '/css/bootswatch.min.css',

data/lib/minicron/hub/assets/app/components/schedules.js

@@ -273,7 +273,7 @@
         });
       },
       cancel: function(schedule) {
-        this.sendAction('cancel', schedule);
+        this.sendAction('cancel', this.get('job_id'));
       }
     }
   });

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

@@ -30,8 +30,10 @@
         // TODO: make this use a bootstrap model as a component
         var results = 'Test Results\n\n';
             results += 'connect:                     ' + data.connect + '\n';
-            results += 'crontab readable:       ' + data.read + '\n';
-            results += 'crontab writeable:      ' + data.write;
+            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;
 
         window.alert(results);
       } else {
@@ -73,6 +75,7 @@
                    host = this.store.createRecord('host', {
                      name: this.get('name'),
                      fqdn: this.get('fqdn'),
+                     user: this.get('user'),
                      host: this.get('host'),
                      port: this.get('port'),
                      public_key: this.get('public_key')
@@ -101,6 +104,7 @@
                      id: this.get('id'),
                      name: this.get('name'),
                      fqdn: this.get('fqdn'),
+                     user: this.get('user'),
                      host: this.get('host'),
                      port: this.get('port'),
                      public_key: this.get('public_key')

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

@@ -32,13 +32,15 @@
   Minicron.JobsNewController = Ember.ObjectController.extend({
     save_button: 'Save',
     job_name: null,
+    job_user: null,
     job_command: null,
     actions: {
       save: function() {
         var self = this,
             job = this.store.createRecord('job', {
                     name: this.get('job_name'),
-                    command: this.get('job_command'),
+                    user: this.get('job_user'),
+                    command: this.get('job_command')
                   });
         // Let the user know the job is being saved
         this.set('save_button', 'Saving..');
@@ -86,7 +88,8 @@
         var self = this,
             job = this.store.push('job', {
                     id: this.get('id'),
-                    name: this.get('name')
+                    name: this.get('name'),
+                    user: this.get('user')
                   });
 
         job.save().then(function(job) {

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

@@ -5,18 +5,20 @@
     var confirmation = "Are you sure want to delete this schedule? It will be removed from the host crontab also!\n";
     var job_id = schedule.get('job.id');
 
-    schedule.deleteRecord();
+    if (window.confirm(confirmation)) {
+      schedule.deleteRecord();
 
-    schedule.save().then(function() {
-      // This is needed to reload all the relationships correctly after a delete
-      // TODO: do this in a nicer way
-      window.location.hash = '/jobs/' + job_id;
-      window.location.reload();
-    }, function(response) {
-      schedule.rollback();
-      console.log(response);
-      window.prompt('Error deleting schedule, reason:', response.responseJSON.error);
-    });
+      schedule.save().then(function() {
+        // This is needed to reload all the relationships correctly after a delete
+        // TODO: do this in a nicer way
+        window.location.hash = '/jobs/' + job_id;
+        window.location.reload();
+      }, function(response) {
+        schedule.rollback();
+        console.log(response);
+        window.prompt('Error deleting schedule, reason:', response.responseJSON.error);
+      });
+    }
   }
 
   Minicron.SchedulesNewController = Ember.ObjectController.extend({
@@ -38,8 +40,8 @@
           });
         });
       },
-      cancel: function(schedule) {
-        this.transitionToRoute('job', schedule.get('id'));
+      cancel: function(job_id) {
+        this.transitionToRoute('job', job_id);
       }
     }
   });

data/lib/minicron/hub/assets/app/models/host.js

@@ -4,6 +4,7 @@
   Minicron.Host = DS.Model.extend({
     name: DS.attr('string'),
     fqdn: DS.attr('string'),
+    user: DS.attr('string'),
     host: DS.attr('string'),
     port: DS.attr('number'),
     public_key: DS.attr('string'),

data/lib/minicron/hub/assets/app/models/job.js

@@ -4,6 +4,7 @@
   Minicron.Job = DS.Model.extend({
     job_hash: DS.attr('string'),
     name: DS.attr('string'),
+    user: DS.attr('string'),
     command: DS.attr('string'),
     created_at: DS.attr('date'),
     updated_at: DS.attr('date'),

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

@@ -1,6 +1,5 @@
 class Minicron::Hub::App
   # Get all job executions
-  # TODO: Add offset/limit
   get '/api/executions' do
     content_type :json
     executions = Minicron::Hub::Execution.all.order(:created_at => :desc, :started_at => :desc)

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

@@ -2,7 +2,6 @@ require 'minicron/transport/ssh'
 
 class Minicron::Hub::App
   # Get all hosts that a job
-  # TODO: Add offset/limit
   get '/api/hosts' do
     content_type :json
     hosts = Minicron::Hub::Host.all.includes(:jobs).order(:id => :asc)
@@ -26,10 +25,14 @@ class Minicron::Hub::App
       # Default the value of the port
       request_body['host']['port'] ||= 22
 
+      # Default the value of the user
+      request_body['host']['user'] ||= 'root'
+
       # Try and save the new host
       host = Minicron::Hub::Host.create(
         :name => request_body['host']['name'],
         :fqdn => request_body['host']['fqdn'],
+        :user => request_body['host']['user'],
         :host => request_body['host']['host'],
         :port => request_body['host']['port']
       )
@@ -66,6 +69,7 @@ class Minicron::Hub::App
       # Update its data
       host.name = request_body['host']['name']
       host.fqdn = request_body['host']['fqdn']
+      host.user = request_body['host']['user']
       host.host = request_body['host']['host']
       host.port = request_body['host']['port']
 
@@ -93,6 +97,7 @@ class Minicron::Hub::App
 
         # Get an ssh instance and open a connection
         ssh = Minicron::Transport::SSH.new(
+          :user => host.user,
           :host => host.host,
           :port => host.port,
           :private_key => "~/.ssh/minicron_host_#{host.id}_rsa"
@@ -131,29 +136,23 @@ class Minicron::Hub::App
 
       # Set up the ssh instance
       ssh = Minicron::Transport::SSH.new(
+        :user => host.user,
         :host => host.host,
         :port => host.port,
         :private_key => "~/.ssh/minicron_host_#{host.id}_rsa"
       )
 
-      # Open the connection
-      conn = ssh.open
-
-      # Check if the crontab is readable
-      read = conn.exec!('test -r /etc/crontab && echo "y" || echo "n"').strip
+      # Get an instance of the cron class
+      cron = Minicron::Cron.new(ssh)
 
-      # Check if the crontab is writeable
-      write = conn.exec!('test -w /etc/crontab && echo "y" || echo "n"').strip
+      # Test the SSH connection
+      test = cron.test_host_permissions
 
       # Tidy up
       ssh.close
 
       # Return the test results as JSON
-      {
-        :connect => true,
-        :read => read == 'y',
-        :write => write == 'y'
-      }.to_json
+      test.to_json
     rescue Exception => e
       status 422
       { :connect => false, :error => e.message }.to_json

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

@@ -1,6 +1,5 @@
 class Minicron::Hub::App
   # Get all job execution outputs
-  # TODO: Add offset/limit
   get '/api/jobExecutionOutputs' do
     content_type :json
 

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

@@ -2,7 +2,6 @@ require 'minicron/transport'
 
 class Minicron::Hub::App
   # Get all jobs
-  # TODO: Add offset/limit
   get '/api/jobs' do
     content_type :json
 
@@ -11,7 +10,7 @@ class Minicron::Hub::App
                                .where(:job_hash => params[:job_hash])
     else
       jobs = Minicron::Hub::Job.all.order(:created_at => :desc)
-                                .includes(:host, :schedules,  :executions => :job_execution_outputs)
+                               .includes(:host, :schedules,  :executions => :job_execution_outputs)
     end
 
     Minicron::Hub::JobSerializer.new(jobs).serialize.to_json
@@ -39,6 +38,7 @@ class Minicron::Hub::App
       job = Minicron::Hub::Job.create(
         :job_hash => Minicron::Transport.get_job_hash(request_body['job']['command'], host.fqdn),
         :name => request_body['job']['name'],
+        :user => request_body['job']['user'],
         :command => request_body['job']['command'],
         :host_id => host.id
       )
@@ -65,8 +65,9 @@ class Minicron::Hub::App
       job = Minicron::Hub::Job.includes(:host, :schedules,  :executions => :job_execution_outputs)
                               .find(params[:id])
 
-      # Update the name
+      # Update the name and user
       job.name = request_body['job']['name']
+      job.user = request_body['job']['user']
 
       job.save!
 
@@ -92,6 +93,7 @@ class Minicron::Hub::App
 
         # Get an ssh instance
         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"

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

@@ -3,7 +3,6 @@ require 'minicron/cron'
 
 class Minicron::Hub::App
   # Get all schedules
-  # TODO: Add offset/limit
   get '/api/schedules' do
     content_type :json
 
@@ -65,6 +64,7 @@ class Minicron::Hub::App
 
         # Get an ssh instance
         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"
@@ -106,6 +106,7 @@ class Minicron::Hub::App
 
         # Get an ssh instance
         ssh = Minicron::Transport::SSH.new(
+          :user => schedule.job.host.user,
           :host => schedule.job.host.host,
           :port => schedule.job.host.port,
           :private_key => "~/.ssh/minicron_host_#{schedule.job.host.id}_rsa"
@@ -158,6 +159,7 @@ class Minicron::Hub::App
 
         # Get an ssh instance
         ssh = Minicron::Transport::SSH.new(
+          :user => schedule.job.host.user,
           :host => schedule.job.host.host,
           :port => schedule.job.host.port,
           :private_key => "~/.ssh/minicron_host_#{schedule.job.host.id}_rsa"

data/lib/minicron/hub/db/schema.rb

@@ -42,12 +42,13 @@ ActiveRecord::Schema.define(version: 0) do
 
   create_table "hosts", force: true do |t|
     t.string   "name"
-    t.string   "fqdn",       default: "", null: false
-    t.string   "host",       default: "", null: false
-    t.integer  "port",                    null: false
+    t.string   "fqdn",                  default: "", null: false
+    t.string   "user",       limit: 32, default: "", null: false
+    t.string   "host",                  default: "", null: false
+    t.integer  "port",                               null: false
     t.text     "public_key"
-    t.datetime "created_at",              null: false
-    t.datetime "updated_at",              null: false
+    t.datetime "created_at",                         null: false
+    t.datetime "updated_at",                         null: false
   end
 
   add_index "hosts", ["fqdn"], name: "hostname", using: :btree
@@ -63,10 +64,11 @@ ActiveRecord::Schema.define(version: 0) do
   add_index "job_execution_outputs", ["seq"], name: "seq", using: :btree
 
   create_table "jobs", force: true do |t|
+    t.integer  "host_id",                            null: false
     t.string   "job_hash",   limit: 32, default: "", null: false
     t.string   "name"
+    t.string   "user",       limit: 32,              null: false
     t.text     "command",                            null: false
-    t.integer  "host_id",                            null: false
     t.datetime "created_at",                         null: false
     t.datetime "updated_at",                         null: false
   end

data/lib/minicron/hub/db/schema.sql

@@ -7,7 +7,7 @@
 #
 # Host: 127.0.0.1 (MySQL 5.6.16)
 # Database: minicron
-# Generation Time: 2014-04-01 03:35:39 +0000
+# Generation Time: 2014-04-07 17:06:03 +0000
 # ************************************************************
 
 
@@ -73,6 +73,7 @@ CREATE TABLE `hosts` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `fqdn` varchar(255) NOT NULL DEFAULT '',
+  `user` varchar(32) NOT NULL DEFAULT '',
   `host` varchar(255) NOT NULL DEFAULT '',
   `port` int(11) NOT NULL,
   `public_key` text,
@@ -109,10 +110,11 @@ DROP TABLE IF EXISTS `jobs`;
 
 CREATE TABLE `jobs` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `host_id` int(11) NOT NULL,
   `job_hash` varchar(32) NOT NULL DEFAULT '',
   `name` varchar(255) DEFAULT NULL,
+  `user` varchar(32) NOT NULL,
   `command` text NOT NULL,
-  `host_id` int(11) NOT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   PRIMARY KEY (`id`),

data/lib/minicron/hub/views/handlebars/hosts.erb

@@ -55,6 +55,12 @@
           <div class="form-control form-control-view">{{fqdn}}</div>
         </div>
       </div>
+      <div class="form-group">
+        <label class="col-sm-2 control-label">User</label>
+        <div class="col-sm-10">
+          <div class="form-control form-control-view">{{user}}</div>
+        </div>
+      </div>
       <div class="form-group">
         <label class="col-sm-2 control-label">Host</label>
         <div class="col-sm-10">
@@ -141,6 +147,12 @@
         {{input value=fqdn type="text" class="form-control" placeholder="The machine fully qualified domain name e.g 'server1.host.com'"}}
       </div>
     </div>
+    <div class="form-group">
+      <label class="col-sm-2 control-label">User</label>
+      <div class="col-sm-10">
+        {{input value=user type="text" class="form-control" placeholder="The user to connect to the host as"}}
+      </div>
+    </div>
     <div class="form-group">
       <label class="col-sm-2 control-label">Host</label>
       <div class="col-sm-10">
@@ -183,6 +195,12 @@
         {{input value=fqdn type="text" class="form-control" placeholder="The machine fully qualified domain name e.g 'server1.host.com'"}}
       </div>
     </div>
+    <div class="form-group">
+      <label class="col-sm-2 control-label">User</label>
+      <div class="col-sm-10">
+        {{input value=user type="text" class="form-control" placeholder="The user to connect to the host as"}}
+      </div>
+    </div>
     <div class="form-group">
       <label class="col-sm-2 control-label">Host</label>
       <div class="col-sm-10">

data/lib/minicron/hub/views/handlebars/jobs.erb

@@ -48,6 +48,12 @@
           <div class="form-control form-control-view">{{name}}</div>
         </div>
       </div>
+      <div class="form-group">
+        <label class="col-sm-2 control-label">User</label>
+        <div class="col-sm-10">
+          <div class="form-control form-control-view">{{user}}</div>
+        </div>
+      </div>
       <div class="form-group">
         <label class="col-sm-2 control-label">Command</label>
         <div class="col-sm-10">
@@ -151,6 +157,12 @@
         {{input value=job_name type="text" class="form-control" placeholder="A nickname for the job"}}
       </div>
     </div>
+    <div class="form-group">
+      <label class="col-sm-2 control-label">User</label>
+      <div class="col-sm-10">
+        {{input value=job_user type="text" class="form-control" placeholder="What user should the job be run as"}}
+      </div>
+    </div>
     <div class="form-group">
       <label class="col-sm-2 control-label">Command</label>
       <div class="col-sm-10">
@@ -193,6 +205,12 @@
         {{input value=name type="text" class="form-control" placeholder="A nickname for the job"}}
       </div>
     </div>
+    <div class="form-group">
+      <label class="col-sm-2 control-label">User</label>
+      <div class="col-sm-10">
+        {{input value=user type="text" class="form-control" placeholder="What user should the job be run as"}}
+      </div>
+    </div>
     <div class="form-group">
       <div class="col-sm-offset-2 col-sm-10">
         <button type="submit" class="btn btn-success">Save</button>