minicron 0.2 → 0.3

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

@@ -163,20 +163,6 @@ 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/monitor.rb

@@ -53,7 +53,7 @@ module Minicron
             begin
               monitor(schedule)
             rescue Exception => e
-              if Minicron.config['global']['trace']
+              if Minicron.config['trace']
                 puts e.message
                 puts e.backtrace
               end

data/lib/minicron/transport/client.rb

@@ -36,7 +36,7 @@ module Minicron
 
         # TODO: Handle errors here!
         # Get the job and execution id from the response
-        ids = JSON.parse(responses.first[:body]).first['channel'].split('/')[3]
+        ids = JSON.parse(@responses.first[:body]).first['channel'].split('/')[3]
 
         # Split them up
         ids = ids.split('-')
@@ -51,8 +51,9 @@ module Minicron
       # Helper that wraps the publish function making it quicker to use
       #
       # @option options [String] job_id
-      # @option options [String, Symbol] type status or output
       # @option options [Integer] execution_id
+      # @option options [String, Symbol] type status or output
+      # @option options [String, Hash]
       def send(options = {})
         # Publish the message to the correct channel
         publish("/job/#{options[:job_id]}/#{options[:execution_id]}/#{options[:type]}", options[:message])
@@ -61,7 +62,7 @@ module Minicron
       # Publishes a message on the given channel to the server
       #
       # @param channel [String]
-      # @param message [String]
+      # @param message [String, Hash]
       def publish(channel, message)
         # Set up the data to send to faye
         data = { :channel => channel, :data => {

data/lib/minicron/transport/faye/client.rb

@@ -96,7 +96,7 @@ module Minicron
 
       # Tidy up after we are done with the client
       def tidy_up
-        EM.stop
+        EM.stop if EM.reactor_running?
       end
     end
   end

data/lib/minicron/transport/faye/server.rb

@@ -13,7 +13,7 @@ module Minicron
         Faye::WebSocket.load_adapter('thin')
 
         # Show debug verbose output if requested
-        if Minicron.config['global']['verbose']
+        if Minicron.config['verbose']
           log = Logger.new(STDOUT)
           log.level = Logger::DEBUG
           Faye.logger = log
@@ -35,23 +35,23 @@ module Minicron
 
       def add_faye_events
         @server.on(:handshake) do |client_id|
-          p [:handshake, client_id] if Minicron.config['global']['verbose']
+          p [:handshake, client_id] if Minicron.config['verbose']
         end
 
         @server.on(:subscribe) do |client_id, channel|
-          p [:subscribe, client_id, channel] if Minicron.config['global']['verbose']
+          p [:subscribe, client_id, channel] if Minicron.config['verbose']
         end
 
         @server.on(:unsubscribe) do |client_id, channel|
-          p [:unsubscribe, client_id, channel] if Minicron.config['global']['verbose']
+          p [:unsubscribe, client_id, channel] if Minicron.config['verbose']
         end
 
         @server.on(:publish) do |client_id, channel, data|
-          p [:published, client_id, channel, data] if Minicron.config['global']['verbose']
+          p [:published, client_id, channel, data] if Minicron.config['verbose']
         end
 
         @server.on(:disconnect) do |client_id|
-          p [:disconnect, client_id] if Minicron.config['global']['verbose']
+          p [:disconnect, client_id] if Minicron.config['verbose']
         end
       end
     end

data/lib/minicron/transport/server.rb

@@ -5,18 +5,22 @@ module Minicron
   module Transport
     # Used to mangage the web server minicron runs on
     class Server
-      attr_reader :server
+      @server = nil
+
+      class << self
+        attr_accessor :server
+      end
 
       # Starts the thin server
       #
       # @param host [String] the host e.g 0.0.0.0
       # @param port [Integer]
       # @param path [String] The absolute path to the server e.g /server
-      def start!(host, port, path)
+      def self.start!(host, port, path)
         return false if running?
 
         # Start the faye or rails apps depending on the path
-        server = Thin::Server.new(host, port) do
+        @server = Thin::Server.new(host, port) do
           use Rack::CommonLogger
           use Rack::ShowExceptions
 
@@ -37,25 +41,25 @@ module Minicron
           end
         end
 
-        server.start
+        @server.start
         true
       end
 
       # Stops the thin server if it's running
       # @return [Boolean] whether the server was stopped or not
-      def stop!
-        return false unless running? && !server.nil?
+      def self.stop!
+        return false unless running? && !@server.nil?
 
-        server.stop
+        @server.stop
         true
       end
 
       # Returns a bool based on whether
       # @return [Boolean]
-      def running?
-        return false unless !server.nil?
+      def self.running?
+        return false unless !@server.nil?
 
-        server.running?
+        @server.running?
       end
     end
   end

data/spec/minicron/alert/pagerduty_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Minicron::PagerDuty do
+  describe '#intiailize' do
+    it 'should create an instance of the Pagerduty gem' do
+      pagerduty = Minicron::PagerDuty.new
+
+      expect(pagerduty.instance_variable_get(:@client)).to be_a Pagerduty
+    end
+  end
+
+  describe '#get_message' do
+    context 'when kind is miss' do
+      it 'should return the correct message' do
+        pagerduty = Minicron::PagerDuty.new
+        time = Time.now.utc
+        options = {
+          :job_id => 1,
+          :expected_at => time,
+          :execution_id => 2,
+          :kind => 'miss'
+        }
+        message = "Job #1 failed to execute at its expected time - #{time}"
+
+        expect(pagerduty.get_message(options)).to eq message
+      end
+    end
+
+    context 'when kind is fail' do
+      it 'should return the correct message' do
+        pagerduty = Minicron::PagerDuty.new
+        options = {
+          :job_id => 1,
+          :execution_id => 2,
+          :kind => 'fail'
+        }
+        message = "Execution #2 of Job #1 failed"
+
+        expect(pagerduty.get_message(options)).to eq message
+      end
+    end
+
+    context 'when kind is not supported' do
+      it 'should raise an Exception' do
+        pagerduty = Minicron::PagerDuty.new
+        options = {
+          :kind => 'derp'
+        }
+
+        expect do
+          pagerduty.get_message(options)
+        end.to raise_error Exception
+      end
+    end
+  end
+
+  describe '#send' do
+    it 'should trigger an alert on the pagerduty client' do
+      pagerduty = Minicron::PagerDuty.new
+
+      pagerduty.instance_variable_get(:@client).should_receive(:trigger).with('title', :message => 'yo')
+
+      pagerduty.send('title', 'yo')
+    end
+  end
+end

data/spec/minicron/alert/sms_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Minicron::SMS do
+  before (:each) do
+    Minicron.parse_config_hash({
+      'alerts' => {
+        'sms' => {
+          'twilio' => {
+            'account_sid' => 'abc123',
+            'auth_token' => 'abc456'
+          }
+        }
+      }
+    })
+  end
+
+  describe '#intiailize' do
+    it 'should create an instance of the Twilio gem' do
+      sms = Minicron::SMS.new
+
+      expect(sms.instance_variable_get(:@client)).to be_a Twilio::REST::Client
+    end
+  end
+
+  describe '#get_message' do
+    context 'when kind is miss' do
+      it 'should return the correct message' do
+        sms = Minicron::SMS.new
+        time = Time.now.utc
+        options = {
+          :job_id => 1,
+          :expected_at => time,
+          :execution_id => 2,
+          :kind => 'miss'
+        }
+        message = "minicron alert - job missed!\nJob #1 failed to execute at its expected time: #{time}"
+
+        expect(sms.get_message(options)).to eq message
+      end
+    end
+
+    context 'when kind is fail' do
+      it 'should return the correct message' do
+        sms = Minicron::SMS.new
+        options = {
+          :job_id => 1,
+          :execution_id => 2,
+          :kind => 'fail'
+        }
+        message = "minicron alert - job failed!\nExecution #2 of Job #1 failed"
+
+        expect(sms.get_message(options)).to eq message
+      end
+    end
+
+    context 'when kind is not supported' do
+      it 'should raise an Exception' do
+        sms = Minicron::SMS.new
+        options = {
+          :kind => 'derp'
+        }
+
+        expect do
+          sms.get_message(options)
+        end.to raise_error Exception
+      end
+    end
+  end
+end

data/spec/minicron/cli_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Minicron::CLI do
-  let(:server) { Minicron::Transport::Server.new }
+  let(:server) { Minicron::Transport::Server }
   let(:thin_server) { Thin::Server }
 
   describe '#server' do
@@ -23,7 +23,7 @@ describe Minicron::CLI do
 
     context 'when in --dry-run mode' do
       it 'should run a simple command and print the output to stdout' do
-        Minicron::CLI.new.run(['run', 'echo hello', '--dry-run', '--trace']) do |output|
+        Minicron::CLI.run(['run', 'echo hello', '--dry-run', '--trace']) do |output|
           expect(output.clean).to eq 'hello'
         end
       end
@@ -31,7 +31,7 @@ describe Minicron::CLI do
       it 'should run a simple multi-line command and print the output to stdout' do
         command_output = ''
 
-        Minicron::CLI.new.run(['run', 'echo "hello\nworld"', '--dry-run', '--trace']) do |output|
+        Minicron::CLI.run(['run', 'echo "hello\nworld"', '--dry-run', '--trace']) do |output|
           command_output += output
         end
 
@@ -42,7 +42,7 @@ describe Minicron::CLI do
         it 'should return an error' do
           Minicron.capture_output :type => :stderr do
             expect do
-              Minicron::CLI.new.run(%w(lol --trace))
+              Minicron::CLI.run(%w(gfdjgfdlgj --trace))
             end.to raise_error SystemExit
           end
         end
@@ -52,7 +52,7 @@ describe Minicron::CLI do
         it 'should raise ArgumentError' do
           Minicron.capture_output :type => :stderr do
             expect do
-              Minicron::CLI.new.run(%w(run --dry-run --trace))
+              Minicron::CLI.run(%w(run --dry-run --trace))
             end.to raise_error ArgumentError
           end
         end
@@ -61,7 +61,7 @@ describe Minicron::CLI do
 
     context 'when in --dry-run mode with a valid --config file passed' do
       it 'should run a simple command and print the output to stdout' do
-        Minicron::CLI.new.run(['run', 'echo hello', '--dry-run', '--trace', '--config', './default.config.toml']) do |output|
+        Minicron::CLI.run(['run', 'echo hello', '--dry-run', '--trace', '--config', './default.config.toml']) do |output|
           expect(output.clean).to eq 'hello'
         end
       end
@@ -69,7 +69,7 @@ describe Minicron::CLI do
       it 'should run a simple multi-line command and print the output to stdout' do
         command_output = ''
 
-        Minicron::CLI.new.run(['run', 'echo "hello\nworld"', '--dry-run', '--trace', '--config', './default.config.toml']) do |output|
+        Minicron::CLI.run(['run', 'echo "hello\nworld"', '--dry-run', '--trace', '--config', './default.config.toml']) do |output|
           command_output += output
         end
 
@@ -80,7 +80,7 @@ describe Minicron::CLI do
         it 'should return an error' do
           Minicron.capture_output :type => :stderr do
             expect do
-              Minicron::CLI.new.run(%w(lol --trace))
+              Minicron::CLI.run(['dfsfsdfsdfs', '--trace'])
             end.to raise_error SystemExit
           end
         end
@@ -90,28 +90,45 @@ describe Minicron::CLI do
         it 'should raise ArgumentError' do
           Minicron.capture_output :type => :stderr do
             expect do
-              Minicron::CLI.new.run(['run', '--dry-run', '--trace', '--config', './default.config.toml'])
+              Minicron::CLI.run(['run', '--dry-run', '--trace', '--config', './default.config.toml'])
             end.to raise_error ArgumentError
           end
         end
       end
     end
+
+    context 'when run in --verbose mode' do
+      it 'should set the verbose to true' do
+        Minicron.capture_output :type => :stderr do
+          Minicron::CLI.run(['run', '--dry-run', '--trace', '--verbose', 'echo 1']) {}
+
+          expect(Minicron.config['verbose']).to eq true
+        end
+      end
+    end
   end
 
   describe '#run_command' do
     context 'when in verbose mode' do
       it 'a one line command should result in 7 total line' do
-        minicron = Minicron::CLI.new
-        minicron.disable_coloured_output!
+        Minicron::CLI.disable_coloured_output!
         output = ''
 
-        minicron.run_command('echo 1', :verbose => true) do |line|
+        Minicron::CLI.run_command('echo 1', :verbose => true) do |line|
           output += line[:output]
         end
 
         expect(output.split("\n").length).to eq 7
       end
     end
+
+    context 'when a non-existent command is run' do
+      it 'should raise an Exception' do
+        expect do
+          Minicron::CLI.run_command('fdsfsdfsd') {}
+        end.to raise_error Exception
+      end
+    end
   end
 
   describe '#coloured_output?' do
@@ -119,7 +136,7 @@ describe Minicron::CLI do
       it 'should return true' do
         Rainbow.enabled = true
 
-        expect(Minicron::CLI.new.coloured_output?).to eq true
+        expect(Minicron::CLI.coloured_output?).to eq true
       end
     end
 
@@ -127,28 +144,26 @@ describe Minicron::CLI do
       it 'should return false' do
         Rainbow.enabled = false
 
-        expect(Minicron::CLI.new.coloured_output?).to eq false
+        expect(Minicron::CLI.coloured_output?).to eq false
       end
     end
   end
 
   describe '#enable_coloured_output!' do
     it 'should set Rainbow.enabled to true' do
-      minicron = Minicron::CLI.new
-      minicron.enable_coloured_output!
+      Minicron::CLI.enable_coloured_output!
 
       expect(Rainbow.enabled).to eq true
-      expect(minicron.coloured_output?).to eq true
+      expect(Minicron::CLI.coloured_output?).to eq true
     end
   end
 
   describe '#disable_coloured_output!' do
     it 'should set Rainbow.enabled to false' do
-      minicron = Minicron::CLI.new
-      minicron.disable_coloured_output!
+      Minicron::CLI.disable_coloured_output!
 
       expect(Rainbow.enabled).to eq false
-      expect(minicron.coloured_output?).to eq false
+      expect(Minicron::CLI.coloured_output?).to eq false
     end
   end
 end