minicron 0.6.1 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7ae42fc56fc0059a0eb705924d21b3528b79014
-  data.tar.gz: 272ed05fdf1f737bbaef4decb2945372634f1817
+  metadata.gz: 1cd3672f06eb7642d7fe4ff64dd24964e68b0ef3
+  data.tar.gz: 89e098edd94ace62fcb9a2dd4108ac02c279ba28
 SHA512:
-  metadata.gz: d3d2f0071fe35af38fbba783dc30f97e85b395f801411e2a56a2886ea3949fd5bf927fb7fd8186730d8ec40e1ea986d668eee38e53195a986a10954f3b789b71
-  data.tar.gz: 94e3536279f6f247bbc7b0bb002ebafc3836a4582af315b7a355aef044aa0b058cbda578a84fb9b9454834f1963da59fbf2e980956a72ed827588ebc047cbb83
+  metadata.gz: d0188e3bc5b4cc46674ad7863353e4ce909a4b47e6bf96d722a384e4b3546fd902496dd6a7d4fb8d4df583d04d0270a6376dc6e3cf0f99a30c583cef0681c033
+  data.tar.gz: c66dc6903a06686c91639f98b60fd639678cec14fa774b3e15795eeee14cbee43481335ac01d8e3b2b125720fdc7ebb4ae6e7cdf0a4bff8dc89c04f7687b5853

data/README.md

@@ -6,7 +6,7 @@ minicron
 [![Coverage Status](http://img.shields.io/coveralls/jamesrwhite/minicron.svg)](https://coveralls.io/r/jamesrwhite/minicron?branch=master)
 [![Code Climate](http://img.shields.io/codeclimate/github/jamesrwhite/minicron.svg)](https://codeclimate.com/github/jamesrwhite/minicron)
 [![Dependency Status](http://img.shields.io/gemnasium/jamesrwhite/minicron.svg)](https://gemnasium.com/jamesrwhite/minicron)
-[![Inline docs](http://inch-pages.github.io/github/jamesrwhite/minicron.png)](http://inch-pages.github.io/github/jamesrwhite/minicron)
+[![Inline docs](http://inch-ci.org/github/jamesrwhite/minicron.png)](http://inch-ci.org/github/jamesrwhite/minicron)
 
 minicron aims to complement ````cron```` by making it easier to manage and monitor cron jobs, it can largely be
 thought of as two components that interact together, the CLI and the Hub. The CLI is what is installed on your
@@ -39,8 +39,7 @@ Screenshots
 Background
 -----------
 
-I'm developing minicron as part of my dissertation at university which has to be completed by mid May but I plan to continue
-its development after that. The inspiration for developing minicron comes largely from my experience and frustrations using cron,
+I initially developed minicron as part of my dissertation at university. The inspiration for developing minicron comes largely from my experience and frustrations using cron,
 in particular my time spent working at [Miniclip](http://www.miniclip.com) (which is where the name comes from, miniclip.. minicron, get it?)
 where the management and monitoring of cron jobs at times proved to be tricky!
 
@@ -106,7 +105,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.6.1) you can ````gem install minicron````, depending on your ruby setup
+3. To install the latest release (currently 0.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
@@ -166,7 +165,7 @@ by default it will bind to port 9292 on the host 127.0.0.1 but this can be confi
 arguments ````--host```` ````--port```` and ````--path```` or in the config file.
 
 By default the server will run as a daemon with its process id stored in ````/tmp/minicron.pid````
-you can also use the ````stop```` and ````status```` commands to control the server.
+you can also use the ````stop````, ````restart```` and ````status```` commands to control the server.
 
 To run the server in debug mode, i.e not as a daemon so you can see its output you can pass the ````--debug````
 option.

data/Rakefile

@@ -20,6 +20,9 @@ namespace :db do
   # Tell active record where the db dir is
   Sinatra::ActiveRecordTasks.db_dir = Minicron::HUB_PATH + '/db'
 
+  # Parse the file config in /etc/minicron.toml
+  Minicron.parse_file_config(nil)
+
   # Connect to the DB
   Minicron::Hub::App.setup_db
 end

data/lib/minicron/alert.rb

@@ -13,9 +13,9 @@ module Minicron
     # Send an alert using all enabled mediums
     #
     # @option options [String] kind 'fail' or 'miss'
-    # @option options [Integer, nil] schedule_id only applies to 'miss' alerts
-    # @option options [Integer, nil] execution_id only used by 'fail' alerts
     # @option options [Integer] job_id used by the #send method
+    # @option options [Integer, nil] execution_id only used by 'fail' alerts
+    # @option options [Integer, nil] schedule_id only applies to 'miss' alerts
     # @option options [Time] expected_at only applies to 'miss' alerts
     def send_all(options = {})
       Minicron.config['alerts'].each do |medium, value|
@@ -36,9 +36,9 @@ module Minicron
     # Send an individual alert
     #
     # @option options [String] kind 'fail' or 'miss'
-    # @option options [Integer, nil] schedule_id only applies to 'miss' alerts
-    # @option options [Integer, nil] execution_id only used by 'fail' alerts
     # @option options [Integer] job_id used to look up the job name for the alert message
+    # @option options [Integer, nil] execution_id only used by 'fail' alerts
+    # @option options [Integer, nil] schedule_id only applies to 'miss' alerts
     # @option options [Time] expected_at when the schedule was expected to execute
     # @option options [String] medium the medium to send the alert via
     def send(options = {})
@@ -59,8 +59,9 @@ module Minicron
 
       # Store that we sent the alert
       Minicron::Hub::Alert.create(
-        :schedule_id => options[:schedule_id],
+        :job_id => options[:job_id],
         :execution_id => options[:execution_id],
+        :schedule_id => options[:schedule_id],
         :kind => options[:kind],
         :expected_at => options[:expected_at],
         :medium => options[:medium],
@@ -102,15 +103,16 @@ module Minicron
     # been sent
     #
     # @option options [String] kind 'fail' or 'miss'
-    # @option options [Integer, nil] schedule_id only applies to 'miss' alerts
     # @option options [Integer, nil] execution_id only used by 'fail' alerts
+    # @option options [Integer, nil] schedule_id only applies to 'miss' alerts
     # @option options [Time] expected_at when the schedule was expected to execute
     # @option options [String] medium the medium to send the alert via
     def sent?(options = {})
       Minicron::Hub::Alert.exists?(
         :kind => options[:kind],
-        :schedule_id => options[:schedule_id],
         :execution_id => options[:execution_id],
+        :schedule_id => options[:schedule_id],
+        :job_id => options[:job_id],
         :expected_at => options[:expected_at],
         :medium => options[:medium]
       )

data/lib/minicron/cli/commands.rb

@@ -53,7 +53,7 @@ module Minicron
       # Add the `minicron server` command
       def self.add_server_cli_command(cli)
         cli.command :server do |c|
-          c.syntax = 'minicron server [start|stop|status]'
+          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']}"
@@ -89,6 +89,19 @@ module Minicron
               end
             when 'stop'
               insidious.stop!
+            when 'restart'
+              insidious.restart! 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']
+                )
+              end
             when 'status'
               if insidious.running?
                 puts 'minicron is running'
@@ -132,7 +145,8 @@ module Minicron
                   Minicron.config['client']['path']
                 )
 
-                # Set up the job and get the jexecution and job ids back from the server
+                # Set up the job and get the execution and job ids back from the server
+                # The execution number is also returned but it's only used by the frontend
                 ids = setup_job(args.first, faye)
               end
             rescue Exception => e

data/lib/minicron/constants.rb

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

data/lib/minicron/hub/app.rb

@@ -27,7 +27,7 @@ module Minicron::Hub
 
       # Used to enable asset compression, currently nothing else
       # relies on this
-      set :environment, :development
+      set :environment, :production
 
       # Force the encoding to be UTF-8 to prevent assetpack encoding issues
       Encoding.default_external = Encoding::UTF_8
@@ -45,7 +45,8 @@ module Minicron::Hub
       # Set up the application css
       css :app, '/css/all.css', [
         '/css/bootswatch.min.css',
-        '/css/main.css'
+        '/css/main.css',
+        '/css/perfect-scrollbar-0.4.10.min.css'
       ]
 
       # Set up the application javascript
@@ -53,12 +54,13 @@ module Minicron::Hub
         # Dependencies, the order of these is important
         '/js/jquery-2.1.0.min.js',
         '/js/handlebars-1.3.0.min.js',
-        '/js/ember-1.4.1.min.js',
+        '/js/ember-1.5.1.min.js',
         '/js/ember-data-1.0.0-beta.7.f87cba88.min.js',
         '/js/faye-browser-1.0.1.min.js',
         '/js/ansi_up-1.1.1.min.js',
         '/js/bootstrap-3.1.1.min.js',
         '/js/moment-2.5.1.min.js',
+        '/js/perfect-scrollbar-0.4.10.with-mousewheel.min.js',
 
         # Ember application files
         '/app/**/*.js'
@@ -114,6 +116,9 @@ module Minicron::Hub
       else
         fail Exception, "The database #{Minicron.config['database']['type']} is not supported"
       end
+
+      # Enable ActiveRecord logging if in verbose mode
+      ActiveRecord::Base.logger = Minicron.config['verbose'] ? Logger.new(STDOUT) : nil
     end
   end
 

data/lib/minicron/hub/assets/app/application.js

@@ -14,6 +14,25 @@
     Ember.$('body').tooltip({
       selector: '[data-toggle=tooltip]'
     });
+
+    // We'll keep on waiting, waiting, waiting on the DOM to change..
+    var waitUntilReady = setInterval(function() {
+      var $sidebar = Ember.$('.sidebar'),
+          $main_panel = Ember.$('.main-panel');
+
+      if ($sidebar.length && $main_panel.length) {
+        // Sidebar perfect scrollbar init
+        $sidebar.perfectScrollbar();
+
+        // Main Panel perfect scrollbar init
+        $main_panel.perfectScrollbar();
+        $main_panel.scrollTop(0);
+        $main_panel.perfectScrollbar('update');
+
+        // Stop waiting on the DOM to change
+        clearInterval(waitUntilReady);
+      }
+    }, 100);
   };
 
   // Configure Ember Data so it can find the API
@@ -75,28 +94,30 @@
           if (message.channel.substr(1, 3) === 'job') {
             var segments = message.channel.split('/');
             var job_id = segments[2];
-            var job_execution_id = segments[3];
+            var execution_id = segments[3];
             var type = segments[4];
             var message_data = message.data.message;
 
             // TODO: remove this!
-            console.log(job_id, job_execution_id, type, message);
+            console.log(job_id, execution_id, type, message);
 
             // Is it a status message?
             if (type === 'status') {
               // Is it a setup message
               if (typeof message_data.action != 'undefined' && message_data.action === 'SETUP') {
                 // The SETUP message is defined slightly differently, segment 2 contains the
-                // job hash and segment 3 contains '*job_id*-*job_execution_id*'
-                var ids = job_execution_id.split('-');
+                // job hash and segment 3 contains '*job_id*-*execution_id*-*execution_number*'
+                var ids = execution_id.split('-');
                     job_id = ids[0];
-                    job_execution_id = ids[1];
+                    execution_id = ids[1];
+                var execution_number = ids[2];
 
                 // Append the job relationship to it
                 store.find('job', job_id).then(function(job) {
                   // Create the execution
                   store.push('execution', {
-                    id: job_execution_id,
+                    id: execution_id,
+                    number: execution_number,
                     created_at: moment.utc(message.data.ts).format('YYYY-MM-DDTHH:mm:ss[Z]'),
                     job: job
                   }, true);
@@ -104,25 +125,25 @@
               // Is it a start message?
               } else if (message_data.substr(0, 5) === 'START') {
                 // Set the execution start time
-                store.find('execution', job_execution_id).then(function(execution) {
+                store.find('execution', execution_id).then(function(execution) {
                   execution.set('started_at', moment.utc(message_data.substr(6)).format('YYYY-MM-DDTHH:mm:ss[Z]'));
                 });
               // Is it a finish message?
               } else if (message_data.substr(0, 6) === 'FINISH') {
                 // Set the execution finish time
-                store.find('execution', job_execution_id).then(function(execution) {
+                store.find('execution', execution_id).then(function(execution) {
                   execution.set('finished_at', moment.utc(message_data.substr(7)).format('YYYY-MM-DDTHH:mm:ss[Z]'));
                 });
               // Is it an exit message?
               } else if (message_data.substr(0, 4) === 'EXIT') {
                 // Set the execution exit status
-                store.find('execution', job_execution_id).then(function(execution) {
+                store.find('execution', execution_id).then(function(execution) {
                   execution.set('exit_status', +message_data.substr(5));
                 });
               }
             // Is it an output message?
             } else if (type === 'output') {
-              store.find('execution', job_execution_id).then(function(execution) {
+              store.find('execution', execution_id).then(function(execution) {
                 // Add this bit of job execution output
                 var output = store.createRecord('job_execution_output', {
                     id: message.data.job_execution_output_id,

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

@@ -256,7 +256,7 @@
       });
 
       // Handle when one of the 'every n x' is inputs is changed
-      Ember.$('#schedule-editor').find('input[type="number"], input[type="checkbox"], input[type="radio"]').on('change', function(e) {
+      Ember.$('#schedule-editor').find('input[type="number"], input[type="checkbox"]').on('change', function(e) {
         if (self.get('read_only')) {
           e.preventDefault();
           return false;

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

@@ -31,6 +31,6 @@
         sortProperties: ['seq'],
         content: this.get('content.job_execution_outputs')
       });
-    }).property('content.job_execution_outputs')
+    }).property('content.job_execution_outputs').cacheable()
   });
 })();

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

@@ -0,0 +1,21 @@
+'use strict';
+
+(function() {
+  Minicron.Alert = DS.Model.extend({
+    kind: DS.attr('string'),
+    medium: DS.attr('string'),
+    expected_at: DS.attr('date'),
+    sent_at: DS.attr('date'),
+
+    isFail: function() {
+      return this.get('kind') === 'fail';
+    }.property('kind'),
+    isMiss: function() {
+      return this.get('kind') === 'miss';
+    }.property('kind'),
+
+    job: DS.belongsTo('job', { async: true }),
+    execution: DS.belongsTo('execution', { async: true }),
+    schedule: DS.belongsTo('schedule', { async: true })
+  });
+})();

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

@@ -2,6 +2,7 @@
 
 (function() {
   Minicron.Execution = DS.Model.extend({
+    number: DS.attr('number'),
     created_at: DS.attr('date'),
     started_at: DS.attr('date'),
     finished_at: DS.attr('date'),

data/lib/minicron/hub/assets/app/router.js

@@ -27,5 +27,9 @@
         this.route('edit');
       });
     });
+
+    this.resource('alerts', function() {
+      this.resource('alert', { path: ':id' }, function() {});
+    });
   });
 })();

data/lib/minicron/hub/assets/app/routes/alert.js

@@ -0,0 +1,31 @@
+'use strict';
+
+(function() {
+  Minicron.AlertsRoute = Ember.Route.extend({
+    model: function() {
+      return this.store.find('alert');
+    },
+    afterModel: Minicron.onViewLoad
+  });
+
+  Minicron.AlertsIndexRoute = Ember.Route.extend({
+    model: function() {
+      return this.store.all('alert');
+    },
+    afterModel: Minicron.onViewLoad
+  });
+
+  Minicron.AlertRoute = Ember.Route.extend({
+    model: function(params) {
+      return this.store.find('alert', params.id);
+    },
+    afterModel: Minicron.onViewLoad
+  });
+
+   Minicron.AlertIndexRoute = Ember.Route.extend({
+    model: function() {
+      return this.modelFor('alert');
+    },
+    afterModel: Minicron.onViewLoad
+  });
+})();

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

@@ -4,7 +4,8 @@
   Minicron.ExecutionsRoute = Ember.Route.extend({
     model: function() {
       return this.store.all('execution');
-    }
+    },
+    afterModel: Minicron.onViewLoad
   });
 
   Minicron.ExecutionsIndexRoute = Ember.Route.extend({
@@ -14,6 +15,8 @@
     afterModel: function(executions) {
       if (typeof executions.objectAt(0) != 'undefined') {
         this.transitionTo('execution', executions.objectAt(0));
+      } else {
+        Minicron.onViewLoad();
       }
     }
   });
@@ -21,7 +24,8 @@
   Minicron.ExecutionRoute = Ember.Route.extend({
     model: function(params) {
       return this.store.find('execution', params.id);
-    }
+    },
+    afterModel: Minicron.onViewLoad
   });
 
   Minicron.ExecutionIndexRoute = Ember.Route.extend({

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

@@ -4,7 +4,8 @@
   Minicron.HostsRoute = Ember.Route.extend({
     model: function() {
       return this.store.find('host');
-    }
+    },
+    afterModel: Minicron.onViewLoad
   });
 
   Minicron.HostsIndexRoute = Ember.Route.extend({
@@ -20,7 +21,8 @@
   Minicron.HostRoute = Ember.Route.extend({
     model: function(params) {
       return this.store.find('host', params.id);
-    }
+    },
+    afterModel: Minicron.onViewLoad
   });
 
   Minicron.HostIndexRoute = Ember.Route.extend({

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

@@ -4,7 +4,8 @@
   Minicron.JobsRoute = Ember.Route.extend({
     model: function() {
       return this.store.find('job');
-    }
+    },
+    afterModel: Minicron.onViewLoad
   });
 
   Minicron.JobsIndexRoute = Ember.Route.extend({
@@ -20,7 +21,8 @@
   Minicron.JobRoute = Ember.Route.extend({
     model: function(params) {
       return this.store.find('job', params.id);
-    }
+    },
+    afterModel: Minicron.onViewLoad
   });
 
   Minicron.JobIndexRoute = Ember.Route.extend({