grid_runner 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e12d785f9147e0671365de174aa815e8963e3c47
-  data.tar.gz: 9c4f68bd82a57cc5e79b94de89135e8600d3acc4
+  metadata.gz: 3d7a8c5a7bf8bba8325ab47198f7eef5fe9ea0e2
+  data.tar.gz: a890cd6f7cc8f58f93bb0afcf5a96f1cd5eb7437
 SHA512:
-  metadata.gz: ba01765add2b7b1d42c6386a4e5a1bc372f608e4e5a9ac25dc24fb924c8952d719613def424aff7b094d18ee60f4a04425dccc8063947aa8de152fd9a0c260f2
-  data.tar.gz: 2a00c770079561bb498600ded37491c022855dc920c23db384a30d97359214617ea0d0917a266ff2c03efc75dfd2a8be670329f1f494ceefc4c81c6537c6f4bf
+  metadata.gz: 6d7cd64be7233def5625a4f0f0eb7990819a4be542baf3cf29ca4b75da64979a44ecf15f715265f8ff6bcb91465b97aa555319b899e4601090bbea8b78c9197c
+  data.tar.gz: 45a5739270bf6d2e08c7a10f96030fdfeef189434b41f50de29b3c0b9bd0a95a1d0805925ef6238a13f2794498cac2b746a39dc12f78f6c081b58d3d64513808

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grid_runner (0.0.3)
+    grid_runner (0.0.7)
       gli (= 2.13.4)
 
 GEM

data/Procfile

@@ -6,4 +6,6 @@ ftp-watcher: sbt -Dftp.active=true "project ftp-watcher" "~ run 9004"
 kahuna: sbt "project kahuna" "~ run 9005"
 cropper: sbt "project cropper" "~ run 9006"
 metadata-editor: sbt "project metadata-editor" "~ run 9007"
+imgops: cd imgops; ./dev-start.sh
+usage: sbt "project usage" "~ run 9009"
 collections: sbt "project collections" "~ run 9010"

data/bin/grid_runner

@@ -13,7 +13,7 @@ arguments :strict
 
 def apps_from_args(args)
   return App.all if args.first == "all"
-  return App.find(args) if args.first
+  return App.find(args)
 end
 
 desc 'runs a given app listed in the Procfile (or all)'
@@ -54,14 +54,28 @@ end
 
 desc 'prints the status of apps listed in Procfile'
 arg_name "app names separated by a SPACE or 'all'" 
-command :list do |c|
+command [:list, :status] do |c|
   c.action do |global_options,options,args|
-    App.all.each_with_index do |app, ix|
+    apps = apps_from_args(args) || App.all
+    apps.each_with_index do |app, ix|
       app.display(ix)
     end
   end
 end
 
+
+desc 'watches logs for given apps and prints changes'
+arg_name "app names separated by a SPACE or 'all'" 
+command :log do |c|
+  c.action do |global_options,options,args|
+    apps = apps_from_args(args) || App.all
+    puts
+    puts Rainbow("Logging:").blue.underline #{apps.map(&:name).join(", ")}"
+    puts Rainbow("#{apps.map(&:name).join(', ')}").green
+    app_logs = apps.flat_map(&:log).flat_map(&:path).join(" ")
+    IO.popen("tail -f #{app_logs}") { |io| while (line = io.gets) do puts line end }  end
+end
+
 desc 'kills selected app'
 arg_name 'provide an app name'
 command :kill do |c|

data/lib/grid_runner/applications.rb

@@ -19,6 +19,7 @@ class App
   end
 
   def self.find(args)
+    return unless args.first
     App.all.select { |app| args.include?( app.name ) }
   end
 
@@ -27,12 +28,13 @@ class App
     cmd = line.split(":")[1]
     ps_out = ps_out(name)
     status = ps_out[:status]
-    pid = ps_out[:pid]
+    pid = ps_out[:pid].strip if ps_out[:pid]
 
     App.new(name, cmd, status, pid)
   end
 
   def display(color_index = rand(0..COLORS.length))
+    puts
     puts Rainbow("#{name} ").send(COLORS[color_index % COLORS.length]).underline 
     puts "status: #{status}"
     puts "pid: #{pid}" if status == :running
@@ -42,6 +44,8 @@ class App
 
   def kill!
     if status == :running
+      # imgops wasnt working with HUP but did with 3 ('sigquit')
+      Process.kill(3, pid.to_i)
       Process.kill("HUP", pid.to_i)
       puts Rainbow("killing #{name}").red
     end
@@ -69,9 +73,9 @@ class App
 
   private
 
-  def self.app_process_from_grep(stdout)
+  def self.app_process_from_grep(stdout, name = nil)
     stdout.split(/\n/).find do |l| 
-      (l.match("sbt") || l.match("elasticsearch")) && 
+      l.match(name) && 
       !l.match("grep") && 
       !l.match("grid_runner")
     end
@@ -81,7 +85,7 @@ class App
     stdout, stderr, cmd_status = Open3.capture3("ps aux | grep #{name}")
     if cmd_status.success?
       # find processes that are either sbt or ES, and filter out the grep command itself
-      if p = app_process_from_grep(stdout)
+      if p = app_process_from_grep(stdout, name)
         proc_status = :running
         pid = p.match(/\d{1,8}\s/)[0]
       else

data/lib/grid_runner/version.rb

@@ -1,3 +1,3 @@
 module GridRunner
-  VERSION = '0.0.5'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - NickyPStraightStylinOnEm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,6 +81,8 @@ files:
 - bin/grid_runner
 - grid_runner-0.0.1.gem
 - grid_runner-0.0.3.gem
+- grid_runner-0.0.5.gem
+- grid_runner-0.0.6.gem
 - grid_runner.gemspec
 - grid_runner.rdoc
 - lib/grid_runner.rb