perus 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 426902fcecc63ec81acf9352f4bafba9fa1988d4
-  data.tar.gz: 36838e6272731efce01b25f8c8773d4ed8622cfe
+  metadata.gz: bae9eee51f945b6f2ba014af73f5cdfa8fa6ab03
+  data.tar.gz: 3253602c339568d245a4a448abbd3990cf89479f
 SHA512:
-  metadata.gz: a4e06d529a4d1d00f2beba82bd5c118b662fedd4b5b70856d39fadbd9a28781c3a9c2243ab9670dac271c69ace4ad6e8961c6988590b296536816a941995d146
-  data.tar.gz: 2bb970e51ed715718b85078c46c34218d25f4596994136215cf99d313e32a78822ebcba13120848e4b38d542caee7726a4f7a75fc15dd17fc8dd0550339abe02
+  metadata.gz: 4a88068ed77a22b0e7fa210394931994053dcca0d0e8b025f01e1638623f462024ebabf83a9e67c8a4f442879bdaa6f5dbda86485698bc86d57af327c253bd36
+  data.tar.gz: e7611359ef127aef4bbad47f0ed74baf32cf59fd808e7484fd658e108d2b0f93008655d41b672b022143ddea8cac3358629a963c274e187f13e4955bfe0e720c

data/exe/perus-pinger

@@ -4,10 +4,10 @@ require 'optparse'
 
 options_path = Perus::Pinger::DEFAULT_PINGER_OPTIONS_PATH
 
-ARGV.options do |opts|
+OptionParser.new do |opts|
     opts.banner = "Usage: perus-pinger [options]"
 
-    opts.on('-c', '--config', String, "Path to config file (default: #{Perus::Pinger::DEFAULT_PINGER_OPTIONS_PATH})") do |c|
+    opts.on('-c', '--config PATH', "Path to config file (default: #{Perus::Pinger::DEFAULT_PINGER_OPTIONS_PATH})") do |c|
         options_path = c
     end
 
@@ -15,9 +15,7 @@ ARGV.options do |opts|
         puts opts
         exit
     end
-
-    opts.parse!
-end
+end.parse!
 
 pinger = Perus::Pinger::Pinger.new(options_path)
 pinger.run

data/exe/perus-server

@@ -3,21 +3,29 @@ require 'perus'
 require 'optparse'
 
 options_path = Perus::Server::DEFAULT_SERVER_OPTIONS_PATH
+environment = 'development'
 
-ARGV.options do |opts|
+OptionParser.new do |opts|
     opts.banner = "Usage: perus-server [options]"
 
-    opts.on('-c', '--config', String, "Path to config file (default: #{Perus::Server::DEFAULT_SERVER_OPTIONS_PATH})") do |c|
+    opts.on('-c', '--config PATH', "Path to config file (default: #{Perus::Server::DEFAULT_SERVER_OPTIONS_PATH})") do |c|
         options_path = c
     end
 
+    opts.on('-e', '--env ENV', "Environment (values: development (default), production)") do |e|
+        environment = e
+
+        unless %w{development production}.include?(e)
+            puts 'Environment must be "development" or "production"'
+            exit
+        end
+    end
+
     opts.on('-h', '--help', 'Prints this help') do
         puts opts
         exit
     end
+end.parse!
 
-    opts.parse!
-end
-
-server = Perus::Server::Server.new(options_path)
+server = Perus::Server::Server.new(options_path, environment)
 server.run

data/lib/perus/pinger/command.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'open3'
 
 module Perus::Pinger
     class Option
@@ -119,5 +120,19 @@ module Perus::Pinger
             # called after sending data to server. remove temporary
             # files etc.
         end
+
+        # helper function to run shell commands and return early if anything
+        # is written to stderr or the command didn't run successfully
+        class ShellCommandError < StandardError; end
+        def shell(command)
+            out, err, status = Open3.capture3(command)
+            raise ShellCommandError.new(err.strip) unless err.empty?
+            raise ShellCommandError.new(out.strip) if status.exitstatus > 0
+            out
+        end
+
+        def darwin?
+            shell('uname -s').strip == 'Darwin'
+        end
     end
 end

data/lib/perus/pinger/commands/chrome_execute.rb

@@ -17,6 +17,9 @@ module Perus::Pinger
                     else
                         result = false
                     end
+
+                    # clean up any memory used by the executed command
+                    send_command('{"id":2,"method":"Runtime.releaseObjectGroup","params":{"objectGroup":"perus"}}')
                 end
             end
 

data/lib/perus/pinger/commands/kill_process.rb

@@ -6,8 +6,8 @@ module Perus::Pinger
         option :signal, default: 'KILL'
 
         def run
-            result = `killall -#{option.signal} #{option.process_name}`
-            result.include?('no process found') ? result : true
+            result = shell("killall -#{option.signal} #{option.process_name}")
+            true # shell will capture any errors
         end
     end
 end

data/lib/perus/pinger/commands/upgrade.rb

@@ -5,9 +5,9 @@ module Perus::Pinger
 
         def run
             if options.sudo
-                result = `sudo gem upgrade perus`
+                result = shell('sudo gem upgrade perus')
             else
-                result = `gem upgrade perus`
+                result = shell('gem upgrade perus')
             end
 
             result.include?('ERROR') ? result : true

data/lib/perus/pinger/metrics/cpu.rb

@@ -5,10 +5,10 @@ module Perus::Pinger
         metric!
 
         def run
-            if `uname -s`.strip == 'Darwin'
-                percent = 100 - `iostat -n 0`.split("\n")[2].split[2].to_i
+            if darwin?
+                percent = 100 - shell('iostat dxxvdfs -n 0').split("\n")[2].split[2].to_i
             else
-                percent = `grep 'cpu ' /proc/stat | awk '{print (1 - ($5 / ($2+$3+$4+$5+$6+$7+$8)))*100}'`
+                percent = shell("grep 'cpu ' /proc/stat | awk '{print (1 - ($5 / ($2+$3+$4+$5+$6+$7+$8)))*100}'")
             end
             
             {cpu_all: percent.to_f}

data/lib/perus/pinger/metrics/hd.rb

@@ -7,7 +7,7 @@ module Perus::Pinger
         
         def run
             regex = "/^#{options.drive.gsub("/", "\\/")}/"
-            percent = `df -h / | awk '#{regex} {print $5}'`
+            percent = shell("df -h / | awk '#{regex} {print $5}'")
             {hd_used: percent.to_i}
         end
     end

data/lib/perus/pinger/metrics/mem.rb

@@ -4,7 +4,7 @@ module Perus::Pinger
         metric!
 
         def run
-            percent = `cat /proc/meminfo | awk '{if ($1=="MemTotal:") total = $2; if ($1 == "MemFree:") free = $2;} END {print (1 - (free / total))*100}'`
+            percent = shell(%q[cat /proc/meminfo | awk '{if ($1=="MemTotal:") total = $2; if ($1 == "MemFree:") free = $2;} END {print (1 - (free / total))*100}'])
             {mem_all: percent.to_f}
         end
     end

data/lib/perus/pinger/metrics/process.rb

@@ -10,12 +10,13 @@ module Perus::Pinger
         metric!
 
         def run
-            path = options.process_path.gsub("/", "\\\\\\/")
-            cpu, mem = `ps aux | awk '/#{path}/ {cpu += $3; mem += $4} END {print cpu, mem;}'`.split
-            if `uname -s`.strip == 'Darwin'
-                core_count = `sysctl -n hw.ncpu`
+            path = options.process_path.gsub("/", "\\/")
+            cpu, mem = shell("ps aux | awk '/#{path}/ {cpu += $3; mem += $4} END {print cpu, mem;}'").split
+
+            if darwin?
+                core_count = shell('sysctl -n hw.ncpu')
             else
-                core_count = `cat /proc/cpuinfo | grep processor | awk '{count += 1} END {print count}'`
+                core_count = shell("cat /proc/cpuinfo | grep processor | awk '{count += 1} END {print count}'")
             end
 
             {

data/lib/perus/pinger/metrics/screenshot.rb

@@ -9,19 +9,22 @@ module Perus::Pinger
         metric!
 
         def run
-            if `uname -s`.strip == 'Darwin'
+            if darwin?
                 if options.resize[-1] != '%'
                     raise 'Non percent resize option unsupported by OS X currently'
                 else
                     percent = options.resize.to_f / 100
                 end
 
-                `screencapture -m -t jpg -x #{options.path}`
-                width  = `sips -g pixelWidth #{options.path}`.match(/pixelWidth: (\d+)/)[1]
-                height = `sips -g pixelHeight #{options.path}`.match(/pixelHeight: (\d+)/)[1]
+                shell("screencapture -m -t jpg -x #{options.path}")
+                width  = shell("sips -g pixelWidth #{options.path}").match(/pixelWidth: (\d+)/)[1]
+                height = shell("sips -g pixelHeight #{options.path}").match(/pixelHeight: (\d+)/)[1]
+
+                # sips helpfully prints data to stderr, so it's run with
+                # backticks to avoid thowing an exception on success
                 `sips -z #{height.to_i * percent} #{width.to_i * percent} #{options.path}`
             else
-                `export DISPLAY=:0; import -window root -resize #{options.resize} #{options.path}`
+                shell("export DISPLAY=:0; import -window root -resize #{options.resize} #{options.path}")
             end
 
             @screenshot_file = File.new(options.path)
@@ -29,7 +32,10 @@ module Perus::Pinger
         end
 
         def cleanup
-            @screenshot_file.close unless @screenshot_file.closed?
+            unless @screenshot_file.nil? || @screenshot_file.closed?
+                @screenshot_file.close
+            end
+
             File.delete(options.path)
         end
     end

data/lib/perus/pinger/metrics/temp.rb

@@ -6,10 +6,10 @@ module Perus::Pinger
         metric!
         
         def run
-            if `uname -s`.strip == 'Darwin'
-                degrees = `istats cpu temp`.split[2].match(/([0-9\.]+)/)[0]
+            if darwin?
+                degrees = shell('istats cpu temp').split[2].match(/([0-9\.]+)/)[0]
             else
-                degrees = `sensors | grep "#{options.device}:"`.match(/#{options.device}:\s+(\S+)/)[1]
+                degrees = shell(%q[sensors | grep "#{options.device}:"]).match(/#{options.device}:\s+(\S+)/)[1]
             end
 
             {temp: degrees.to_f}

data/lib/perus/pinger/metrics/uptime.rb

@@ -4,7 +4,7 @@ module Perus::Pinger
         metric!
         
         def run
-            {uptime: `uptime`.strip}
+            {uptime: shell('uptime').strip}
         end
     end
 end

data/lib/perus/pinger/metrics/value.rb

@@ -10,7 +10,8 @@ module Perus::Pinger
         metric!
         
         def run
-            line = `cat #{options.path} | grep #{options.grep}`
+            grep = optipns.grep.gsub('"', '\\"')
+            line = shell(%q[cat #{options.path} | egrep "#{grep}"])
             value = line.match(Regexp.compile(options.match))[1]
             {options.name => value}
         end

data/lib/perus/pinger/pinger.rb

@@ -51,8 +51,8 @@ module Perus::Pinger
 
             # cache urls on initialisation since the urls depend on values known
             # at startup and that won't change over the object lifetime
-            config_path = URI("/systems/#{Pinger.options.system_id}/config")
-            pinger_path = URI("/systems/#{Pinger.options.system_id}/ping")
+            config_path = URI("systems/#{Pinger.options.system_id}/config")
+            pinger_path = URI("systems/#{Pinger.options.system_id}/ping")
             server_uri  = URI(Pinger.options.server)
 
             @config_url = (server_uri + config_path).to_s
@@ -92,10 +92,10 @@ module Perus::Pinger
                         @metric_errors[metric.name] ||= []
                         @metrics << metric.new(config['options'])
                     else
-                        @metric_errors[config['type']] = e.inspect
+                        @metric_errors[config['type']] = format_exception(e)
                     end
                 rescue => e
-                    @metric_errors[metric.name] << e.inspect
+                    @metric_errors[metric.name] << format_exception(e)
                 end
             end
 
@@ -105,7 +105,7 @@ module Perus::Pinger
                     @actions << command.new(config['options'], config['id'])
                 rescue => e
                     if config['id']
-                        @action_results[config['id']] = e.inspect
+                        @action_results[config['id']] = format_exception(e)
                     else
                         puts 'Error - action does not have an associated id'
                         p config
@@ -117,13 +117,21 @@ module Perus::Pinger
         #----------------------
         # run
         #----------------------
+        def format_exception(e)
+            if e.backtrace.empty?
+                e.inspect
+            else
+                "#{e.inspect}\n#{e.backtrace.first}"
+            end
+        end
+
         def run_metrics
             @metrics.each do |metric|
                 begin
                     result = metric.run
                     @metric_results.merge!(result)
                 rescue => e
-                    @metric_errors[metric.class.name] << e.inspect
+                    @metric_errors[metric.class.name] << format_exception(e)
                 end
             end
         end
@@ -141,7 +149,7 @@ module Perus::Pinger
                     @action_results[action.id] = result
 
                 rescue => e
-                    @action_results[action.id] = e.inspect
+                    @action_results[action.id] = format_exception(e)
                 end
             end
         end
@@ -179,7 +187,7 @@ module Perus::Pinger
                 RestClient.post(@pinger_url, payload)
             rescue => e
                 puts 'Ping failed with exception'
-                puts e.inspect
+                puts format_exception(e)
             end
         end
 
@@ -192,7 +200,7 @@ module Perus::Pinger
                     metric.cleanup
                 rescue => e
                     puts 'Error running metric cleanup'
-                    puts e.inspect
+                    puts format_exception(e)
                 end
             end
 
@@ -201,7 +209,7 @@ module Perus::Pinger
                     action.cleanup
                 rescue => e
                     puts 'Error running action cleanup'
-                    puts e.inspect
+                    puts format_exception(e)
                 end
             end
 
@@ -210,7 +218,7 @@ module Perus::Pinger
                     code.call
                 rescue => e
                     puts 'Error running late action'
-                    puts e.inspect
+                    puts format_exception(e)
                 end
             end
         end

data/lib/perus/server/admin.rb

@@ -11,6 +11,7 @@ module Perus::Server
                     helpers Helpers
 
                     before do
+                        @singular = '#{singular}'
                         @plural = '#{plural}'
                         @title = '#{title}'
                         load_site_information

data/lib/perus/server/app.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'sinatra/synchrony'
 require 'sinatra/reloader'
 require 'sequel'
 require 'json'
@@ -10,7 +9,6 @@ module Perus::Server
         #----------------------
         # config
         #----------------------
-        register Sinatra::Synchrony
         helpers Helpers
 
         configure do

data/lib/perus/server/db.rb

@@ -1,9 +1,15 @@
 require 'sequel'
 require 'sequel/plugins/serialization'
+require 'concurrent'
 
 module Perus::Server
     module DB
+        def self.db
+            @db
+        end
+
         def self.start
+            puts 'Loading database'
             Sequel.extension :migration
             Sequel.extension :inflector
 
@@ -24,6 +30,62 @@ module Perus::Server
             require File.join(__dir__, 'models', 'command_config')
             require File.join(__dir__, 'models', 'script_command')
             require File.join(__dir__, 'models', 'config_metric')
+
+            # attempt to run vacuum twice a day. this is done to increase
+            # performance rather than reclaim unused space. as old values and
+            # metrics are deleted the data become very fragmented. vacuuming
+            # restructures the db so system records in the values index should
+            # be sequentially stored
+            vacuum_task = Concurrent::TimerTask.new do
+                @db.execute('vacuum')
+            end
+
+            # fire every 12 hours
+            vacuum_task.execution_interval = 60 * 60 * 12
+            vacuum_task.execute
+
+            # a fixed number of hours of data are kept in the database. once an
+            # hour, old values and files are removed. if all values of a metric
+            # are removed from a system, the accompanying metric record is also
+            # removed.
+            cleanup_task = Concurrent::TimerTask.new do
+                Perus::Server::DB.cleanup
+            end
+
+            # fire every hour
+            cleanup_task.execution_interval = 60 * 60
+            cleanup_task.execute
+        end
+
+        def self.cleanup
+            puts 'Cleaning old values and metrics'
+            keep_hours = Server.options.keep_hours
+
+            # remove old values
+            min_timestamp = Time.now.to_i - (keep_hours * 60)
+            values = Value.where("timestamp < #{min_timestamp}")
+            puts "Deleting #{values.count} values"
+            values.each(&:destroy)
+
+            # remove metrics from systems if they no longer have any values
+            empty_deleted = 0
+            file_deleted = 0
+
+            Metric.each do |metric|
+                if metric.file
+                    path = metric.path
+                    if !File.exists?(path) || File.mtime(path).to_i < min_timestamp
+                        metric.destroy
+                        file_deleted += 1
+                    end
+                elsif metric.values_dataset.empty?
+                    metric.destroy
+                    empty_deleted += 1
+                end
+            end
+
+            puts "#{empty_deleted} metrics were deleted as they had no values"
+            puts "#{file_deleted} metrics were deleted as they had old files"
         end
     end
 end

data/lib/perus/server/form.rb

@@ -1,5 +1,7 @@
 module Perus::Server
     class Form
+        include Helpers
+
         def initialize(record)
             @record = record
         end
@@ -33,7 +35,8 @@ module Perus::Server
         end
 
         def input(field, options)
-            "<input type=\"text\" name=\"record[#{field}]\" value=\"#{@record.send(field)}\">"
+            value = escape_quotes(@record.send(field))
+            "<input type=\"text\" name=\"record[#{field}]\" value=\"#{value}\">"
         end
 
         def textarea(field, options)
@@ -56,7 +59,7 @@ module Perus::Server
             existing = @record.send(field)
             option_rows = options.collect do |(value, name)|
                 selected = existing == value ? 'selected' : ''
-                "<option value=\"#{value}\" #{selected}>#{name || value}</option>"
+                "<option value=\"#{escape_quotes(value)}\" #{selected}>#{name || value}</option>"
             end
 
             "<select name=\"record[#{field}]\">#{option_rows.join("\n")}</select>"

data/lib/perus/server/helpers.rb

@@ -39,6 +39,10 @@ module Perus::Server
             text.gsub('<', '&lt;').gsub('>', '&gt;')
         end
 
+        def escape_quotes(text)
+            text.to_s.gsub('"', '&quot;')
+        end
+
         def url_prefix
             Server.options.url_prefix
         end

data/lib/perus/server/models/config.rb

@@ -16,6 +16,10 @@ module Perus::Server
             end
         end
 
+        def can_delete?
+            systems_dataset.empty?
+        end
+
         def validate
             super
             validates_presence  :name

data/lib/perus/server/models/group.rb

@@ -8,5 +8,17 @@ module Perus::Server
             validates_presence  :name
             validates_unique    :name
         end
+
+        def after_destroy
+            super
+
+            # rather than deleting all systems in a group, each system in the
+            # group is just removed from the group instead. this is better than
+            # accidentally removing a group and all related system data.
+            systems.each do |system|
+                system.group_id = nil
+                system.save
+            end
+        end
     end
 end

data/lib/perus/server/models/metric.rb

@@ -24,6 +24,19 @@ module Perus::Server
             (prefix + path).to_s
         end
 
+        def path
+            File.join(system.uploads_dir, file['filename'])
+        end
+
+        def values_dataset
+            system.values_dataset.where(metric: name)
+        end
+
+        def after_destroy
+            super
+            File.unlink(path) if file && File.exists?(path)
+        end
+
         def self.add(name, system_id, type, file_data = nil)
             existing = Metric.where(system_id: system_id, name: name, type: type).first
 

data/lib/perus/server/models/script.rb

@@ -2,6 +2,7 @@ module Perus::Server
     class Script < Sequel::Model
         plugin :validation_helpers
         one_to_many :script_commands, order: 'name asc'
+        one_to_many :actions
 
         def code_name
             name.gsub(' ', '_').camelize
@@ -25,6 +26,10 @@ module Perus::Server
             end
         end
 
+        def can_delete?
+            actions_dataset.empty?
+        end
+
         def validate
             super
             validates_presence  :name

data/lib/perus/server/models/system.rb

@@ -18,6 +18,19 @@ module Perus::Server
             validates_unique    :name
         end
 
+        def after_destroy
+            super
+
+            # remove dependent records
+            metrics.each(&:destroy)
+            values.each(&:destroy)
+            actions.each(&:destroy)
+            collection_errors.each(&:destroy)
+
+            # remove any uploaded files
+            FileUtils.rm_rf([uploads_dir], secure: true)
+        end
+
         def pending_actions
             actions_dataset.where(timestamp: nil).all
         end

data/lib/perus/server/public/css/style.css

@@ -252,14 +252,21 @@ main {
     #meta img {
         display: inline-block;
         vertical-align: top;
-        width: 450px;
         margin-right: 30px;
     }
 
+    #meta.portrait img, #meta.other img {
+        width: 250px;
+    }
+
+    #meta.landscape img {
+        width: 450px;
+    }
+
     #meta dl {
         display: inline-block;
         vertical-align: top;
-        width: 300px;
+        width: 450px;
     }
 
         #meta dt, #meta dd {
@@ -275,7 +282,7 @@ main {
         }
 
         #meta dd {
-            width: 190px;
+            width: 390px;
             line-height: 16px;
         }
 

data/lib/perus/server/server.rb

@@ -8,14 +8,16 @@ DEFAULT_SERVER_OPTIONS = {
         'listen' => '0.0.0.0',
         'port' => 3000,
         'site_name' => 'Perus',
-        'url_prefix' => '/'
+        'url_prefix' => '/',
+        'keep_hours' => 24
     }
 }
 
 module Perus::Server
     class Server
-        def initialize(options_path = DEFAULT_SERVER_OPTIONS_PATH)
+        def initialize(options_path = DEFAULT_SERVER_OPTIONS_PATH, environment = 'development')
             self.class.options.load(options_path, DEFAULT_SERVER_OPTIONS)
+            ENV['RACK_ENV'] = environment
             DB.start
         end
 

data/lib/perus/server/views/admin/index.erb

@@ -5,8 +5,17 @@
         <table>
             <% @records.each do |record| %>
                 <tr>
-                    <td><a href="<%= url_prefix %>admin/<%= @plural %>/<%= record.id %>"><%= record.name %></a></td>
-                    <td><a href="<%= url_prefix %>admin/<%= @plural %>/<%= record.id %>">Delete</a></td>
+                    <td>
+                        <a href="<%= url_prefix %>admin/<%= @plural %>/<%= record.id %>"><%= record.name %></a>
+                    </td>
+                    <td>
+                        <% if !record.respond_to?(:can_delete?) || record.can_delete? %>
+                            <form class="delete-row" action="<%= url_prefix %>admin/<%= @plural %>/<%= record.id %>" method="POST">
+                                <input type="hidden" name="_method" value="DELETE">
+                                <input type="submit" value="Delete">
+                            </form>
+                        <% end %>
+                    </td>
                 </tr>
             <% end %>
         </table>
@@ -16,3 +25,10 @@
 </section>
 
 <p class="actions"><a href="<%= url_prefix %>admin/<%= @plural %>/new">New <%= @title.downcase %></a></p>
+
+<script>
+    $('form.delete-row').submit(function(event) {
+        if (!confirm('Are you sure you want to delete this <%= @singular %>?'))
+            event.preventDefault();
+    });
+</script>

data/lib/perus/server/views/command_config.erb

@@ -19,7 +19,7 @@
                             <% end %>
                         </select>
                     <% else %>
-                        <input type="text" name="options[<%= option.name %>]" placeholder="<%= option.default %>" value="<%= command_options[option.name.to_s] if defined?(command_options) %>">
+                        <input type="text" name="options[<%= option.name %>]" placeholder="<%= option.default %>" value="<%= escape_quotes(command_options[option.name.to_s]) if defined?(command_options) %>">
                     <% end %>
                 </span>
             </p>

data/lib/perus/server/views/errors.erb

@@ -1,6 +1,6 @@
 <% errors.each do |error| %>
     <li>
         <h1><%= error.module %> - <%= Time.at(error.timestamp).ctime %></h1>
-        <p><%= clean_arrows(error.description) %></p>
+        <p><%= clean_arrows(error.description).gsub("\n", "<br>") %></p>
     </li>
 <% end %>

data/lib/perus/server/views/system.erb

@@ -1,6 +1,6 @@
 <h1>System: <%= @system.name %></h1>
 
-<section id="meta">
+<section id="meta" class="<%= @system.orientation.downcase %>">
     <img src="<%= @uploads['screenshot'] %>">
     <dl>
         <% unless @system.logical_name.empty? %>

data/lib/perus/version.rb

@@ -1,3 +1,3 @@
 module Perus
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
 end

data/lib/perus.rb

@@ -7,6 +7,21 @@ end
 
 if ARGV[0] == 'server'
     Perus::Server::Server.new.run
+
 elsif ARGV[0] == 'pinger'
     Perus::Pinger::Pinger.new.run
+
+elsif ARGV[0] == 'console'
+    require 'irb'
+
+    # start in the Server namespace
+    include Perus::Server
+
+    # console is used to access the database. initialise a server to load
+    # default settings and start the database connection.
+    Server.new
+
+    # remove the arg otherwise irb will try to load a file named 'console'
+    ARGV.shift
+    IRB.start
 end

data/perus.gemspec

@@ -26,8 +26,6 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'faye-websocket', '~> 0.9'
     spec.add_dependency 'rest-client', '~> 1.8'
     spec.add_dependency 'sinatra', '~> 1.4'
-    spec.add_dependency 'sinatra-synchrony', '~> 0.4'
-    spec.add_dependency 'sinatra-websocket', '~> 0.3'
     spec.add_dependency 'sinatra-contrib', '~> 1.4'
     spec.add_dependency 'sqlite3', '~> 1.3'
     spec.add_dependency 'sequel', '~> 4.23'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Will Cannings
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,34 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: sinatra-synchrony
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: sinatra-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -352,4 +324,3 @@ signing_key:
 specification_version: 4
 summary: Simple system overview server
 test_files: []
-has_rdoc: