servicesnapshot 0.0.2 → 0.0.3

data/bin/servicesnapshot

@@ -10,9 +10,21 @@ require "Snapshot/Beanstalk"
 #Don't buffer stdout
 $stdout.sync = true
 
-abort( "Usage: servicesnapshot <path to dsl>" ) if ARGV.length != 1
+if ARGV.length != 1 then
+    puts "Available dsl's"
+    puts "==============="
+    Dir.glob("./*.dsl").each do |dslFileName|
+        puts File.basename(dslFileName)
+    end
+    Dir.glob("#{ENV['HOME']}/servicesnapshot/*.dsl").each do |dslFileName|
+        puts File.basename(dslFileName)
+    end
+    puts "==============="
+
+    abort( "Usage: servicesnapshot <path to dsl>" ) if ARGV.length != 1
+end
 
-dslName = ARGV[0]
+dslName = getFileName(ARGV[0])
 
 #Need to remove file name extension 
 ENV["APP_NAME"] = File.basename( dslName ) if ENV["APP_NAME"].nil?

data/lib/Snapshot/Beanstalk.rb

@@ -46,7 +46,7 @@ def beanstalk( params )
         queues = get_param( params, :queues, usage )
         rescue ParameterMissingError=>e
     end
-
+    queues = [queues] if queues.class.name == "String"
 
     localPort, gateway = open_gateway( user, host )
     
@@ -56,9 +56,20 @@ def beanstalk( params )
     log "Connect to remote beanstalk", true
     beanstalk = Beanstalk::Pool.new([destinationUrl])
     
+    hash = Hash.new
     beanstalk.list_tubes[destinationUrl].each do |name|
         tubeStats = beanstalk.stats_tube(name)
-        list << name + "(" + tubeStats["current-jobs-ready"].to_s + ")" if queues.nil? or queues.index( name ).nil?
+        hash[name] = tubeStats["current-jobs-ready"].to_s
+    end
+    
+    if queues.nil? then
+        hash.each do |k,v|
+            list << "#{k}(#{v})"
+        end
+    else
+        queues.each do |k|
+            list << "#{k}(#{hash[k]})"
+        end
     end
     
     title = "beanstalk: #{user}@#{host} #{queues}"

data/lib/helper_functions.rb

@@ -54,3 +54,21 @@ end
 def formatOutput( title, content )
     puts "\n===> #{title} <===\n#{content}"
 end
+
+def getDslDirectory
+    return "#{ENV['HOME']}/servicesnapshot"
+end
+
+
+def getFileName( path )
+    path = "#{path}.dsl" if File.extname(path) == ""
+    
+    p = path
+    return p if File.exists?( p )
+
+    p = "#{getDslDirectory}/#{path}"
+    return p if File.exists?( p )
+
+    abort( "Could not find the dsl you passed in, #{path}" )
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servicesnapshot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: