zillabyte-cli 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa7c1271f40be305d46a9c440926de250e2bcbb5
-  data.tar.gz: a840c1321b322b4824d11fb03c46112cadfab23f
+  metadata.gz: 92e75d91289dcf56900c9e9d145910a44cd7d8f5
+  data.tar.gz: f055414a6fac2898da96d332667e921106ff88eb
 SHA512:
-  metadata.gz: 382f3fc91b512bec0f75d621f1c9d21a1a0528a955c70e9289fe0d27b149a22b6f6fcecdf1137afada30e963e19915a73a3214908c881e4441ce3cc4d6dab200
-  data.tar.gz: cf13694d82ae79a5770a59d0e63c50f589f7e12981e58c4446828a6f6a12572bb076b47f1b36fcffb3ff0ccb66a506362f7e3720fcb7b6ba2833eaa85102d61e
+  metadata.gz: 5d64345b60eee16d53efa88cc61090ba97cc39a31be2c1ccc0cd3f539d442f254fd434a4a45a78aa36c4d8b195c7c837a212f9032fbab42c4412836c10cd3d98
+  data.tar.gz: 80011b41c32f75922d7932eb7092f034e92d0a121ee3a6cd1495ec9bf323df69fa13e44f2da3a6061b7d7acb2ee81be8f640e361e7f63e6956dba78dd52f6b29

data/bin/zb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require("zillabyte-cli")
 Zillabyte::CLI.start(*ARGV)

data/bin/zillabyte

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require("zillabyte-cli")
 Zillabyte::CLI.start(*ARGV)

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.1.22"
+    VERSION = "0.1.23"
   end
 end

data/lib/zillabyte/auth.rb

@@ -202,36 +202,36 @@ class Zillabyte::Auth
             write_credentials(email, auth_token)
             
             # Maybe add ssh keys while we're at it... 
-            possible_keys = [
-              "~/.ssh/id_rsa.pub", 
-              "~/.ssh/id_dsa.pub"
-            ]
+            # possible_keys = [
+            #   "~/.ssh/id_rsa.pub", 
+            #   "~/.ssh/id_dsa.pub"
+            # ]
             
-            key_added = false
-            possible_keys.each do |keypath|
-              if File.exists?(File.expand_path(keypath))
+            # key_added = false
+            # possible_keys.each do |keypath|
+            #   if File.exists?(File.expand_path(keypath))
               
-                display "Register SSH key #{keypath}? (y/N)", false
-                break if (ask() || "").strip.downcase[0] != "y"
+            #     display "Register SSH key #{keypath}? (y/N)", false
+            #     break if (ask() || "").strip.downcase[0] != "y"
                   
-                api = Zillabyte::API.new(:api_key => auth_token, :session => self)
-                begin
-                  key = File.binread(File.expand_path(keypath))
-                rescue => e
-                  error(e.message, type)
-                  break
-                end
-                message = api.keys.add("default", key)
-                display("SSH keys added.  Use 'zillabyte keys' to manage.")
-                key_added = true
-                break
+            #     api = Zillabyte::API.new(:api_key => auth_token, :session => self)
+            #     begin
+            #       key = File.binread(File.expand_path(keypath))
+            #     rescue => e
+            #       error(e.message, type)
+            #       break
+            #     end
+            #     message = api.keys.add("default", key)
+            #     display("SSH keys added.  Use 'zillabyte keys' to manage.")
+            #     key_added = true
+            #     break
 
-              end
-            end
+            #   end
+            # end
             
-            unless key_added
-              display "Please run zillabyte keys:add to add your ssh keys."
-            end
+            # unless key_added
+            #   display "Please run zillabyte keys:add to add your ssh keys."
+            # end
             
             display "Authentication complete."
             

data/lib/zillabyte/cli/apps.rb

@@ -65,7 +65,9 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
       :path => "/apps/#{app_id}/details",
       :body => options.to_json
     )
-    res.body
+    res = res.body.select do |instance|
+      !instance.nil?
+    end
     
     # a nested hash so can't map directly
     # instead i'll map separately and then merge the arrays
@@ -78,8 +80,8 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
     headings = heading1 + heading2 
     
     # get the values for the headings
-    type_name = res.body.map do |instance|
-  
+    type_name = res.map do |instance|
+
       heading1.map do |heading|
         instance[heading]
       end  
@@ -87,8 +89,8 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
     end
     
     # get the values for the headings
-    stats = res.body.map do |instance|
-  
+    stats = res.map do |instance|
+
       heading2.map do |heading|
         instance["stats"][heading]
       end  
@@ -354,6 +356,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
     elsif trigger_forever
       response = api.apps.run_forever(app_id, options)
     else
+      require 'date'
       # List the apps
       response = api.apps.list_cycles(app_id, options)
       # TODO List the sequence number for this app.

data/lib/zillabyte/cli/flows.rb

@@ -220,8 +220,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       a[0] <=> b[0]
     end
     color_map = {}
-    require("zillabyte/cli/log_formatter")
-    colors = LogFormatter::COLORS.clone
+    colors = [:green, :yellow, :magenta, :cyan, :light_black, :light_green, :light_yellow, :light_blue, :light_magenta, :light_cyan]
     rows.each do |row|
       name = row[0]
       time = row[1]
@@ -612,7 +611,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     @color_map = {}
     @all_colors = [:green, :yellow, :magenta, :cyan, :light_black, :light_green, :light_yellow, :light_blue, :light_magenta, :light_cyan]
     if(hash["server"] == "localhost")
-      cmd = "tail -n 500 -f /tmp/flows/f#{hash["flow"]}/flow_logs/flow_#{hash["flow"]}.log"
+      cmd = "tail -n 500 -F /tmp/flows/f#{hash["flow"]}/flow_logs/flow_#{hash["flow"]}.log"
     else
       cmd = "curl -G http://#{hash["flow"]}:#{hash["token"]}@#{ip}:#{hash["port"]}/getLogs?flow=#{hash["flow"]}"
     end

data/lib/zillabyte/cli/rpc.rb

@@ -7,13 +7,6 @@ require "zillabyte/common"
 #
 class Zillabyte::Command::RPC < Zillabyte::Command::Flows
 
-  # rpc
-  #
-  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
-  #
-  def index
-    self.rpc
-  end
 
   # rpc:start ID [INPUT_1] [INPUT_2] ...
   #
@@ -98,6 +91,9 @@ class Zillabyte::Command::RPC < Zillabyte::Command::Flows
       end
     end
   end
+  alias_command "rpc", "rpc:start"
+  alias_command "execute", "rpc:start"
+  alias_command "executes", "rpc:start"
 
 
   # rpc:results ID RUN_ID
@@ -125,6 +121,8 @@ class Zillabyte::Command::RPC < Zillabyte::Command::Flows
     wait_for_results(component_id, run_ids, type)
   end
 
+
+
   # rpc:status ID RUN_ID
   # 
   # Returns the current status of the RPC query corresponding to
@@ -158,6 +156,8 @@ class Zillabyte::Command::RPC < Zillabyte::Command::Flows
       end
     end
   end
+  
+  
 
   # rpc:kill ID
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake