zillabyte-cli 0.1.7 → 0.1.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjFiZWM2YzdkZGQwZTI0OWQzOWVlMjViNTM5YmY0NmVlMDM4MjFjMg==
+    ZDQ2N2E3MWI0OWM1MWYxNDkyNTZkMWIxNGVjZTkxZDIxOWYwNTBhMg==
   data.tar.gz: !binary |-
-    OGQ1NjRiYTQ2M2E0MWMyMzFhOTU3Yzg0MTMxZjJhODdiN2YyNzJkNA==
+    N2U0ZDZjYmVlYWU5Mzg3MGI2NWYxYmU4MDhiMGJkY2MyZGQwMzQ0OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWRlMDM0NDc2NDhjODc2MDhiMDllZGQwOTc0YmE5YWRiYjYxMzg3YzZiNmEz
-    ZjMyYWFmNTM0NTE4NmU4ZmM2ODIwMWNlMWYyNjQ4YWE0OTkxMzMxYTczZTMw
-    MzJkMzE3MDc5MDAzMjc4YTU5MDcyYmJkNjY4NzExNjQ0NjIzOGY=
+    ZGU4ZmI4MDljNmJmZjNjZDhjOTE4ZWI1ZTI5YzA1MzQxYTg1MjYzYjc0ZTUw
+    YWJiNjE5NTY3NjMxYjQ2ZWZlNTQ1Mzk4OGVjZmEyZDM5NzJjZDIzOTAwM2U0
+    MTg3MTJiYmQyNTY3NWZmOWViNGVjMzM4Njk1ZTU1MTAzNGE2ODE=
   data.tar.gz: !binary |-
-    OTY1NjVlYzYxZTQxMmY1MjQ5MjQxNTcyM2ZlNmI3MDFiYTM2YWNmYTA2NjYy
-    ZmYxYTNmOWYwMDZlNTgwMjI1NzBiM2FhNWVlNzk5ZmEyYTk4NTNiZTFjN2Vj
-    N2Q2ZjhlNjUyYzkxNmUxMDQ0ZjNkYWQzNTVhOGY4NTEwODA3Nzk=
+    MTA1OTE2ZWM2ODNlZTY0NTQyNjNiYmM2ZDkzMzdlZGYyZWIzYTBkZGQyZGZh
+    ZGQ1MjM3MGUyMDFmNTVjNDYxMjkyNmY1YmNlZjBhZDQwNDU3ODQ3NWM1NzY3
+    MGZmMTc4OTgyOTY5NzBiMTkwYWRlMGI0YjZlYzMzYjU3NDQ5YzE=

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.1.7"
+    VERSION = "0.1.18"
   end
 end

data/lib/zillabyte/api/flows.rb

@@ -158,7 +158,7 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
     
     require("securerandom")
     info_file = "#{dir}/#{SecureRandom.uuid}"
-    arg = "--info --file #{info_file}"
+    arg = "--info --file \"#{info_file}\""
 
 
     case hash["language"]

data/lib/zillabyte/cli/apps.rb

@@ -57,9 +57,6 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
     
     if app_id.nil?
       app_id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(app_id =~ /^\d*$/)
-      options[:is_name] = true
     end
         
     res = api.request(
@@ -349,9 +346,6 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
 
     if app_id.nil?
       app_id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(app_id =~ /^\d*$/)
-      options[:is_name] = true
     end
 
     if trigger_next
@@ -381,7 +375,6 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
     if response["job_id"]
       options[:job_id] = response["job_id"]
       app_id = response["app_id"]
-      options.delete :is_name
 
       start = Time.now.utc
       display "Next cycle request sent. If your app was RETIRED this may take a few minutes. Please wait or check 'zillabyte logs' for progress." if type.nil?

data/lib/zillabyte/cli/components.rb

@@ -325,9 +325,6 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
 
     if component_id.nil?
       component_id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(component_id =~ /^\d*$/)
-      options[:is_name] = true
     end
 
     type = options[:output_type]
@@ -422,9 +419,6 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
 
     if component_id.nil?
       component_id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(component_id =~ /^\d*$/)
-      options[:is_name] = true
     end
 
     type = options[:output_type]

data/lib/zillabyte/cli/data.rb

@@ -274,6 +274,8 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     error("no id given", type) if id.nil?
 
     s3_path = options[:s3_path] || shift_argument
+    error("no s3 path given", type) if s3_path.nil?
+
     matches = s3_path.match(/^s3:\/\/([A-Z0-9]{20}):([$-\/:-?{-~!"^_`\[\]\w]{40})@([\w\.]*)\/([-\w\/]*)$/)
     if !matches.nil?
       s3_access, s3_secret, s3_bucket, s3_key = matches.captures

data/lib/zillabyte/cli/flows.rb

@@ -21,9 +21,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
     if id.nil?
       id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(id =~ /^\d*$/)
-      options[:is_name] = true
     end
 
     res = api.request(
@@ -59,10 +56,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     flow_id = options[:id] || shift_argument
     type = options[:output_type]
 
-    if !(flow_id =~ /^\d*$/)
-      options[:is_name] = true
-    end
-
     dir = options[:directory] || shift_argument
     error("no directory given", type) if dir.nil?
     dir = File.expand_path(dir)
@@ -165,9 +158,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     flow_id = options[:id] || shift_argument
     if flow_id.nil?
       flow_id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(flow_id =~ /^\d*$/)
-      options[:is_name] = true
     end
 
     operation_id = options[:operation] || shift_argument || '_ALL_'
@@ -202,9 +192,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     # No name?
     if flow_id.nil?
       flow_id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(flow_id =~ /^\d*$/)
-      options[:is_name] = true
     end
 
     type = options[:output_type]
@@ -230,7 +217,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       [row['name'], d, row['message']]
     end
     rows.sort! do |a,b|
-      a[1] <=> b[1]
+      a[0] <=> b[0]
     end
     color_map = {}
     require("zillabyte/cli/log_formatter")
@@ -341,9 +328,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
     if id.nil?
       id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(id =~ /^\d*$/)
-      options[:is_name] = true
     end
     forced = options[:force]
     type = options[:output_type]
@@ -372,7 +356,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       if response["job_id"]
         options[:job_id] = response["job_id"]
         flow_id = response["flow_id"]
-        options.delete :is_name
 
         start = Time.now.utc
         display "Destroy request sent. Please wait..." if type.nil?
@@ -524,9 +507,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
     if id.nil?
       id = read_name_from_conf(options)
-      options[:is_name] = true
-    elsif !(id =~ /^\d*$/)
-      options[:is_name] = true
     end
 
     display "Killing flow ##{id}...please wait..." if type.nil?
@@ -535,7 +515,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     if response["job_id"]
       options[:job_id] = response["job_id"]
       flow_id = response["flow_id"]
-      options.delete :is_name
 
       start = Time.now.utc
       display "Kill request sent. Please wait..." if type.nil?
@@ -627,13 +606,14 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       @color_map[operation_name] ||= @all_colors[ @color_map.size % @all_colors.size ]
       @color_map[operation_name]
     end
+    ip = hash["server"] || ENV["ZILLABYTE_API_HOST"] #Quick fix for logs on zilla machines
 
     @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"
     else
-      cmd = "curl -G http://#{hash["flow"]}:#{hash["token"]}@#{hash["server"]}:#{hash["port"]}/getLogs?flow=#{hash["flow"]}"
+      cmd = "curl -G http://#{hash["flow"]}:#{hash["token"]}@#{ip}:#{hash["port"]}/getLogs?flow=#{hash["flow"]}"
     end
 
     begin  

data/lib/zillabyte/cli/query.rb

@@ -1,4 +1,5 @@
 require "zillabyte/cli/base"
+require("zillabyte/cli/helpers/table_output_builder")
 
 # executes queries
 #

metadata

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