zillabyte-cli 0.0.16 → 0.0.17

data/lib/zillabyte/cli/auth.rb

@@ -35,4 +35,4 @@ class Zillabyte::Command::Auth < Zillabyte::Command::Base
   
   
 
-end
+end

data/lib/zillabyte/cli/base.rb

@@ -1,9 +1,11 @@
 require "fileutils"
 require "zillabyte/api"
 require "zillabyte/command"
+require "action_view"
 
 class Zillabyte::Command::Base
   include Zillabyte::Helpers
+  include ActionView::Helpers::DateHelper
 
   def self.namespace
     self.to_s.split("::").last.downcase
@@ -56,7 +58,6 @@ protected
     alias_command command.gsub(/_/, '-'), command if command =~ /_/
   end
   
-  
 
   #
   # Parse the caller format and identify the file and line number as identified
@@ -140,12 +141,12 @@ protected
   end
   
   def api
-    @__api ||= Zillabyte::API.new(:api_key => Zillabyte::Auth.api_key, :progress => self)
+    @__api ||= Zillabyte::API.new(:api_key => Zillabyte::Auth.api_key, :session => self)
   end  
   
   
   
-  def progress
+  def session
     self
   end
   
@@ -158,4 +159,4 @@ module Zillabyte::Command
   unless const_defined?(:BaseWithApp)
     BaseWithApp = Base
   end
-end
+end

data/lib/zillabyte/cli/config.rb

@@ -10,7 +10,7 @@ module Zillabyte
       
       ################################################################################
 
-      def self.get_config_info(dir, progress = nil, options = {})
+      def self.get_config_info(dir, session = nil, options = {})
         
         conf_file = nil
         if options[:config_file] and File.exists?(options[:config_file])
@@ -18,6 +18,7 @@ module Zillabyte
         else
           conf_file = File.join(dir, options[:config_file] || DEFAULT_CONFIG_FILE)
         end
+        type = options[:type]
         
         return nil unless File.exists?(conf_file)
         hash = YAML.load_file(conf_file)
@@ -42,7 +43,7 @@ module Zillabyte
               path = Pathname.new(File.expand_path(path_string))
               path.relative_path_from(top_path).to_s()
             rescue Exception => e
-              progress.error e.message() + "\n" + e.backtrace.join("\n") if progress
+              session.error(e.message() + "\n" + e.backtrace.join("\n"), type) if session
               nil
             end
           }.compact()

data/lib/zillabyte/cli/counters.rb

@@ -58,4 +58,4 @@
 # 
 # 
 # 
-# end
+# 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( relations query flows logs )
+  PRIMARY_NAMESPACES = %w( relations query apps logs )
   
 
   def index(*direct_args)

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

@@ -1,3 +1,3 @@
 class Zillabyte::Helpers::DataSchemaBuilder
   
-end
+end

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

@@ -0,0 +1,25 @@
+class Zillabyte::Helpers::TableOutputBuilder
+
+
+  def self.build_table(headings, rows, format = nil)
+    if format == "json"
+      self.build_json_table(headings, rows)
+    else
+      self.build_terminal_table(headings, rows)
+    end
+  end
+
+  def self.build_json_table(headings, rows)
+      out = []
+      rows.map { |row|
+        h = {}
+        row.each_with_index.map{|x,i| h[headings[i]] = x}
+        out << h
+      }
+      return out.to_json
+    end
+
+    def self.build_terminal_table(headings, rows)
+        Terminal::Table.new(:headings => headings, :rows => rows).to_s
+    end
+end

data/lib/zillabyte/cli/log_formatter.rb

@@ -3,13 +3,14 @@ class LogFormatter
   ########################################################
   ## Base / Generic ######################################
   ########################################################
+  COLORS = [:green, :yellow, :magenta, :cyan, :light_black, :light_green, :light_yellow, :light_blue, :light_magenta, :light_cyan]
   
   class Base
     
     def initialize
-      @all_colors ||= [:green, :yellow, :magenta, :cyan, :light_black, :light_green, :light_yellow, :light_blue, :light_magenta, :light_cyan]
+      @all_colors ||= COLORS.clone
       @color_map = {
-        'flow' => :white
+        'app' => :white
       }
     end
     
@@ -79,7 +80,7 @@ class LogFormatter
     
     def handle_hidden(operation_name, operation_index, category, date, line)
       case line
-      when 'REGISTER_FLOW_DEPLOYED', 'REGISTER_FLOW_TIMEOUT'
+      when 'REGISTER_FLOW_DEPLOYED', 'REGISTER_FLOW_TIMEOUT', 'STARTUP_ABORT'
         # done reading the logs
         exit(0)
       end

data/lib/zillabyte/cli/query.rb

@@ -4,13 +4,17 @@ require "zillabyte/cli/base"
 #
 class Zillabyte::Command::Query < Zillabyte::Command::Base
 
+  MAX_POLL_SECONDS = 60 * 5
+  POLL_SLEEP = 0.5
+
   # query:sxp EXPRESSION
   #
   # executes queries against the zillabyte corpus
   #
   # -o, --offset OFFSET  # skips to the offset (default: 0)
   # -l, --limit LIMIT    # sets the result limit (default: 20)
-  # -t, --tail           # continuously watches for new results
+  # --type TYPE          # the output format type i.e json
+  # -t, --tail TAIL      # continuously watches for new results
   #
   #Examples:
   #
@@ -21,12 +25,13 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
     opts = {}
     opts[:offset] = options[:offset] || 0
     opts[:limit] = options[:limit] || 10
+    type = options[:type]
     tail = options[:tail] || false
     expression = options[:expression] || shift_argument 
     opts[:since] = options[:since]
     
     if expression.nil?
-      error "no expression given"
+      error("no expression given", type)
     end
     
     seen = {}
@@ -34,8 +39,42 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
     begin
     
       validate_arguments!
-      res = api.query.sxp(expression, opts)
+      res = api.query.sxp(expression, :post, opts)
     
+      if res['job_id']
+        job_id = res['job_id']
+        opts[:job_id] = job_id
+
+        start = Time.now.utc
+        display "Fetching your data, please wait..." if type.nil?
+
+        while(Time.now.utc < start + MAX_POLL_SECONDS) do
+
+          res = api.query.sxp(expression, :get, opts)
+          case res['status']
+          when 'completed'
+            if(res['return'])
+              res = res['return']
+            else
+              error("something is wrong #{res}", type)
+            end
+          # success! continue below
+            break
+          when 'running'
+            sleep(POLL_SLEEP)
+          else
+            error("unknown status: #{res}", type)
+          end
+
+        end
+      else
+        if res['error']
+          error(res['error_message'] || res['error'], type)
+        else
+          error("remote server error(r256)", type)
+        end
+      end
+
       filtered = []
       headings = []
       if res['results'].first
@@ -52,12 +91,10 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
       end
     
       if filtered.size > 0
-        
-        table = Terminal::Table.new :headings => headings, :rows => filtered
-        puts table.to_s
+        display TableOutputBuilder.build_table(headings, filtered)
       else
         unless tail
-          display "no results"
+          display "no results" if type.nil?
         end
       end
       
@@ -77,9 +114,10 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
   #
   # -o, --offset OFFSET  # skips to the offset (default: 0)
   # -l, --limit LIMIT    # sets the result limit (default: 20)
-  # -t, --tail           # continuously watches for new results
+  # -t, --tail TAIL      # continuously watches for new results
   # -s, --since SINCE    # newer records since
   # --no_truncation      # doesn't truncate long strings
+  # --type TYPE          # The result display type
   #
   #Examples:
   #
@@ -90,20 +128,56 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
     opts = {}
     opts[:offset] = options[:offset] || 0
     opts[:limit] = options[:limit] || 10
+
     tail = options[:tail] || false
     expression = options[:expression] || shift_argument 
     opts[:since] = options[:since]
+    type = options[:type]
     seen = {}
     
     if expression.nil?
-      error "no expression given"
+      error("no expression given", type)
     end
     
-    
     begin
     
       validate_arguments!
-      res = api.query.sql(expression, opts)
+      res = api.query.sql(expression, :post, opts)
+
+      if res['job_id']
+        job_id = res['job_id']
+        opts[:job_id] = job_id
+
+        start = Time.now.utc
+
+        col_aliases = res['column_aliases']
+        while(Time.now.utc < start + MAX_POLL_SECONDS) do
+
+          res = api.query.sql(expression, :get, opts)
+          case res['status']
+          when 'completed'
+            if(res['return'])
+              res = res['return']
+            else
+              throw "something is wrong: #{res}"
+            end
+          # success! continue below
+            break
+          when 'running'
+            sleep(POLL_SLEEP)
+       #   display ".", false
+          else
+            throw "unknown status: #{res}"
+          end
+
+        end
+      else
+        if res['error']
+          error(res['error_message'] || res['error'], type)
+        else
+          error("remote server error(r256)", type)
+        end
+      end
 
       headings = []
       filtered = []
@@ -111,7 +185,7 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
         concrete_headings = res['rows'].first.keys
         concrete_headings.each do |ch|
           has_alias = false
-          res['column_aliases'].each do |al|
+          col_aliases.each do |al|
             if(al["concrete_name"] == ch)
               headings << al["alias"]
               has_alias = true
@@ -143,16 +217,17 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
         end
       end
     
-    
       if filtered.size > 0
-        
-        table = Terminal::Table.new :headings => headings, :rows => filtered
-        puts table.to_s
         opts[:since] = Time.now.utc
-        
+        display TableOutputBuilder.build_table(headings, filtered, type)
+
       else
         unless tail
-          display "no results"
+          if type == "json"
+            display {}.to_json
+          else
+            display "no results"
+          end
         end
       end
       
@@ -166,28 +241,34 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
   # query:pull:s3 QUERY S3_KEY S3_SECRET S3_BUCKET s3_FILE_KEY
   #
   # pulls query data to S3_BUCKET/FILE_KEY/part***.gz
-  #
+  # --type TYPE       # specify an output format type i.e. json
   def pull_to_s3
 
     query = options[:query] || shift_argument
-    error "query cannot be empty" if query.nil?
+    error("query cannot be empty", type) if query.nil?
+
+    type = options [:type]
 
     user_s3_access_key = options[:s3_access_key] || shift_argument
     user_s3_secret = options[:s3_secret] || shift_argument
     user_s3_bucket = options[:s3_bucket] || shift_argument
     user_s3_file_key = options[:s3_file_key] || shift_argument
-    error "no s3 access key provided" if user_s3_access_key.nil?
-    error "no s3 secret provided" if user_s3_secret.nil?
-    error "no s3 bucket provided" if user_s3_bucket.nil?
-    error "no s3 file path specified" if user_s3_file_key.nil?
+    error("no s3 access key provided", type) if user_s3_access_key.nil?
+    error("no s3 secret provided", type) if user_s3_secret.nil?
+    error("no s3 bucket provided", type) if user_s3_bucket.nil?
+    error("no s3 file path specified", type) if user_s3_file_key.nil?
 
     s3_params = {:s3_access_key => user_s3_access_key, :s3_secret => user_s3_secret, 
                  :s3_bucket => user_s3_bucket, :s3_file_key => user_s3_file_key}
 
     res = self.api.queries.pull_to_s3(query, s3_params)
-    display "downloading query results to s3://#{res["s3_bucket"]}/#{res["s3_file_key"]}/"
-    display "if the relation is large, this may take a while, please check your s3 account after a few minutes"
 
+    if type == "json"
+      display {}.to_json
+    else
+      display "downloading query results to s3://#{res["s3_bucket"]}/#{res["s3_file_key"]}/"
+      display "if the relation is large, this may take a while, please check your s3 account after a few minutes"
+    end
   end
   alias_command "query:pull:s3", "query:pull_to_s3"