servicesnapshot 0.0.1 → 0.0.2

data/README.md

@@ -1,18 +1,16 @@
-#ServiceMonitor
+#ServiceSnapshot
 
-The fastest way to reliably monitor your system
+The fastest way to get a snapshot of what your system is doing
 
 ##Principles
-	#This is aimed at people with computer knowledge
-	#The DSL should be clean to read, at the expense of a steeper learning curve
+    #The DSL should be clean to read, at the expense of a steeper learning curve
     #Tell users what is wrong as precisley as possible, with possible remedy's
 
 ##Get it
-    #gem install servicemonitor
+    #gem install servicesnapshot
 
 ##Run it
     #Have a look at the dsl's in the Example directory
-    #servicemonitor <path to dsl>
+    #servicesnapshot <path to dsl>
 
 ##Notes
-    #Plays well with upstart and foreman

data/bin/servicesnapshot

@@ -25,6 +25,9 @@ begin
         puts "*** Your dsl is not formatted correctly"
         puts "*** Ensure each line has the format,"
         puts "***   <command>, [:arg=>value]"
+    rescue ParameterMissingError=>e
+        puts e.message
+
     rescue SystemExit=>e
 #    rescue SIGTERM=>e
     rescue Exception=>e

data/lib/Snapshot/Beanstalk.rb

@@ -1,21 +1,22 @@
 require "beanstalk-client"
 
 def beanstalk_queue( params )
-    
-    abort( "*** Incorrect parameters passed for, beanstalk\n*** Usage, ssh :user=><username>, :host=><hostname>, :queue=><queue|[queue1,queue2,...]>" ) if params.class.name != "Hash" || params.keys.length != 3
-    abort( "*** User parameter missing for, beanstalk, command\n*** Add, :user=><username>" ) if params[:user].nil?
-    abort( "*** Host parameter missing for, beanstalk, command\n*** Add, :host=><host>" ) if params[:host].nil?
-    abort( "*** Queue parameter missing for, beanstalk, command\n*** Add, :queue=><queue>" ) if params[:queue].nil?
 
-    localPort, gateway = open_gateway( params[:user], params[:host] )
-    
+    usage = "beanstalk_queue :user=><username>, :host=><hostname>, :queue=><queue|[queue1,queue2,...]>"
+    user = get_param( params, :user, usage )
+    host = get_param( params, :host, usage )
+    queue = get_param( params, :queue, usage )
+
+
+    localPort, gateway = open_gateway( user, host )
+
     destinationUrl = "127.0.0.1:#{localPort}"
-    log "Opened SSH Gateway to, #{params[:host]}, on, #{destinationUrl}", true
+    log "Opened SSH Gateway to, #{host}, on, #{destinationUrl}", true
     list = Array.new
     log "Connect to remote beanstalk", true
     beanstalk = Beanstalk::Pool.new([destinationUrl])
-    beanstalk.watch( params[:queue] )
-    tubeStats = beanstalk.stats_tube( params[:queue] )
+    beanstalk.watch( queue )
+    tubeStats = beanstalk.stats_tube( queue )
     index = tubeStats["current-jobs-ready"].to_i
     log "Current number of msgs in tube, #{index}", true
     jobList = Array.new
@@ -30,31 +31,37 @@ def beanstalk_queue( params )
         job.release
     end
     
-    title = "# beanstalk_queue: #{params[:user]}@#{params[:host]} #{params[:queue]}"
+    title = "# beanstalk_queue: #{user}@#{host} #{queue}"
     formatOutput( title, "\n==> MSG <==\n\n" + list.join( "\n==> MSG <==\n\n" ) + "\n\n" )
 end
 
 
 def beanstalk( params )
+    usage = "beanstalk :user=><username>, :host=><hostname>, :queues=><queue|[queue1,queue2,...]>"
+    user = get_param( params, :user, usage )
+    host = get_param( params, :host, usage )
 
-    abort( "*** Incorrect parameters passed for, beanstalk\n*** Usage, ssh :user=><username>, :host=><hostname>, :queue=><queue|[queue1,queue2,...]>" ) if params.class.name != "Hash" || params.keys.length < 2 || params.keys.length > 3
-    abort( "*** User parameter missing for, beanstalk, command\n*** Add, :user=><username>" ) if params[:user].nil?
-    abort( "*** Host parameter missing for, beanstalk, command\n*** Add, :host=><host>" ) if params[:host].nil?
-    
-    localPort, gateway = open_gateway( params[:user], params[:host] )
+    queues = nil
+    begin
+        queues = get_param( params, :queues, usage )
+        rescue ParameterMissingError=>e
+    end
+
+
+    localPort, gateway = open_gateway( user, host )
     
     destinationUrl = "127.0.0.1:#{localPort}"
-    log "Opened SSH Gateway to, #{params[:host]}, on, #{destinationUrl}", true
+    log "Opened SSH Gateway to, #{host}, on, #{destinationUrl}", true
     list = Array.new
     log "Connect to remote beanstalk", true
     beanstalk = Beanstalk::Pool.new([destinationUrl])
     
     beanstalk.list_tubes[destinationUrl].each do |name|
         tubeStats = beanstalk.stats_tube(name)
-        list << name + "(" + tubeStats["current-jobs-ready"].to_s + ")" if params[:queues].nil? or !params[:queues].index( name ).nil?
+        list << name + "(" + tubeStats["current-jobs-ready"].to_s + ")" if queues.nil? or queues.index( name ).nil?
     end
     
-    title = "beanstalk: #{params[:user]}@#{params[:host]} #{params[:queues]}"
+    title = "beanstalk: #{user}@#{host} #{queues}"
     formatOutput( title, list.join( "\n" ) )
 end
 

data/lib/Snapshot/Ssh.rb

@@ -1,17 +1,16 @@
 require "net/ssh"
 
 def ssh( params )
+    usage = "ssh :user=><username>, :host=><hostname>, :queues=><queue|[queue1,queue2,...]>"
+    user = get_param( params, :user, usage )
+    host = get_param( params, :host, usage )
+    cmd = get_param( params, :cmd, usage )
     
-    abort( "*** Incorrect parameters passed for, ssh\n*** Usage, ssh :user=><username>, :host=><hostname>, :cmd=><cmd>" ) if params.class.name != "Hash" || params.keys.length != 3
-    abort( "*** User parameter missing for, ssh, command\n*** Add, :user=><username>" ) if params[:user].nil?
-    abort( "*** Host parameter missing for, ssh, command\n*** Add, :host=><host>" ) if params[:host].nil?
-    abort( "*** Cmd parameter missing for, ssh, command\n*** Add, :cmd=><cmd>" ) if params[:cmd].nil?
-
     content = ""
-    Net::SSH.start(params[:host], params[:user]) do |ssh|
-        content = ssh.exec!(params[:cmd])
+    Net::SSH.start(host, user) do |ssh|
+        content = ssh.exec!(cmd)
     end
 
-    title = "ssh: #{params[:user]}@#{params[:host]} #{params[:cmd]}"
+    title = "ssh: #{user}@#{host} #{cmd}"
     formatOutput( title, content )
 end

data/lib/helper_functions.rb

@@ -1,5 +1,29 @@
 require "net/ssh/gateway"
 
+class ParameterMissingError<StandardError
+end
+
+def get_param( params, name, usage )
+    return params[name] unless params[name].nil?
+    return ENV[name.to_s] unless ENV[name.to_s].nil?
+
+
+msg = %{*** Could not find parameter, #{name.to_s}, for command, #{caller[0][/`.*'/][1..-2]}
+*** #{usage}
+*** Try :#{name.to_s}=>'YourValue'
+}
+
+    raise ParameterMissingError.new( msg )
+end
+
+def env( *args )
+    raise "Must have an even number of argument to env" if args.length % 2 != 0
+    
+    (0..args.length-1).step(2) do |i|
+        ENV[args[i]] = args[i+1]
+    end
+end
+
 def open_gateway( user, host )
     log "Opening SSH Gateway to, #{host}", true
     gateway = Net::SSH::Gateway.new(host, user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servicesnapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-01 00:00:00.000000000 Z
 dependencies: []
 description: The fastest way to get a snapshot of your system.
 email: guy@guyirvine.com