mescal-cli 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c927414534a3054860a68db73d51a49d1bd5c1
-  data.tar.gz: 4d0fad222ff7e1c33f1df050b8dae59100aa46b7
+  metadata.gz: 9a16c71e8eb82bf60dc70d432fd07e0cedfb3ab4
+  data.tar.gz: e4a445b4b3590395a4f569ce8e060a4f3a566448
 SHA512:
-  metadata.gz: bd4c386193f64bc74f686902acd1e13a772d2ceffedb94773dc910cbc1d7bac7c17bd5e07599f4b408016aada6c750ff194dd6171f03eeec95bc50db9530382c
-  data.tar.gz: ad6dea3f00c6066606d3da6ad8f335abaca89ce733f4eb84087314d1cafd5714d3af91100e08669501ebaeb3932408f3cc69a872153533c54bbc2ddc24c5a410
+  metadata.gz: c5d369481d3440d4b1578c2b4d9e77ae22cd435c3e686677b13d2a874225371efca55eb41fa7b96bf8935630497ced402587ee54ced6cbe20446fbdd5684b26f
+  data.tar.gz: 8f4f64231d9a43868b834ea20ca66cf2f2aec9955892489e50064d0031f690740f0a4cc8bb5a1e9c56ce924fb1d2f0e6e7d43dd61ff91c6b2673af2896a694a5

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    mescal-cli (0.0.1)
+    mescal-cli (0.0.2)
       multi_json (~> 1.11, >= 1.11.0)
       rest-client (~> 1.8, >= 1.8.0)
+      table_print (~> 1.5.3, >= 1.5.3)
       yajl-ruby (~> 1.2, >= 1.2.1)
 
 GEM
@@ -13,7 +14,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    mime-types (2.4.3)
+    mime-types (2.5)
     multi_json (1.11.0)
     netrc (0.10.3)
     rake (10.4.2)
@@ -21,6 +22,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    table_print (1.5.3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)

data/lib/mescal-cli/cli.rb

@@ -10,7 +10,6 @@ module MescalCli
       @client = Client.new(config['mescal'])
       @image = config['image']
       @cmd = ARGV[1] || config['cmd']
-      @user = Etc.getlogin
       @sshCmd = config['sshCmd']
     end
 
@@ -22,12 +21,17 @@ module MescalCli
       case @mode
       when "run" then run
       when "ssh" then ssh
+      when "list" then list
       end
     end
 
+    def list
+      tp Task.list(@client), {id: {width: 48}}, :image, :cmd, :state
+    end
+
     def run
       puts "Sending task to Mescal..."
-      task = Task.create(@client, @image, @cmd, @user)
+      task = Task.create(@client, @image, @cmd)
       run = true
       threads = []
       pailer_started = false
@@ -52,7 +56,7 @@ module MescalCli
     end
 
     def ssh
-      task = Task.create(@client, @image, @sshCmd, @user)
+      task = Task.create(@client, @image, @sshCmd)
       run = true
       while(run) do
         sleep(2)

data/lib/mescal-cli/client.rb

@@ -28,12 +28,16 @@ module MescalCli
       @base_url = base_url + "tasks"
     end
 
-    def create(image, cmd, user)
+    def create(image, cmd)
       RestClient.post @base_url, image: image, cmd: cmd, port: 22
     end
 
     def get(id)
       RestClient.get "#{@base_url}/#{id}"
     end
+
+    def list
+      RestClient.get "#{@base_url}"
+    end
   end
 end

data/lib/mescal-cli/task.rb

@@ -1,15 +1,26 @@
 module MescalCli
   class Task
-    attr_reader :id, :state, :slave_id
+    attr_reader :id, :image, :cmd, :slave_id
+    attr_accessor :state
 
-    def self.create(client, image, cmd, user)
-      resp = client.task.create(image, cmd, user)
+    def self.create(client, image, cmd)
+      resp = client.task.create(image, cmd)
       obj = MultiJson.load(resp)
-      Task.new(client, obj['id'], image, cmd, user)
+      Task.new(client, obj['id'], image, cmd)
     end
 
-    def initialize(client, id, image, cmd, user)
-      @client, @id, @image, @cmd, @user = client, id, image, cmd, user
+    def self.list(client)
+      resp = client.task.list
+      obj = MultiJson.load(resp)
+      obj.map do |jsTask|
+        t = Task.new(nil, jsTask['id'], jsTask['image'], jsTask['cmd'])
+        t.state = jsTask['state']
+        t
+      end
+    end
+
+    def initialize(client, id, image, cmd)
+      @client, @id, @image, @cmd = client, id, image, cmd
     end
 
     def update!
@@ -33,5 +44,9 @@ module MescalCli
     def ssh_port
       @ports.find { |p| p[0] == 22 }[1]
     end
+
+    def to_s
+      "#{@id} #{@image} #{@cmd}"
+    end
   end
 end

data/lib/mescal-cli/version.rb

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

data/lib/mescal-cli.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rest-client'
 require 'yajl'
 require 'multi_json'
+require 'table_print'
 require 'mescal-cli/config'
 require 'mescal-cli/task'
 require 'mescal-cli/pailer'

data/mescal-cli.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_runtime_dependency 'rest-client', '~> 1.8', '>= 1.8.0'
+  spec.add_runtime_dependency 'table_print', '~> 1.5.3', '>= 1.5.3'
   spec.add_runtime_dependency 'yajl-ruby', '~> 1.2', '>= 1.2.1'
   spec.add_runtime_dependency 'multi_json', '~> 1.11', '>= 1.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mescal-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Kite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: table_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement