minicron 0.1.1 → 0.2

data/lib/minicron/monitor.rb

@@ -17,15 +17,15 @@ module Minicron
       case Minicron.config['database']['type']
       when 'mysql'
         # Establish a database connection
-        ActiveRecord::Base.establish_connection({
+        ActiveRecord::Base.establish_connection(
           :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
 
@@ -44,7 +44,7 @@ module Minicron
         sleep 60
 
         # While the monitor is active run it in a loop ~every minute
-        while @active do
+        while @active
           # Get all the schedules
           schedules = Minicron::Hub::Schedule.all
 

data/lib/minicron/transport/client.rb

@@ -24,12 +24,12 @@ module Minicron
       # @return [Hash]
       def setup(job_hash, command, fqdn, hostname)
         # Send a request to set up the job
-        publish("/job/#{job_hash}/status", {
+        publish("/job/#{job_hash}/status",
           :action => 'SETUP',
           :command => command,
           :fqdn => fqdn,
           :hostname => hostname
-        })
+        )
 
         # Wait for the response..
         ensure_delivery
@@ -64,16 +64,16 @@ module Minicron
       # @param message [String]
       def publish(channel, message)
         # Set up the data to send to faye
-        data = {:channel => channel, :data => {
-          :ts => Time.now.utc.strftime("%Y-%m-%d %H:%M:%S"),
+        data = { :channel => channel, :data => {
+          :ts => Time.now.utc.strftime('%Y-%m-%d %H:%M:%S'),
           :message => message,
           :seq => @seq
-        }}
+        } }
 
         # Increment the sequence id
         @seq += 1
 
-        request({ :message => data.to_json })
+        request(:message => data.to_json)
       end
     end
   end

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

@@ -58,22 +58,22 @@ module Minicron
 
         # Did the request succeed? If so remove it from the queue
         req.callback do
-          @responses.push({
+          @responses.push(
             :status => req.response_header.status,
             :header => req.response_header,
             :body => req.response
-          })
+          )
 
           queue.delete(req_id)
         end
 
         # If not retry the request up to @retries times
         req.errback do |error|
-          @responses.push({
+          @responses.push(
             :status => req.response_header.status,
             :header => req.response_header,
             :body => req.response
-          })
+          )
 
           if @retry_counts[req_id] < @retries
             @retry_counts[req_id] += 1

data/lib/minicron/transport/faye/extensions/job_handler.rb

@@ -66,11 +66,12 @@ module Minicron
         host = Minicron::Hub::Host.where(:fqdn => data['fqdn']).first
 
         # Create it if it didn't exist!
-        if not host
+        if !host
           host = Minicron::Hub::Host.create(
             :name => data['hostname'],
             :fqdn => data['fqdn'],
-            :host => request.ip
+            :host => request.ip,
+            :port => 22
           )
 
           # Generate a new SSH key - TODO: add passphrase

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

@@ -32,6 +32,7 @@ module Minicron
       end
 
       private
+
       def add_faye_events
         @server.on(:handshake) do |client_id|
           p [:handshake, client_id] if Minicron.config['global']['verbose']

data/lib/minicron/transport/server.rb

@@ -44,7 +44,7 @@ module Minicron
       # 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
+        return false unless running? && !server.nil?
 
         server.stop
         true
@@ -53,7 +53,7 @@ module Minicron
       # Returns a bool based on whether
       # @return [Boolean]
       def running?
-        return false unless server != nil
+        return false unless !server.nil?
 
         server.running?
       end

data/lib/minicron/transport/ssh.rb

@@ -14,7 +14,7 @@ module Minicron
         @private_key = File.expand_path(options[:private_key])
 
         # TODO: Make these configurable?
-        @user = `whoami`.strip
+        @user = 'root'
         @auth_methods = ['publickey']
         @host_key = 'ssh-rsa'
         @timeout = 10
@@ -25,13 +25,11 @@ module Minicron
         @ssh = Net::SSH.start(
           @host,
           @user,
-          {
-            :port => @port,
-            :keys => [@private_key],
-            :auth_methods => @auth_methods,
-            :host_key => @host_key,
-            :timeout => @timeout
-          }
+          :port => @port,
+          :keys => [@private_key],
+          :auth_methods => @auth_methods,
+          :host_key => @host_key,
+          :timeout => @timeout
         )
       end
 

data/spec/minicron/cli_spec.rb

@@ -5,7 +5,7 @@ describe Minicron::CLI do
   let(:thin_server) { Thin::Server }
 
   describe '#server' do
-    it 'should start the minicron server' #do
+    it 'should start the minicron server' # do
       # server.should_receive(:start!)
       # server.should_receive(:running?)
       # server.should_receive(:server)
@@ -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(['lol', '--trace'])
+              Minicron::CLI.new.run(%w(lol --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(['run', '--dry-run', '--trace'])
+              Minicron::CLI.new.run(%w(run --dry-run --trace))
             end.to raise_error ArgumentError
           end
         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(['lol', '--trace'])
+              Minicron::CLI.new.run(%w(lol --trace))
             end.to raise_error SystemExit
           end
         end

data/spec/minicron/transport/client_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Minicron::Transport::Client do
   describe '#setup' do
-    it 'should send a setup message and ensure its delivery' #do
-    #end
+    it 'should send a setup message and ensure its delivery' # do
+    # end
   end
 end

data/spec/minicron/transport/faye/client_spec.rb

@@ -14,7 +14,7 @@ describe Minicron::Transport::FayeClient do
 
   describe '#ensure_em_running' do
     context 'when eventmachine is not running' do
-      it 'should start eventmachine' #do
+      it 'should start eventmachine' # do
       #   eventmachine.stub(:reactor_running?).and_return(false, true)
       #   eventmachine.stub(:run)
       #   eventmachine.should_receive(:reactor_running?).twice
@@ -25,7 +25,7 @@ describe Minicron::Transport::FayeClient do
     end
 
     context 'when eventmachine is running' do
-      it 'should not start eventmachine' #do
+      it 'should not start eventmachine' # do
     #     eventmachine.stub(:reactor_running?).and_return true
     #     eventmachine.should_receive(:reactor_running?).twice
 
@@ -46,8 +46,8 @@ describe Minicron::Transport::FayeClient do
   end
 
   describe '#tidy_up'
-   it 'should stop eventmachine' do
-    eventmachine.should_receive(:stop)
-    client.new('http', '127.0.0.1', '80', '/test').tidy_up
-  end
-end
+  it 'should stop eventmachine' do
+   eventmachine.should_receive(:stop)
+   client.new('http', '127.0.0.1', '80', '/test').tidy_up
+ end
+end

data/spec/minicron/transport/server_spec.rb

@@ -67,4 +67,4 @@ describe Minicron::Transport::Server do
       end
     end
   end
-end
+end

data/spec/minicron_spec.rb

@@ -78,7 +78,8 @@ describe Minicron do
           'server' => {
             'host' => '127.0.0.1',
             'port' => 9292,
-            'path' => '/'
+            'path' => '/',
+            'debug' => false
           },
           'database' => {
             'type' => 'mysql',

data/spec/valid_config.toml

@@ -19,6 +19,7 @@ inactivity_timeout = 5
 host = "127.0.0.1"
 port = 9292
 path = "/"
+debug = false
 
 # Database options
 [database]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minicron
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - James White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -360,6 +360,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.4
+- !ruby/object:Gem::Dependency
+  name: insidious
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement