minicron 0.1.1 → 0.2

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-03-29 07:06:21 +0000
+# Generation Time: 2014-04-01 03:35:39 +0000
 # ************************************************************
 
 
@@ -23,8 +23,10 @@
 # Dump of table alerts
 # ------------------------------------------------------------
 
+DROP TABLE IF EXISTS `alerts`;
+
 CREATE TABLE `alerts` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `schedule_id` int(11) DEFAULT NULL,
   `execution_id` int(11) DEFAULT NULL,
   `kind` varchar(4) NOT NULL DEFAULT '',
@@ -32,11 +34,11 @@ CREATE TABLE `alerts` (
   `medium` varchar(9) NOT NULL DEFAULT '',
   `sent_at` datetime NOT NULL,
   PRIMARY KEY (`id`),
-  KEY `schedule_id` (`schedule_id`),
-  KEY `execution_id` (`execution_id`),
-  KEY `kind` (`kind`),
-  KEY `expected_at` (`expected_at`),
-  KEY `medium` (`medium`)
+  KEY `execution_id` (`execution_id`) USING BTREE,
+  KEY `expected_at` (`expected_at`) USING BTREE,
+  KEY `kind` (`kind`) USING BTREE,
+  KEY `medium` (`medium`) USING BTREE,
+  KEY `schedule_id` (`schedule_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -44,6 +46,8 @@ CREATE TABLE `alerts` (
 # Dump of table executions
 # ------------------------------------------------------------
 
+DROP TABLE IF EXISTS `executions`;
+
 CREATE TABLE `executions` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `job_id` int(11) NOT NULL,
@@ -52,10 +56,10 @@ CREATE TABLE `executions` (
   `finished_at` datetime DEFAULT NULL,
   `exit_status` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `created_at` (`created_at`),
-  KEY `finished_at` (`finished_at`),
-  KEY `job_id` (`job_id`),
-  KEY `started_at` (`started_at`)
+  KEY `created_at` (`created_at`) USING BTREE,
+  KEY `finished_at` (`finished_at`) USING BTREE,
+  KEY `job_id` (`job_id`) USING BTREE,
+  KEY `started_at` (`started_at`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -63,17 +67,19 @@ CREATE TABLE `executions` (
 # Dump of table hosts
 # ------------------------------------------------------------
 
+DROP TABLE IF EXISTS `hosts`;
+
 CREATE TABLE `hosts` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `fqdn` varchar(255) NOT NULL DEFAULT '',
   `host` varchar(255) NOT NULL DEFAULT '',
-  `port` int(11) NOT NULL DEFAULT '22',
+  `port` int(11) NOT NULL,
   `public_key` text,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   PRIMARY KEY (`id`),
-  KEY `hostname` (`fqdn`)
+  KEY `hostname` (`fqdn`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -81,6 +87,8 @@ CREATE TABLE `hosts` (
 # Dump of table job_execution_outputs
 # ------------------------------------------------------------
 
+DROP TABLE IF EXISTS `job_execution_outputs`;
+
 CREATE TABLE `job_execution_outputs` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `execution_id` int(11) NOT NULL,
@@ -88,8 +96,8 @@ CREATE TABLE `job_execution_outputs` (
   `output` text NOT NULL,
   `timestamp` datetime NOT NULL,
   PRIMARY KEY (`id`),
-  KEY `execution_id` (`execution_id`),
-  KEY `seq` (`seq`)
+  KEY `execution_id` (`execution_id`) USING BTREE,
+  KEY `seq` (`seq`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -97,6 +105,8 @@ CREATE TABLE `job_execution_outputs` (
 # Dump of table jobs
 # ------------------------------------------------------------
 
+DROP TABLE IF EXISTS `jobs`;
+
 CREATE TABLE `jobs` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `job_hash` varchar(32) NOT NULL DEFAULT '',
@@ -106,9 +116,9 @@ CREATE TABLE `jobs` (
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `job_hash` (`job_hash`),
-  KEY `created_at` (`created_at`),
-  KEY `host_id` (`host_id`)
+  UNIQUE KEY `job_hash` (`job_hash`) USING BTREE,
+  KEY `created_at` (`created_at`) USING BTREE,
+  KEY `host_id` (`host_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -116,6 +126,8 @@ CREATE TABLE `jobs` (
 # Dump of table schedules
 # ------------------------------------------------------------
 
+DROP TABLE IF EXISTS `schedules`;
+
 CREATE TABLE `schedules` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `job_id` int(11) NOT NULL,
@@ -128,13 +140,13 @@ CREATE TABLE `schedules` (
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   PRIMARY KEY (`id`),
-  KEY `day_of_the_month` (`day_of_the_month`),
-  KEY `day_of_the_week` (`day_of_the_week`),
-  KEY `hour` (`hour`),
-  KEY `job_id` (`job_id`),
-  KEY `minute` (`minute`),
-  KEY `month` (`month`),
-  KEY `special` (`special`)
+  KEY `day_of_the_month` (`day_of_the_month`) USING BTREE,
+  KEY `day_of_the_week` (`day_of_the_week`) USING BTREE,
+  KEY `hour` (`hour`) USING BTREE,
+  KEY `job_id` (`job_id`) USING BTREE,
+  KEY `minute` (`minute`) USING BTREE,
+  KEY `month` (`month`) USING BTREE,
+  KEY `special` (`special`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -142,6 +154,8 @@ CREATE TABLE `schedules` (
 # Dump of table schema_migrations
 # ------------------------------------------------------------
 
+DROP TABLE IF EXISTS `schema_migrations`;
+
 CREATE TABLE `schema_migrations` (
   `version` varchar(255) NOT NULL,
   UNIQUE KEY `unique_schema_migrations` (`version`)
@@ -149,6 +163,20 @@ CREATE TABLE `schema_migrations` (
 
 
 
+# Dump of table users
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `users`;
+
+CREATE TABLE `users` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `email` int(11) NOT NULL,
+  `password` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+
 
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

data/lib/minicron/hub/models/execution.rb

@@ -2,7 +2,7 @@ module Minicron
   module Hub
     class Execution < ActiveRecord::Base
       belongs_to :job
-      has_many :job_execution_outputs, :dependent => :delete_all
+      has_many :job_execution_outputs, :dependent => :destroy
     end
   end
 end

data/lib/minicron/hub/models/host.rb

@@ -1,7 +1,16 @@
 module Minicron
   module Hub
     class Host < ActiveRecord::Base
-      has_many :jobs, :dependent => :delete_all
+      has_many :jobs, :dependent => :destroy
+
+      # Default the name of the host to the fqdn itself if no name is set
+      def name
+        if read_attribute(:name) == '' || read_attribute(:name).nil?
+          read_attribute(:fqdn)
+        else
+          read_attribute(:name)
+        end
+      end
     end
   end
 end

data/lib/minicron/hub/models/job.rb

@@ -2,12 +2,12 @@ module Minicron
   module Hub
     class Job < ActiveRecord::Base
       belongs_to :host
-      has_many :executions, :dependent => :delete_all
-      has_many :schedules, :dependent => :delete_all
+      has_many :executions, :dependent => :destroy
+      has_many :schedules, :dependent => :destroy
 
       # Default the name of the command to the command itself if no name is set
       def name
-        if read_attribute(:name) == '' || read_attribute(:name) == nil
+        if read_attribute(:name) == '' || read_attribute(:name).nil?
           read_attribute(:command)
         else
           read_attribute(:name)

data/lib/minicron/hub/models/schedule.rb

@@ -14,7 +14,7 @@ module Minicron
       # @return string
       def self.format(schedule)
         # If it's not a 'special' schedule then build up the full schedule string
-        if schedule.special == '' || schedule.special == nil
+        if schedule.special == '' || schedule.special.nil?
           "#{schedule.minute} #{schedule.hour} #{schedule.day_of_the_month} #{schedule.month} #{schedule.day_of_the_week}"
         else
           schedule.special

data/lib/minicron/hub/serializers/execution.rb

@@ -1,75 +1,79 @@
-class Minicron::Hub::App::ExecutionSerializer
-  def initialize(executions)
-    @executions = executions
-  end
+module Minicron
+  module Hub
+    class ExecutionSerializer
+      def initialize(executions)
+        @executions = executions
+      end
 
-  def serialize
-    @response = {
-      :executions => [],
-      :jobs => [],
-      :job_execution_outputs => [],
-      :hosts => []
-    }
-
-    if @executions.respond_to? :each
-      @executions.each do |execution|
-        do_serialization(execution)
+      def serialize
+        @response = {
+          :executions => [],
+          :jobs => [],
+          :job_execution_outputs => [],
+          :hosts => []
+        }
+
+        if @executions.respond_to? :each
+          @executions.each do |execution|
+            do_serialization(execution)
+          end
+        else
+          do_serialization(@executions)
+        end
+
+        @response
       end
-    else
-      do_serialization(@executions)
-    end
 
-    @response
-  end
+      def do_serialization(execution)
+        new_execution = {}
 
-  def do_serialization(execution)
-    new_execution = {}
+        # Add all the normal attributes of the execution
+        execution.attributes.each do |key, value|
+          # Remove _id from keys
+          key = key[-3, 3] == '_id' ? key[0..-4] : key
 
-    # Add all the normal attributes of the execution
-    execution.attributes.each do |key, value|
-      # Remove _id from keys
-      key = key[-3, 3] == '_id' ? key[0..-4] : key
+          new_execution[key] = value
+        end
 
-      new_execution[key] = value
-    end
+        # Set up the job execution output ids array
+        new_execution[:job_execution_outputs] = []
 
-    # Set up the job execution output ids array
-    new_execution[:job_execution_outputs] = []
+        # Add the job to the sideloaded data
+        new_job = {}
+        execution.job.attributes.each do |key, value|
+          # To make our name method in the model work :/
+          value = execution.job.name if key == 'name'
 
-    # Add the job to the sideloaded data
-    new_job = {}
-    execution.job.attributes.each do |key, value|
-      # To make our name method in the model work :/
-      value = execution.job.name if key == 'name'
+          # Remove _id from keys
+          key = key[-3, 3] == '_id' ? key[0..-4] : key
 
-      # Remove _id from keys
-      key = key[-3, 3] == '_id' ? key[0..-4] : key
+          new_job[key] = value
+        end
 
-      new_job[key] = value
-    end
+        # Append the new job to the @response
+        @response[:jobs].push(new_job)
 
-    # Append the new job to the @response
-    @response[:jobs].push(new_job)
+        # Append the job host to the @response
+        @response[:hosts].push(execution.job.host)
 
-    # Append the job host to the @response
-    @response[:hosts].push(execution.job.host)
+        # Add the job execution outputs to the sideloaded data and the ids to
+        # the execution
+        execution.job_execution_outputs.each do |job_execution_output|
+          new_job_execution_output = {}
 
-    # Add the job execution outputs to the sideloaded data and the ids to
-    # the execution
-    execution.job_execution_outputs.each do |job_execution_output|
-      new_job_execution_output = {}
+          job_execution_output.attributes.each do |key, value|
+            # Remove _id from keys
+            key = key[-3, 3] == '_id' ? key[0..-4] : key
+            new_job_execution_output[key] = value
+          end
 
-      job_execution_output.attributes.each do |key, value|
-        # Remove _id from keys
-        key = key[-3, 3] == '_id' ? key[0..-4] : key
-        new_job_execution_output[key] = value
-      end
+          @response[:job_execution_outputs].push(new_job_execution_output)
+          new_execution[:job_execution_outputs].push(job_execution_output.id)
+        end
 
-      @response[:job_execution_outputs].push(new_job_execution_output)
-      new_execution[:job_execution_outputs].push(job_execution_output.id)
+        # Append the new execution to the @response
+        @response[:executions].push(new_execution)
+      end
     end
-
-    # Append the new execution to the @response
-    @response[:executions].push(new_execution)
   end
 end

data/lib/minicron/hub/serializers/host.rb

@@ -1,57 +1,64 @@
-class Minicron::Hub::App::HostSerializer
-  def initialize(hosts)
-    @hosts = hosts
-  end
+module Minicron
+  module Hub
+    class HostSerializer
+      def initialize(hosts)
+        @hosts = hosts
+      end
+
+      def serialize
+        @response = {
+          :hosts => [],
+          :jobs => []
+        }
 
-  def serialize
-    @response = {
-      :hosts => [],
-      :jobs => []
-    }
+        if @hosts.respond_to? :each
+          @hosts.each do |host|
+            do_serialization(host)
+          end
+        else
+          do_serialization(@hosts)
+        end
 
-    if @hosts.respond_to? :each
-      @hosts.each do |host|
-        do_serialization(host)
+        @response
       end
-    else
-      do_serialization(@hosts)
-    end
 
-    @response
-  end
+      def do_serialization(host)
+        new_host = {}
 
-  def do_serialization(host)
-    new_host = {}
+        # Add all the normal attributes of the host
+        host.attributes.each do |key, value|
+          # To make our name method in the model work :/
+          value = host.name if key == 'name'
 
-    # Add all the normal attributes of the host
-    host.attributes.each do |key, value|
-      new_host[key] = value
-    end
+          new_host[key] = value
+        end
 
-    # Set up the job host output ids array
-    new_host[:jobs] = []
+        # Set up the job host output ids array
+        new_host[:jobs] = []
 
-    # Add the jobs to the sideloaded data and the ids to
-    # the host
-    host.jobs.each do |job|
-      new_job = {}
+        # Add the jobs to the sideloaded data and the ids to
+        # the host
+        host.jobs.each do |job|
+          new_job = {}
 
-      job.attributes.each do |key, value|
-        # To make our name method in the model work :/
-        value = job.name if key == 'name'
+          job.attributes.each do |key, value|
+            # To make our name method in the model work :/
+            value = job.name if key == 'name'
 
-        # Remove _id from keys
-        key = key[-3, 3] == '_id' ? key[0..-4] : key
+            # Remove _id from keys
+            key = key[-3, 3] == '_id' ? key[0..-4] : key
 
-        # Append the job
-        new_job[key] = value
-      end
+            # Append the job
+            new_job[key] = value
+          end
 
-      @response[:jobs].push(new_job)
-      new_host[:jobs].push(job.id)
-    end
+          @response[:jobs].push(new_job)
+          new_host[:jobs].push(job.id)
+        end
 
-    # Append the new host to the @responseh
-    @response[:hosts].push(new_host)
+        # Append the new host to the @responseh
+        @response[:hosts].push(new_host)
+      end
+    end
   end
 end