zillabyte-cli 0.1.19 → 0.1.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGE2NDJmZDQxOTAzNGE1YTYwYWE2MzZkNjFmODc5YmRhMDFlMTliZQ==
+    ZWRmMzQwZmQ1ZWZkN2I5YmYyMDlmYTg0YmI5MDNjZmU1N2YxMjBiZA==
   data.tar.gz: !binary |-
-    ZDc5YzRhNzYwMjRmNDE4OTc3NzI3ZWQxNWJmNDA0OWY0ZWI0NjY4Yg==
+    NWViMWY3ZWU3NTIyZGFlYzBkNWNlOTcxNDlhYWYxZDMwYjk3NWM2Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGI5MWJkNTkzZDY2ZjYxNGRkNThkNTM3YWExNzRhYmFhZTY2OTRlZjlhY2Yy
-    NzZkYTFiMzdkZDFhMmI3NWE4NjYwMWY3MjBhYzVkM2YzNThhMDE4Y2I5NWU0
-    ODI0MTZkN2E5MWRhMDQ1MWZmYTRiNzRkNTk3Yzc3MmZlOGNhZTI=
+    NTEzNWQ3NzVkMDE5ZjM5MmU0YmQ2YjU4ZmRhY2JiMDM0ZDc2OTBkYThlNzU3
+    MTkyYjNlNDkwYmZlNDRiOGE4N2IyNWJkNzZkYzYyYmVlNTRlZjgwYTJjODNm
+    ZDg1NWNjMWJhOTg1MjFhMzA0ODZkZTIzNzk5N2RhNzBiMzczYzY=
   data.tar.gz: !binary |-
-    MTFiNzgxNTgwOWMyNzAzNWI1Zjg5YTQ1NWNiYTVlZDVmNDYzZDY3NTFmYTgx
-    ZjMyMDRiZTc4N2NlNTk1MDFjZGEzNmFkZWRmNjJlZjE3NTNhMDRhYTZmNGRm
-    ZjZjZmM1OTg3YzU1ZGU2MDZiZjg4YjE0NmU4Yjc2MDdiM2Q0ZTY=
+    YzJjOTg5MjZkMDRjMmFhODcxNjYzYzYwYjM3YmI4Njc3YTIzMjQwYjY2MTM1
+    NzY3YjkyZTgxYzA0ZWM5M2I1MzlmYjIwNjY1OTNhODJhYWI1MjkwYzgzNTY1
+    YzczNGU0OTljMzc0ZTU5YzE3MmNmZTliMjhlM2RiZWExNmZhMTc=

data/lib/zillabyte/cli/apps.rb

@@ -354,7 +354,6 @@ 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/components.rb

@@ -75,7 +75,7 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
   def list
     type = options[:output_type]
     
-    headings = ["id", "name", "state", "inputs", "outputs", "scope"]
+    headings = ["id", "name", "state", "inputs", "outputs"]
     rows = api.component.list.map do |row|
       if headings.size == 0
         headings = row.keys 
@@ -133,16 +133,6 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
     super
   end
 
-  # components:kill ID
-  #
-  # Kills the given component rpc.
-  # 
-  # --config CONFIG_FILE                        # Use the given config file
-  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
-  #
-  def kill
-    super
-  end
 
   # components:info [DIR]
   # 
@@ -295,165 +285,4 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
 
   end
 
-  
-  # components:rpc [ID] [INPUT_1] [INPUT_2] ...
-  #
-  # Submits a single query to the rpc. The input parameters MUST be
-  # listed in the same order as that given in the component inputs.
-  # TO SUBMIT MULTIPLE queries, use the --input_file switch to specify
-  # a csv file containing the queries without listing any inputs on
-  # the command line. Each line of the file should correspond to a
-  # unique query.
-  # 
-  # --async                                     # Run the command asynchronously
-  # --input_file  INTPUT_FILE                   # Input csv file containing parameters for multiple queries
-  # --output_file OUTPUT_FILE                   # Output csv file containing query parameters and run ids
-  #
-  # Examples: 
-  #
-  # Single query:
-  # $ zillabyte components:rpc 'web_screenshot' 'google.com'
-  #
-  # Multiple queries:
-  # $ zillabyte components:rpc 'web_screenshot' --file 'url_list.csv'
-  #
-  def rpc
-    require("csv")
-
-    component_id = options[:id] || shift_argument
-    async = options[:async] || false
-
-    if component_id.nil?
-      component_id = read_name_from_conf(options)
-    end
-
-    type = options[:output_type]
-    file = options[:input_file]
-    out_file = options[:output_file]
-
-    component_args = []
-    if file
-      CSV.foreach(file) {|line| component_args << line}
-    else
-      args = []
-      while(true) do
-        next_arg = shift_argument
-        break if next_arg.nil?
-        args << next_arg
-      end
-      component_args << args if !args.empty?
-    end
-
-    opts = {:rpc_inputs => component_args} if component_args.size != 0
-    res = api.components.rpc(component_id, opts)
-    
-    input_par_for_id = {}
-    if res['error']
-      error("error: #{res['error_message']}", type)
-    else
-      if type.nil?
-        display "Request submitted to component ##{res['id']}."
-      end
-
-      if res["execute_ids"]
-        input_par_for_id = res["execute_ids"].invert
-        if out_file
-          CSV.open(out_file, "w") {|csv| res["execute_ids"].to_a.each {|elem| csv << elem}}
-        end
-      end
-    end
-
-    if async
-      # Async -- return right away.. 
-      display "The run ids are (query: run_id):"
-      res["execute_ids"].each do |pars, id|
-        display "\t #{pars}: #{id}"
-      end
-      display "Please use \"zillabyte components:results [run id]\" to check on the status of your query and to retrieve your results.\nYou may also wish to check \"zillabyte logs\" for errors."
-    else
-      # Sync -- poll until it's done...
-      if res["execute_ids"] 
-        run_ids = res["execute_ids"].values
-        while true
-          res = api.components.get_rpc_results(component_id, {:execute_ids => run_ids})
-          if res['error']
-            error("error: #{res['error_message']}", type)
-          else
-            if res["results"].detect{|id, res| ["running", "waiting"].member?(res["status"].downcase)}
-              # poll again
-              sleep(2)
-            else
-              if type.nil?
-                # All results are done (or rather, not 'running). Display them
-                res["results"].each do |id, hash|
-                  display "Query #{input_par_for_id[id]}:"
-                  if hash["data"].size == 0
-                    display "\t NO OUTPUT"
-                  else
-                    display "\t #{hash["data"].to_json()}"
-                  end
-                end
-              end
-              break
-            end
-          end
-        end
-      end
-    end
-  end
-  alias_command "rpc", "components:rpc"
-
-
-
-  # components:results [ID] [RUN_ID_1] [RUN_ID_2] ...
-  #
-  # Gets the result of rpc requests corresponding to RUN_ID if it is 
-  # done running, otherwise gets current run status. A list of RUN_IDs
-  # may also be specified in an input csv file like that generated by
-  # components:rpc with the --output_file flag.
-  # 
-  # --input_file  INTPUT_FILE                   # Input csv file containing query parameters and run ids (this can be generated automatically by components:rpc using the --output_file flag)
-  #
-  def results
-    component_id = options[:id] || shift_argument
-
-    if component_id.nil?
-      component_id = read_name_from_conf(options)
-    end
-
-    type = options[:output_type]
-    file = options[:input_file]
-
-    run_ids = []
-    if file
-      CSV.foreach(file) do |line|
-        run_ids << line[1]
-      end
-    else
-      while(true) do
-        next_arg = shift_argument
-        break if next_arg.nil?
-        run_ids << next_arg
-      end
-    end
-
-    res = api.components.get_rpc_results(component_id, {:execute_ids => run_ids})
-    if res['error']
-      error("error: #{res['error_message']}", type)
-    else
-      if type.nil?
-        res["results"].each do |id, hash|
-          display "#{id}: #{hash["status"]}"
-          if hash["status"] == "complete"
-            if hash["data"].size == 0
-              display "\t NO OUTPUT"
-            else
-              display "\t #{hash["data"]}"
-            end
-          end
-        end
-      end
-    end
-  end
-  
 end

data/lib/zillabyte/cli/data.rb

@@ -35,12 +35,20 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
       :path     => "/relations"
     )
 
-    headings = []
+    headings = ["id", "name","rows"]
     rows = response.body.map do |row|
       headings = row.keys if headings.size == 0
-      row["columns"] = row["columns"].map{|c| c['type']}.join(',')
+      row["columns"] = row["columns"].map{|c|c['type']}.join(',')
       row["aliases"] = row["aliases"].map{|a| a['name']}.join(',')
-      vals = row.values_at *headings
+
+      row = row.keep_if {|col,val| headings.include? col}
+      vals = row.map do |col,val| 
+        if col == "rows"
+          require("zillabyte/cli/helpers/table_output_builder")
+          val = TableOutputBuilder.format_row_count(val)
+        end
+        val
+      end
       vals 
     end
 

data/lib/zillabyte/cli/help.rb

@@ -4,7 +4,7 @@ require("zillabyte/cli/base")
 #
 class Zillabyte::Command::Help < Zillabyte::Command::Base
 
-  PRIMARY_NAMESPACES = %w( data query apps components logs )
+  PRIMARY_NAMESPACES = %w( data query apps components rpc logs )
   
   # help
   def index(*direct_args)

data/lib/zillabyte/cli/helpers/table_output_builder.rb

@@ -18,8 +18,29 @@ module Zillabyte; module Helpers; class TableOutputBuilder
       return out.to_json
     end
 
-    def self.build_terminal_table(headings, rows)
-        require("terminal-table")
-        Terminal::Table.new(:headings => headings, :rows => rows).to_s
+  def self.build_terminal_table(headings, rows)
+      require("terminal-table")
+
+      table = Terminal::Table.new(:headings => headings, :rows => rows).to_s
+  end
+
+  def self.format_row_count(val)
+
+    val = val.to_i
+    if val > 1000000000
+      val = (val/1000000000).to_s + "B"
+    elsif val > 1000000
+      val = (val/1000000).to_s + "M"
+    elsif val > 1000
+      val = (val/1000).to_s + "K"
     end
+    val
+  end 
+
+
+
+
+
+
+
 end; end; end

data/lib/zillabyte/cli/rpc.rb

@@ -0,0 +1,218 @@
+require 'yaml'
+require "zillabyte/cli/flows"
+require "zillabyte/cli/config"
+require "zillabyte/common"
+
+# remote procedure call a component
+#
+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] ...
+  #
+  # Starts the rpc and optionally submits the inputs from the command 
+  # line. The input parameters MUST be listed in the same order as 
+  # that given in the component inputs. TO SUBMIT MULTIPLE queries, 
+  # use the --input_file switch to specify a CSV file containing the 
+  # queries without listing any inputs on the command line. Each line 
+  # of the file should correspond to a unique query.
+  # 
+  # --async                                     # Run the command asynchronously
+  # --input_file  INTPUT_FILE                   # Input csv file containing parameters for multiple queries
+  # --output_file OUTPUT_FILE                   # Output csv file containing query parameters and run ids
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
+  #
+  # Examples: 
+  #
+  # Single query:
+  # $ zillabyte rpc 'web_screenshot' 'google.com'
+  #
+  # Multiple queries:
+  # $ zillabyte rpc 'web_screenshot' --input_file 'url_list.csv'
+  #
+  def start
+    require("csv")
+    
+    component_id = options[:id] || shift_argument
+    async = options[:async] || false
+
+    if component_id.nil?
+      component_id = read_name_from_conf(options)
+    end
+
+    type = options[:output_type]
+    file = options[:input_file]
+    out_file = options[:output_file]
+
+    component_args = []
+    if file
+      CSV.foreach(file) {|line| component_args << line}
+    else
+      args = []
+      while(true) do
+        next_arg = shift_argument
+        break if next_arg.nil?
+        args << next_arg
+      end
+      component_args << args if !args.empty?
+    end
+
+    opts = {:rpc_inputs => component_args} if component_args.size != 0
+    res = api.components.rpc(component_id, opts)
+    
+    input_par_for_id = {}
+    if res['error']
+      error("error: #{res['error_message']}", type)
+    else
+      if type.nil?
+        display "Request submitted to component ##{res['id']}."
+      end
+
+      if res["execute_ids"]
+        input_par_for_id = res["execute_ids"].invert
+        if out_file
+          CSV.open(out_file, "w") {|csv| res["execute_ids"].to_a.each {|elem| csv << elem}}
+        end
+      end
+    end
+
+    if async
+      # Async -- return right away.. 
+      display "The run ids are (query: run_id):"
+      res["execute_ids"].each do |pars, id|
+        display "\t #{pars}: #{id}"
+      end
+      display "Please use \"zillabyte rpc:status\" and \"zillabyte rpc:results\" to check on the status of your query and to retrieve your results.\nYou may also wish to check \"zillabyte logs\" for errors."
+    else
+      # Sync -- poll until it's done...
+      if res["execute_ids"] 
+        run_ids = res["execute_ids"].values
+        wait_for_results(component_id, run_ids, type, input_par_for_id)
+      end
+    end
+  end
+
+
+  # rpc:results ID RUN_ID
+  #
+  # Returns results from the RPC for the input corresponding to
+  # RUN_ID. If the result is not available yet, this method waits
+  # until it is. Alternatively, a list of RUN_IDs may be supplied
+  # in a CSV with 2 columns: ["query",run_id] using --input_file. 
+  # This file can be generated by "zillabyte rpc" if --output_file
+  # is specified.
+  #
+  # --input_file  INTPUT_FILE                   # Input csv file containing queries and run_ids
+  #
+  def results
+    component_id = options[:id] || shift_argument
+
+    if component_id.nil?
+      component_id = read_name_from_conf(options)
+    end
+
+    type = options[:output_type]
+    file = options[:input_file]
+
+    run_ids = get_run_ids_from_command_line_or_file(file)
+    wait_for_results(component_id, run_ids, type)
+  end
+
+  # rpc:status ID RUN_ID
+  # 
+  # Returns the current status of the RPC query corresponding to
+  # RUN_ID. Alternatively, a list of RUN_IDs may be supplied in a
+  # CSV with 2 columns: ["query",run_id] using --input_file. This
+  # file can be generated by "zillabyte rpc" if --output_file is
+  # specified.
+  #
+  # --input_file  INTPUT_FILE                   # Input csv file containing queries and run_ids
+  #
+  def status
+
+    component_id = options[:id] || shift_argument
+    if component_id.nil?
+      component_id = read_name_from_conf(options)
+    end
+
+    type = options[:output_type]
+    file = options[:input_file]
+
+    run_ids = get_run_ids_from_command_line_or_file(file)
+
+    res = api.components.get_rpc_results(component_id, {:execute_ids => run_ids})
+    if res['error']
+      error("error: #{res['error_message']}", type)
+    else
+      if type.nil?
+        res["results"].each do |id, hash|
+          display "#{id}: #{hash["status"]}"
+        end
+      end
+    end
+  end
+
+  # rpc:kill ID
+  #
+  # Kills the RPC.
+  # 
+  # --config CONFIG_FILE                        # Use the given config file
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
+  #
+  def kill
+    super
+  end
+
+
+  private
+
+
+  def wait_for_results(component_id, run_ids, type, input_par_for_id = nil)
+    while run_ids.length > 0
+      res = api.components.get_rpc_results(component_id, {:execute_ids => run_ids})
+      if res['error']
+        error("error: #{res['error_message']}", type)
+      else
+        res["results"].each do |id, res|
+          next if ["running", "waiting"].member?(res["status"].downcase)
+          if type.nil?
+            display "Query #{input_par_for_id ? input_par_for_id[id] : id}:"
+            if res["data"].size == 0
+              display "\t NO OUTPUT"
+            else
+              display "\t #{res["data"].to_json()}"
+            end
+          end
+          run_ids.delete id
+        end
+      end
+      # poll again
+      sleep(2)
+    end
+  end
+
+  def get_run_ids_from_command_line_or_file(file)
+    run_ids = []
+    if file
+      require("csv")
+      CSV.foreach(file) do |line|
+        run_ids << line[1]
+      end
+    else
+      while(true) do
+        next_arg = shift_argument
+        break if next_arg.nil?
+        run_ids << next_arg
+      end
+    end
+    return run_ids
+  end
+
+end

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.1.19"
+    VERSION = "0.1.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -209,6 +209,7 @@ files:
 - lib/zillabyte/cli/nuke.rb
 - lib/zillabyte/cli/query.rb
 - lib/zillabyte/cli/repl.rb
+- lib/zillabyte/cli/rpc.rb
 - lib/zillabyte/cli/sources.rb
 - lib/zillabyte/cli/templates/apps/js/simple_function.js
 - lib/zillabyte/cli/templates/apps/js/zillabyte.conf.yaml