mescal-cli 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a16c71e8eb82bf60dc70d432fd07e0cedfb3ab4
-  data.tar.gz: e4a445b4b3590395a4f569ce8e060a4f3a566448
+  metadata.gz: 07931eb74112fd608cd4672c38a63f96b7250783
+  data.tar.gz: 84bef31d4fc88d3f288490d44d318c3787800140
 SHA512:
-  metadata.gz: c5d369481d3440d4b1578c2b4d9e77ae22cd435c3e686677b13d2a874225371efca55eb41fa7b96bf8935630497ced402587ee54ced6cbe20446fbdd5684b26f
-  data.tar.gz: 8f4f64231d9a43868b834ea20ca66cf2f2aec9955892489e50064d0031f690740f0a4cc8bb5a1e9c56ce924fb1d2f0e6e7d43dd61ff91c6b2673af2896a694a5
+  metadata.gz: 97ee7777a69991f85c6e73c7405728b5650d8e88ffc91fb84e8306a4dc03664f24d21fda2b381130c1f03208a106dbb856142dc2bae6eb595c8025a529922655
+  data.tar.gz: ec6f2e4c03aa65c52d8c92642437401361e582d95f402d8d7268d44bdba5cb89991935db93614a3416a66d3b90dd945afd3ef82491e0170e1c219b2fbcf0587d

data/.gitignore

@@ -1,2 +1,3 @@
 .mescal.json
 *.swp
+*.gem

data/lib/mescal-cli/cli.rb

@@ -9,8 +9,9 @@ module MescalCli
       @config = config
       @client = Client.new(config['mescal'])
       @image = config['image']
-      @cmd = ARGV[1] || config['cmd']
       @sshCmd = config['sshCmd']
+      @cpus = config['cpus']
+      @mem = config['mem']
     end
 
     def usage
@@ -22,6 +23,7 @@ module MescalCli
       when "run" then run
       when "ssh" then ssh
       when "list" then list
+      when "kill" then kill
       end
     end
 
@@ -30,8 +32,9 @@ module MescalCli
     end
 
     def run
+      @cmd = ARGV[1] || @config['cmd']
       puts "Sending task to Mescal..."
-      task = Task.create(@client, @image, @cmd)
+      task = Task.create(@client, @image, @cmd, @cpus, @mem)
       run = true
       threads = []
       pailer_started = false
@@ -56,15 +59,18 @@ module MescalCli
     end
 
     def ssh
-      task = Task.create(@client, @image, @sshCmd)
+      @cmd = ARGV[1] || @config['cmd']
+      task = Task.create(@client, @image, @sshCmd, @cpus, @mem)
       run = true
       while(run) do
         sleep(2)
         state = task.state
         task.update!
         if state != task.state
-          if task.state != "TASK_PENDING"
+          if task.state == "TASK_RUNNING"
             Ssh.new(task).run!
+          elsif task.state != "TASK_PENDING"
+            puts "Task exited with state #{task.state} before ssh could connect"
           end
         end
 
@@ -72,5 +78,14 @@ module MescalCli
       end
     end
 
+    def kill
+      @id = ARGV[1]
+      if(killed = Task.kill(@client, @id))
+        puts "Killed #{killed}"
+      else
+        puts "Failed to kill #{@id}"
+      end
+    end
+
   end
 end

data/lib/mescal-cli/client.rb

@@ -28,8 +28,8 @@ module MescalCli
       @base_url = base_url + "tasks"
     end
 
-    def create(image, cmd)
-      RestClient.post @base_url, image: image, cmd: cmd, port: 22
+    def create(image, cmd, cpus, mem)
+      RestClient.post @base_url, image: image, cmd: cmd, cpus: cpus, mem: mem, port: 22
     end
 
     def get(id)
@@ -39,5 +39,9 @@ module MescalCli
     def list
       RestClient.get "#{@base_url}"
     end
+
+    def kill(id)
+      RestClient.delete "#{@base_url}/#{id}"
+    end
   end
 end

data/lib/mescal-cli/ssh.rb

@@ -7,7 +7,8 @@ module MescalCli
     def run!
       ip = @task.slave_ip
       port = @task.ssh_port
-      exec "ssh -o LogLevel=quiet -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@#{ip} -p #{port}"
+      killer = "#{$0} kill #{@task.id}"
+      "ssh -o LogLevel=quiet -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@#{ip} -p #{port}; #{killer}"
     end
   end
 end

data/lib/mescal-cli/task.rb

@@ -3,8 +3,8 @@ module MescalCli
     attr_reader :id, :image, :cmd, :slave_id
     attr_accessor :state
 
-    def self.create(client, image, cmd)
-      resp = client.task.create(image, cmd)
+    def self.create(client, image, cmd, cpus, mem)
+      resp = client.task.create(image, cmd, cpus, mem)
       obj = MultiJson.load(resp)
       Task.new(client, obj['id'], image, cmd)
     end
@@ -19,6 +19,15 @@ module MescalCli
       end
     end
 
+    def self.kill(client, id)
+      resp = client.task.kill(id) rescue nil
+      if(resp && obj = MultiJson.load(resp))
+        obj['id']
+      else
+        nil
+      end
+    end
+
     def initialize(client, id, image, cmd)
       @client, @id, @image, @cmd = client, id, image, cmd
     end

data/lib/mescal-cli/version.rb

@@ -1,3 +1,3 @@
 module MescalCli
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

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