mescal-cli 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2375c155495f707a52ae7424d6974130f44cb652
-  data.tar.gz: 3aeadbb68e08855648caa0fcd29b780b08b7e6a0
+  metadata.gz: aa001795f7ca4a25b4608f8a6849687c43bfdc10
+  data.tar.gz: f780fe6e43cc5a763e9f78c38a3ddbb5e1d77b3d
 SHA512:
-  metadata.gz: c6c7cd768d2f34e8eeb641dc69782f1e94ba8b55ddbebb6d032aed2a359388a98b34c36138ad35acd2944d8d6e19eb99ba614e8253ba40eaa3f6c2dfc41fd63e
-  data.tar.gz: e1f3a718cb29dd02515776822185c9314b32683b4ede5aa99169dcc078031c4a2cd8efe3f937d731ce42956961b47ff48754f13f9636d714ab805a2a193eb526
+  metadata.gz: b9b9114960192527fb812e93bea65b86d15b298b940a99dddaf9af24c937e7e850c854b9330cd7369e308783455d074efe97b2acb016fa400fa9c25f2b46a461
+  data.tar.gz: 7ca21fe3a2155a7065dc61e3ab418200a09fc90808947fcdcfc35200e3333f3ad0ea14554cdd70d04440ab4821221c524f82957e7f764b4653389e16c41b05b3

data/lib/mescal-cli/cli.rb

@@ -23,7 +23,7 @@ module MescalCli
       when "run" then run
       when "ssh" then ssh
       when "list" then list
-      when "kill" then kill
+      when "kill" then kill(ARGV[1])
       end
     end
 
@@ -55,7 +55,10 @@ module MescalCli
         run = !task.done?
       end
       sleep(10)
-      threads.each { |t| t.kill }
+    rescue Interrupt
+      kill(task.id) if !!task
+    ensure
+      threads.each { |t| t.kill } if !!threads
     end
 
     def ssh
@@ -78,12 +81,11 @@ module MescalCli
       end
     end
 
-    def kill
-      @id = ARGV[1]
-      if(killed = Task.kill(@client, @id))
+    def kill(id)
+      if(killed = Task.kill(@client, id))
         puts "Killed #{killed}"
       else
-        puts "Failed to kill #{@id}"
+        puts "Failed to kill #{id}"
       end
     end
 

data/lib/mescal-cli/version.rb

@@ -1,3 +1,3 @@
 module MescalCli
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mescal-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Chris Kite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler