minicron 0.1.1 → 0.2

data/lib/minicron/constants.rb

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

data/lib/minicron/cron.rb

@@ -57,7 +57,7 @@ module Minicron
 
       # Throw an exception if it failed
       if update != 'y'
-        raise Exception, "Unable to replace '#{find}' with '#{replace}' in the crontab"
+        fail Exception, "Unable to replace '#{find}' with '#{replace}' in the crontab"
       end
 
       # If it's a delete
@@ -67,7 +67,7 @@ module Minicron
 
         # Throw an exception if we can't see our new line at the end of the file
         if grep != replace
-          raise Exception, "Expected to find nothing when grepping crontab but found #{grep}"
+          fail Exception, "Expected to find nothing when grepping crontab but found #{grep}"
         end
       else
         # Check the updated line is there
@@ -75,7 +75,7 @@ module Minicron
 
         # Throw an exception if we can't see our new line at the end of the file
         if grep != replace
-          raise Exception, "Expected to find '#{replace}' when grepping crontab but found #{grep}"
+          fail Exception, "Expected to find '#{replace}' when grepping crontab but found #{grep}"
         end
       end
 
@@ -83,7 +83,7 @@ module Minicron
       move = conn.exec!("mv /etc/crontab.tmp /etc/crontab && echo 'y' || echo 'n'").to_s.strip
 
       if move != 'y'
-        raise Exception, 'Unable to move tmp crontab with updated crontab'
+        fail Exception, 'Unable to move tmp crontab with updated crontab'
       end
     end
 
@@ -105,7 +105,7 @@ module Minicron
 
       # Throw an exception if it failed
       if write != 'y'
-        raise Exception, "Unable to write '#{line}' to the crontab"
+        fail Exception, "Unable to write '#{line}' to the crontab"
       end
 
       # Check the line is there
@@ -113,7 +113,7 @@ module Minicron
 
       # Throw an exception if we can't see our new line at the end of the file
       if tail != line
-        raise Exception, "Expected to find '#{line}' at eof but found '#{tail}'"
+        fail Exception, "Expected to find '#{line}' at eof but found '#{tail}'"
       end
     end
 

data/lib/minicron/hub/app.rb

@@ -84,15 +84,15 @@ module Minicron::Hub
       # Configure the database
       case Minicron.config['database']['type']
       when 'mysql'
-        set :database, {
-          :adapter => 'mysql2',
-          :host => Minicron.config['database']['host'],
-          :database => Minicron.config['database']['database'],
-          :username => Minicron.config['database']['username'],
-          :password => Minicron.config['database']['password']
-        }
+        set :database,
+            :adapter => 'mysql2',
+            :host => Minicron.config['database']['host'],
+            :database => Minicron.config['database']['database'],
+            :username => Minicron.config['database']['username'],
+            :password => Minicron.config['database']['password']
+
       else
-        raise Exception, "The database #{Minicron.config['database']['type']} is not supported"
+        fail Exception, "The database #{Minicron.config['database']['type']} is not supported"
       end
     end
   end

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

@@ -5,12 +5,13 @@
     var confirmation = "Are you sure want to delete this execution?";
 
     if (window.confirm(confirmation)) {
-      // TODO: Do the same cascading delete that happens on the backend
-      // i.e deleting this execution also deletes the job execution output
       execution.deleteRecord();
 
       execution.save().then(function() {
-        self.transitionToRoute('executions');
+        // This is needed to reload all the relationships correctly after a delete
+        // TODO: do this in a nicer way
+        window.location.hash = '/executions';
+        window.location.reload();
       }, function(response) {
         execution.rollback();
         console.log(response);

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

@@ -6,13 +6,13 @@
         confirmation += 'All associated data i.e jobs on this host and the jobs in this hosts crontab will be REMOVED!';
 
     if (window.confirm(confirmation)) {
-      // TODO: Do the same cascading delete that happens on the backend
-      // i.e deleting jobs -> executions -> job_execution_outputs linked
-      // to this host
       host.deleteRecord();
 
       host.save().then(function() {
-        self.transitionToRoute('hosts');
+        // This is needed to reload all the relationships correctly after a delete
+        // TODO: do this in a nicer way
+        window.location.hash = '/hosts';
+        window.location.reload();
       }, function(response) {
         host.rollback();
         console.log(response);

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

@@ -6,13 +6,13 @@
         confirmation += 'All associated data will be deleted and it will be REMOVED from the host!';
 
     if (window.confirm(confirmation)) {
-      // TODO: Do the same cascading delete that happens on the backend
-      // i.e deleting jobs -> executions -> job_execution_outputs linked
-      // to this job
       job.deleteRecord();
 
       job.save().then(function() {
-        self.transitionToRoute('jobs');
+        // This is needed to reload all the relationships correctly after a delete
+        // TODO: do this in a nicer way
+        window.location.hash = '/jobs';
+        window.location.reload();
       }, function(response) {
         job.rollback();
         console.log(response);

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

@@ -8,7 +8,10 @@
     schedule.deleteRecord();
 
     schedule.save().then(function() {
-      self.transitionToRoute('job', job_id);
+      // 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);

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

@@ -4,16 +4,16 @@ class Minicron::Hub::App
   get '/api/executions' do
     content_type :json
     executions = Minicron::Hub::Execution.all.order(:created_at => :desc, :started_at => :desc)
-                                         .includes({:job => :host}, :job_execution_outputs)
-    ExecutionSerializer.new(executions).serialize.to_json
+                                         .includes({ :job => :host }, :job_execution_outputs)
+    Minicron::Hub::ExecutionSerializer.new(executions).serialize.to_json
   end
 
   # Get a single job execution by its ID
   get '/api/executions/:id' do
     content_type :json
-    execution = Minicron::Hub::Execution.includes({:job => :host}, :job_execution_outputs)
+    execution = Minicron::Hub::Execution.includes({ :job => :host }, :job_execution_outputs)
                                         .find(params[:id])
-    ExecutionSerializer.new(execution).serialize.to_json
+    Minicron::Hub::ExecutionSerializer.new(execution).serialize.to_json
   end
 
   # Delete an existing execution

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

@@ -1,3 +1,4 @@
+require 'minicron'
 require 'minicron/transport/ssh'
 
 class Minicron::Hub::App
@@ -6,14 +7,14 @@ class Minicron::Hub::App
   get '/api/hosts' do
     content_type :json
     hosts = Minicron::Hub::Host.all.includes(:jobs).order(:id => :asc)
-    HostSerializer.new(hosts).serialize.to_json
+    Minicron::Hub::HostSerializer.new(hosts).serialize.to_json
   end
 
   # Get a single host by its ID
   get '/api/hosts/:id' do
     content_type :json
     host = Minicron::Hub::Host.includes(:jobs).find(params[:id])
-    HostSerializer.new(host).serialize.to_json
+    Minicron::Hub::HostSerializer.new(host).serialize.to_json
   end
 
   # Create a new host
@@ -23,6 +24,9 @@ class Minicron::Hub::App
       # Load the JSON body
       request_body = Oj.load(request.body)
 
+      # Default the value of the port
+      request_body['host']['port'] ||= 22
+
       # Try and save the new host
       host = Minicron::Hub::Host.create(
         :name => request_body['host']['name'],
@@ -39,7 +43,7 @@ class Minicron::Hub::App
       host.save!
 
       # Return the new host
-      HostSerializer.new(host).serialize.to_json
+      Minicron::Hub::HostSerializer.new(host).serialize.to_json
     # TODO: nicer error handling here with proper validation before hand
     rescue Exception => e
       status 422
@@ -57,6 +61,9 @@ class Minicron::Hub::App
       # Find the host
       host = Minicron::Hub::Host.includes(:jobs).find(params[:id])
 
+      # Default the value of the port
+      request_body['host']['port'] ||= 22
+
       # Update its data
       host.name = request_body['host']['name']
       host.fqdn = request_body['host']['fqdn']
@@ -66,7 +73,7 @@ class Minicron::Hub::App
       host.save!
 
       # Return the new host
-      HostSerializer.new(host).serialize.to_json
+      Minicron::Hub::HostSerializer.new(host).serialize.to_json
     # TODO: nicer error handling here with proper validation before hand
     rescue Exception => e
       status 422
@@ -80,7 +87,7 @@ class Minicron::Hub::App
     begin
       Minicron::Hub::Host.transaction do
         # Look up the host
-        host = Minicron::Hub::Host.includes({ :jobs => :schedules }).find(params[:id])
+        host = Minicron::Hub::Host.includes(:jobs => :schedules).find(params[:id])
 
         # Try and delete the host
         Minicron::Hub::Host.destroy(params[:id])
@@ -101,6 +108,12 @@ class Minicron::Hub::App
         # Tidy up
         ssh.close
 
+        # Delete the pub/priv key pair
+        private_key_path = Minicron.sanitize_filename(File.expand_path("~/.ssh/minicron_host_#{host.id}_rsa"))
+        public_key_path = Minicron.sanitize_filename(File.expand_path("~/.ssh/minicron_host_#{host.id}_rsa.pub"))
+        File.delete(private_key_path)
+        File.delete(public_key_path)
+
         # This is what ember expects as the response
         status 204
       end

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

@@ -16,7 +16,7 @@ class Minicron::Hub::App
       output = Minicron::Hub::JobExecutionOutput.all.order(:id => :asc)
     end
 
-    JobExecutionOutputSerializer.new(output).serialize.to_json
+    Minicron::Hub::JobExecutionOutputSerializer.new(output).serialize.to_json
   end
 
   # Get a single job execution output by it ID
@@ -25,6 +25,6 @@ class Minicron::Hub::App
     output = Minicron::Hub::JobExecutionOutput.includes(:execution)
                                               .order(:id => :asc)
                                               .find(params[:id])
-    JobExecutionOutputSerializer.new(output).serialize.to_json
+    Minicron::Hub::JobExecutionOutputSerializer.new(output).serialize.to_json
   end
 end

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

@@ -7,22 +7,22 @@ class Minicron::Hub::App
     content_type :json
 
     if params[:job_hash]
-      jobs = Minicron::Hub::Job.includes(:host, :schedules, { :executions => :job_execution_outputs })
+      jobs = Minicron::Hub::Job.includes(:host, :schedules,  :executions => :job_execution_outputs)
                                .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
 
-    JobSerializer.new(jobs).serialize.to_json
+    Minicron::Hub::JobSerializer.new(jobs).serialize.to_json
   end
 
   # Get a single job by it ID
   get '/api/jobs/:id' do
     content_type :json
-    job = Minicron::Hub::Job.includes(:host, :schedules, { :executions => :job_execution_outputs })
+    job = Minicron::Hub::Job.includes(:host, :schedules,  :executions => :job_execution_outputs)
                             .find(params[:id])
-    JobSerializer.new(job).serialize.to_json
+    Minicron::Hub::JobSerializer.new(job).serialize.to_json
   end
 
   # Create a new job
@@ -46,7 +46,7 @@ class Minicron::Hub::App
       job.save!
 
       # Return the new job
-      JobSerializer.new(job).serialize.to_json
+      Minicron::Hub::JobSerializer.new(job).serialize.to_json
     # TODO: nicer error handling here with proper validation before hand
     rescue Exception => e
       status 422
@@ -62,7 +62,7 @@ class Minicron::Hub::App
       request_body = Oj.load(request.body)
 
       # Find the job
-      job = Minicron::Hub::Job.includes(:host, :schedules, { :executions => :job_execution_outputs })
+      job = Minicron::Hub::Job.includes(:host, :schedules,  :executions => :job_execution_outputs)
                               .find(params[:id])
 
       # Update the name
@@ -71,7 +71,7 @@ class Minicron::Hub::App
       job.save!
 
       # Return the new job
-      JobSerializer.new(job).serialize.to_json
+      Minicron::Hub::JobSerializer.new(job).serialize.to_json
     # TODO: nicer error handling here with proper validation before hand
     rescue Exception => e
       status 422

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

@@ -10,20 +10,20 @@ class Minicron::Hub::App
     if params[:ids]
       schedules = Minicron::Hub::Schedule.where(:id => params[:ids])
                                          .order(:id => :asc)
-                                         .includes({ :job => [:executions, :schedules] })
+                                         .includes(:job => [:executions, :schedules])
     else
       schedules = Minicron::Hub::Schedule.all.order(:id => :asc)
-                                         .includes({ :job => [:executions, :schedules] })
+                                         .includes(:job => [:executions, :schedules])
     end
 
-    ScheduleSerializer.new(schedules).serialize.to_json
+    Minicron::Hub::ScheduleSerializer.new(schedules).serialize.to_json
   end
 
   # Get a single schedule by it ID
   get '/api/schedules/:id' do
     content_type :json
-    schedule = Minicron::Hub::Schedule.includes({ :job => [:executions, :schedules] }).find(params[:id])
-    ScheduleSerializer.new(schedule).serialize.to_json
+    schedule = Minicron::Hub::Schedule.includes(:job => [:executions, :schedules]).find(params[:id])
+    Minicron::Hub::ScheduleSerializer.new(schedule).serialize.to_json
   end
 
   # Create a new schedule
@@ -45,7 +45,7 @@ class Minicron::Hub::App
       )
 
       if exists
-        raise Exception, "That schedule already exists for this job"
+        fail Exception, 'That schedule already exists for this job'
       end
 
       Minicron::Hub::Schedule.transaction do
@@ -83,7 +83,7 @@ class Minicron::Hub::App
         schedule.save!
 
         # Return the new schedule
-        ScheduleSerializer.new(schedule).serialize.to_json
+        Minicron::Hub::ScheduleSerializer.new(schedule).serialize.to_json
       end
     # TODO: nicer error handling here with proper validation before hand
     rescue Exception => e
@@ -101,7 +101,7 @@ class Minicron::Hub::App
 
       Minicron::Hub::Schedule.transaction do
         # Find the schedule
-        schedule = Minicron::Hub::Schedule.includes({ :job => [:executions, :schedules] }).find(params[:id])
+        schedule = Minicron::Hub::Schedule.includes(:job => [:executions, :schedules]).find(params[:id])
         old_schedule = schedule.formatted
 
         # Get an ssh instance
@@ -136,7 +136,7 @@ class Minicron::Hub::App
         schedule.save!
 
         # Return the new schedule
-        ScheduleSerializer.new(schedule).serialize.to_json
+        Minicron::Hub::ScheduleSerializer.new(schedule).serialize.to_json
       end
     # TODO: nicer error handling here with proper validation before hand
     rescue Exception => e
@@ -151,7 +151,7 @@ class Minicron::Hub::App
     begin
       Minicron::Hub::Schedule.transaction do
         # Find the schedule
-        schedule = Minicron::Hub::Schedule.includes({ :job => :host }).find(params[:id])
+        schedule = Minicron::Hub::Schedule.includes(:job => :host).find(params[:id])
 
         # Try and delete the schedule
         Minicron::Hub::Schedule.destroy(params[:id])

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

@@ -12,87 +12,92 @@
 
 ActiveRecord::Schema.define(version: 0) do
 
-  create_table "alerts", force: true do |t|
-    t.integer  "schedule_id"
-    t.integer  "execution_id"
-    t.string   "kind",         limit: 4, default: "", null: false
-    t.datetime "expected_at"
-    t.string   "medium",       limit: 9, default: "", null: false
-    t.datetime "sent_at",                             null: false
+  create_table 'alerts', force: true do |t|
+    t.integer  'schedule_id'
+    t.integer  'execution_id'
+    t.string   'kind',         limit: 4, default: '', null: false
+    t.datetime 'expected_at'
+    t.string   'medium',       limit: 9, default: '', null: false
+    t.datetime 'sent_at',                             null: false
   end
 
-  add_index "alerts", ["execution_id"], name: "execution_id", using: :btree
-  add_index "alerts", ["expected_at"], name: "expected_at", using: :btree
-  add_index "alerts", ["kind"], name: "kind", using: :btree
-  add_index "alerts", ["medium"], name: "medium", using: :btree
-  add_index "alerts", ["schedule_id"], name: "schedule_id", using: :btree
+  add_index 'alerts', ['execution_id'], name: 'execution_id', using: :btree
+  add_index 'alerts', ['expected_at'], name: 'expected_at', using: :btree
+  add_index 'alerts', ['kind'], name: 'kind', using: :btree
+  add_index 'alerts', ['medium'], name: 'medium', using: :btree
+  add_index 'alerts', ['schedule_id'], name: 'schedule_id', using: :btree
 
-  create_table "executions", force: true do |t|
-    t.integer  "job_id",      null: false
-    t.datetime "created_at",  null: false
-    t.datetime "started_at"
-    t.datetime "finished_at"
-    t.integer  "exit_status"
+  create_table 'executions', force: true do |t|
+    t.integer  'job_id',      null: false
+    t.datetime 'created_at',  null: false
+    t.datetime 'started_at'
+    t.datetime 'finished_at'
+    t.integer  'exit_status'
   end
 
-  add_index "executions", ["created_at"], name: "created_at", using: :btree
-  add_index "executions", ["finished_at"], name: "finished_at", using: :btree
-  add_index "executions", ["job_id"], name: "job_id", using: :btree
-  add_index "executions", ["started_at"], name: "started_at", using: :btree
+  add_index 'executions', ['created_at'], name: 'created_at', using: :btree
+  add_index 'executions', ['finished_at'], name: 'finished_at', using: :btree
+  add_index 'executions', ['job_id'], name: 'job_id', using: :btree
+  add_index 'executions', ['started_at'], name: 'started_at', using: :btree
 
-  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",       default: 22, null: false
-    t.text     "public_key"
-    t.datetime "created_at",              null: false
-    t.datetime "updated_at",              null: false
+  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.text     'public_key'
+    t.datetime 'created_at',              null: false
+    t.datetime 'updated_at',              null: false
   end
 
-  add_index "hosts", ["fqdn"], name: "hostname", using: :btree
+  add_index 'hosts', ['fqdn'], name: 'hostname', using: :btree
 
-  create_table "job_execution_outputs", force: true do |t|
-    t.integer  "execution_id", null: false
-    t.integer  "seq",          null: false
-    t.text     "output",       null: false
-    t.datetime "timestamp",    null: false
+  create_table 'job_execution_outputs', force: true do |t|
+    t.integer  'execution_id', null: false
+    t.integer  'seq',          null: false
+    t.text     'output',       null: false
+    t.datetime 'timestamp',    null: false
   end
 
-  add_index "job_execution_outputs", ["execution_id"], name: "execution_id", using: :btree
-  add_index "job_execution_outputs", ["seq"], name: "seq", using: :btree
+  add_index 'job_execution_outputs', ['execution_id'], name: 'execution_id', using: :btree
+  add_index 'job_execution_outputs', ['seq'], name: 'seq', using: :btree
 
-  create_table "jobs", force: true do |t|
-    t.string   "job_hash",   limit: 32, default: "", null: false
-    t.string   "name"
-    t.text     "command",                            null: false
-    t.integer  "host_id",                            null: false
-    t.datetime "created_at",                         null: false
-    t.datetime "updated_at",                         null: false
+  create_table 'jobs', force: true do |t|
+    t.string   'job_hash',   limit: 32, default: '', null: false
+    t.string   'name'
+    t.text     'command',                            null: false
+    t.integer  'host_id',                            null: false
+    t.datetime 'created_at',                         null: false
+    t.datetime 'updated_at',                         null: false
   end
 
-  add_index "jobs", ["created_at"], name: "created_at", using: :btree
-  add_index "jobs", ["host_id"], name: "host_id", using: :btree
-  add_index "jobs", ["job_hash"], name: "job_hash", unique: true, using: :btree
+  add_index 'jobs', ['created_at'], name: 'created_at', using: :btree
+  add_index 'jobs', ['host_id'], name: 'host_id', using: :btree
+  add_index 'jobs', ['job_hash'], name: 'job_hash', unique: true, using: :btree
 
-  create_table "schedules", force: true do |t|
-    t.integer  "job_id",                       null: false
-    t.string   "minute",           limit: 179
-    t.string   "hour",             limit: 71
-    t.string   "day_of_the_month", limit: 92
-    t.string   "month",            limit: 25
-    t.string   "day_of_the_week",  limit: 20
-    t.string   "special",          limit: 9
-    t.datetime "created_at",                   null: false
-    t.datetime "updated_at",                   null: false
+  create_table 'schedules', force: true do |t|
+    t.integer  'job_id',                       null: false
+    t.string   'minute',           limit: 179
+    t.string   'hour',             limit: 71
+    t.string   'day_of_the_month', limit: 92
+    t.string   'month',            limit: 25
+    t.string   'day_of_the_week',  limit: 20
+    t.string   'special',          limit: 9
+    t.datetime 'created_at',                   null: false
+    t.datetime 'updated_at',                   null: false
   end
 
-  add_index "schedules", ["day_of_the_month"], name: "day_of_the_month", using: :btree
-  add_index "schedules", ["day_of_the_week"], name: "day_of_the_week", using: :btree
-  add_index "schedules", ["hour"], name: "hour", using: :btree
-  add_index "schedules", ["job_id"], name: "job_id", using: :btree
-  add_index "schedules", ["minute"], name: "minute", using: :btree
-  add_index "schedules", ["month"], name: "month", using: :btree
-  add_index "schedules", ["special"], name: "special", using: :btree
+  add_index 'schedules', ['day_of_the_month'], name: 'day_of_the_month', using: :btree
+  add_index 'schedules', ['day_of_the_week'], name: 'day_of_the_week', using: :btree
+  add_index 'schedules', ['hour'], name: 'hour', using: :btree
+  add_index 'schedules', ['job_id'], name: 'job_id', using: :btree
+  add_index 'schedules', ['minute'], name: 'minute', using: :btree
+  add_index 'schedules', ['month'], name: 'month', using: :btree
+  add_index 'schedules', ['special'], name: 'special', using: :btree
+
+  create_table 'users', force: true do |t|
+    t.integer 'email',    null: false
+    t.integer 'password', null: false
+  end
 
 end