zillabyte-cli 0.0.23 → 0.0.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDg1OTM3OGJmYzhiM2VkN2Y4MTFlYzMzNWJiZDM5NDc1MTljYWVkNw==
+    NzQ3YzkyMjYxM2QzZTIzMWVlZmNlNzQ2NTc2MWE2ODkxZTA2NGM1Ng==
   data.tar.gz: !binary |-
-    ZjgxNTcxYjZjYTUwODc4NzQ1MGRkZjA4OGMzZjNhNGI1ZjM4MDI1Ng==
+    NjlkZmQ0ODY0Y2EyYTM1ZDRiZWQ4YmQ5Zjk0NzFlOWRkNTMxY2QzMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjhlNjQ0NDZlYTk3NjczMWViNTg0ODQ3ZDg3MDM0ZDU3MDM3YTRlMGQ1ZjE1
-    MjRmNTNlNTQyMWFmYzY3ODBmOGZkNWUwNTgwNzA4MmNhMzNlYzM0MGQxMTI4
-    NjM3NDM5YzQ5OGJiMGMzNmE3MDRiMzBhNzAwNWUzYTdkYzM2OGQ=
+    N2UxNmUyZjlkZGZhZWZkNjM3MzM2MmE5YWM5MzBmMjMyZDc3N2UzNDI3ZDYz
+    NWNmYjhhODM0NmExYzI1ZTVkODgxMjZlOTcyN2NmNWRjZjI2MGQ3NjAwNzI1
+    MzQxZGZlYzA5YzI0OThlNWJjZTI5YzU3MmI3MzI1MmVmY2Q2YjM=
   data.tar.gz: !binary |-
-    YjExOGE1ODBmMDliMzI2OTExMTdhNGY4NTI3ZGI4MDc3ZGQ1NWUxYTNhOWFk
-    YTg2ZDUwNmE0NjllMWJjZWI0NTE4ZjI3MWFkNzA0MTMzMzJhNzRkNTNjM2Jj
-    MDQyODIwYjFiMmVkYWU5ZTM0Y2EyMzkzYzUwZTg0ZGZjYWE4ZTg=
+    N2YxNzllMGY3MzYyZGQ5MzgyZDJiZmZkZTcyNmY5Mzk1NmQxODM1NDI1YjUz
+    NjEyMzNmM2ZlMzQ2NTAwMmMxOGY3MWRkNmQxNjM0OGI3YTFhZTZlMTlmMTA4
+    OTgzZWFjNDNkNTBjMDE3MGEyMzY5ZjU4OThhNjA5ZDhhMmI4MWQ=

data/README.md

@@ -2,6 +2,7 @@
 
 TODO: Write a gem description
 
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -27,3 +28,9 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+# F.A.Q.
+
+### How does the CLI communicate with the API? 
+

data/lib/zillabyte/api/apps.rb

@@ -116,7 +116,7 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
   def pull_to_directory(id, dir, session = nil, options = {})
     
     # Get the resource. note query params
-    type = options[:type]
+    type = options[:output_type]
     session.display "downloading ##{id}" if session && type.nil?
     res = @api.request(
       :expects  => 200,
@@ -164,7 +164,7 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
   #
   def push_directory(dir, session = nil, options = {})
     
-    type = options[:type]
+    type = options[:output_type]
     # Get the meta info
     options[:local_flag] = 1
     hash = Zillabyte::API::Apps.get_rich_meta_info_from_script(dir, session, options)
@@ -242,7 +242,7 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
       return {"status" => "error", "error" => "invalid_directory", "error_message" => "The specified directory (#{dir}) does not appear to contain a valid Zillabyte configuration file."}
     end
 
-    type = options[:type]
+    type = options[:output_type]
     
     full_script = File.join(dir, hash['script'])
     command = nil

data/lib/zillabyte/api/logs.rb

@@ -3,7 +3,6 @@ require 'open-uri'
 
 class Zillabyte::API::Logs < Zillabyte::API::Base
 
-
   # GET /flows/ID/logs
   def get(app_id, operation_id, options = {}, &block)
     
@@ -13,7 +12,7 @@ class Zillabyte::API::Logs < Zillabyte::API::Base
     res = @api.request({
       :expects  => 200,
       :method   => :get,
-      :path     => "/flows/#{app_id}/logs/#{operation_id}/stream",
+      :path     => "/flows/#{app_id}/logs",
       :body     => options.to_json
     }, &block)
 

data/lib/zillabyte/cli/apps.rb

@@ -7,18 +7,19 @@ require 'open3'
 require 'securerandom'
 require 'colorize'
 require 'time_difference'
+require 'net/http'
 
 # manage custom apps
 #
 class Zillabyte::Command::Apps < Zillabyte::Command::Base
 
-  MAX_POLL_SECONDS = 60 * 5
+  MAX_POLL_SECONDS = 60 * 15
   POLL_SLEEP = 0.5
 
   # apps
   #
   # list custom apps
-  # --type TYPE     # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE     # specify an output type i.e. json
   #
   def index
     self.list
@@ -29,9 +30,9 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # apps
   #
   # list custom apps
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   def list
-    type = options[:type]
+    type = options[:output_type]
     
     headings = ["id", "name", "state", "cycles"]
     rows = api.app.list.map do |row|
@@ -56,7 +57,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   def details
     
     app_id = options[:id] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
     
     if app_id.nil?
       app_id = read_name_from_conf(options)
@@ -182,7 +183,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # uploads an app
   # 
   # --config CONFIG_FILE # use the given config file
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   # --directory DIR # app directory
   #
   #Examples:
@@ -199,7 +200,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
       dir = File.expand_path(dir)
     end
     options[:directory] = dir
-    type = options[:type]
+    type = options[:output_type]
 
     res = api.apps.push_directory dir, session, options
     
@@ -212,21 +213,11 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     display "Starting up your app...please wait..." if type.nil?
     sleep(2) # wait for kill command 
     
-    lf = LogFormatter::Startup.new
-    api.logs.get_startup(res['id'], "_ALL_", {:push => true}) do |hash|
-      
-      # Error?
-      error(hash['error_message'], type) if hash['error']
-      
-      # Print it
-      lf.print_log_line(hash) if type.nil?
-      
-      # Exit when we get the 'done' message
-      # exit(0)  if (hash['line'] || '').downcase.include?("app deployed")
-      
-    end
+    hash = self.api.logs.get(res['id'], nil, options)
+    fetch_logs(hash, "_ALL_", "App deployed")
+
     display "{}" if type == "json"
-      
+
   end
   alias_command "push", "apps:push"
   
@@ -237,7 +228,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # pulls an app source to a directory.
   #
   # --force # pulls even if the directory exists
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   # --directory DIR # Directory of the app
   #
   # Examples:
@@ -256,7 +247,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     error("no directory given", type) if dir.nil?
     dir = File.expand_path(dir)
 
-    type = options[:type]
+    type = options[:output_type]
     
     error("no id given", type) if app_id.nil?
     
@@ -290,7 +281,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # deletes an app. if the app is running, this command will kill it. 
   #
   # -f, --force # don't ask for confirmation
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   #
   def delete
     app_id = options[:id] || shift_argument
@@ -302,7 +293,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
       options[:is_name] = true
     end
     forced = options[:force]
-    type = options[:type]
+    type = options[:output_type]
 
     if not forced
 
@@ -338,11 +329,11 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # performs any necessary initialization for the app
   # 
   # --directory DIR       # app directory
-  # --type TYPE           # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE           # specify an output type i.e. json
   #  
   def prep
 
-    type = options[:type]
+    type = options[:output_type]
     dir = options[:directory] || shift_argument
     if dir.nil?
       dir = Dir.pwd
@@ -392,7 +383,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # initializes a new executable in DIR
   # [LANG] defaults to ruby, and [DIR] to the current directory
   #
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   # --directory DIR # Directory of the app
   #
   #Examples:
@@ -408,7 +399,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     else
       dir = File.expand_path(dir)
     end
-    type = options[:type]
+    type = options[:output_type]
 
     languages = ["ruby","python", "js"]
 
@@ -426,7 +417,8 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   #
   # streams logs from the distributed workers
   # 
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
+  # --operation OPERATION_NAME # specify the operation to show logs for
   # -v, --verbose LEVEL  # sets the verbosity (error, info, debug) (default: info)
   #
   def logs
@@ -441,20 +433,16 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
 
     operation_id = options[:operation] || shift_argument || '_ALL_'
     category = options[:verbose] || '_ALL_'
-    type = options[:type]
+    type = options[:output_type]
 
     carry_settings = {
       :category => category
     }
 
     display "Retrieving logs for app ##{app_id}...please wait..." if type.nil?
-    lf = LogFormatter::Operation.new
-    self.api.logs.get(app_id, operation_id, options) do |line|
-      
-      error(line['error_message'], type) if line['error']
-      lf.print_log_line(line) if type.nil?
-      
-    end
+    hash = self.api.logs.get(app_id, operation_id, options)
+
+    fetch_logs(hash, operation_id)
 
   end  
   alias_command "logs", "apps:logs"
@@ -464,7 +452,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # apps:errors ID
   #
   # show recent errors generated by the app
-  # --type TYPE           # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE           # specify an output type i.e. json
   #
   def errors
     
@@ -479,7 +467,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
       options[:is_name] = true
     end
 
-    type = options[:type]
+    type = options[:output_type]
 
     # Make the request
     res = api.request(
@@ -521,6 +509,14 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     end
     
   end
+  
+  
+  
+  
+
+  
+  
+  
 
   # apps:cycles ID [OPTIONS]
   #  
@@ -528,11 +524,11 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # with no options, the command lists the apps cycles
   # -n, --next            # request the app to move to the next cycle
   # -f, --forever         # don't wait on cycles any more
-  # --type TYPE           # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE           # specify an output type i.e. json
   #
   def cycles
     app_id = options[:id] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
 
     trigger_next = options[:next] || false
     trigger_forever = options[:forever] || false
@@ -622,7 +618,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   def test
     
     output = options[:output]
-    otype = options[:type] #type is used below for something else
+    otype = options[:output_type] #type is used below for something else
 
     max_seconds = (options[:wait] || "30").to_i
     batches = (options[:batches] || "1").to_i
@@ -912,7 +908,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
                   op_display.call "receiving: #{display_hash}"
                 elsif write_json['command'] == 'next'
                   last_call_next_tuple = true
-                  op_display.call "getting next set of tuples in the batch"
+                  op_display.call "asking for next tuple(s)"
                 else
                   # puts write_json
                 end
@@ -951,7 +947,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
 
                 # Get next message
                 read_msg = read_message(stdout, color);
-                
+
                 if read_msg == "done" || read_msg.nil?
 
                   # For sources, if we receive a "done", check to see if any of the streams emitted by the source has
@@ -1085,12 +1081,12 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # kills the given app
   # 
   # --config CONFIG_FILE # use the given config file
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   #
   def kill
 
     id = options[:id] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
 
     if id.nil?
       id = read_name_from_conf(options)
@@ -1116,14 +1112,14 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # runs a local app with live data
   # 
   # --config CONFIG_FILE # use the given config file
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   # --directory DIR # Directory of the app
   #
   # HIDDEN:
   def live_run
 
     name = options[:name] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
 
     thread_id = options[:thread] || shift_argument || ""
     dir = options[:directory] || shift_argument
@@ -1154,13 +1150,13 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # 
   # fetches detailed status of the app
   # 
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   # --directory DIR # Directory of the app
   #
   def status
 
     id = options[:id] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
 
     if id.nil?
       id = read_name_from_conf(options)
@@ -1193,7 +1189,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # outputs the info for the app in the dir.
   # 
   # --pretty # Pretty prints the info output
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   # --directory DIR # Directory of the app
   #
   def info
@@ -1207,7 +1203,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     options[:directory] = dir
 
     info_file = "#{dir}/#{SecureRandom.uuid}"
-    type = options[:type]
+    type = options[:output_type]
 
     cmd = command("--info --file #{info_file}", type, dir)
     app_info = Zillabyte::Command::Apps.get_info(cmd, info_file, dir, options)
@@ -1228,17 +1224,17 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
 
 
   #
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   #
   def self.get_info(cmd, info_file, dir, options = {})
-    type = options[:type]
+    type = options[:output_type]
 
     response = `#{cmd}`
     if($?.exitstatus == 1)
 
       File.delete("#{info_file}") if File.exists?(info_file)
 
-      if options[:type].nil?
+      if options[:output_type].nil?
         exit(1)
       else
         Zillabyte::Helpers.error("error: #{response}", type)
@@ -1272,7 +1268,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   private 
   
   #
-  # --type TYPE # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE # specify an output type i.e. json
   #
   def command(arg="--execute_live", type = nil, dir = Dir.pwd, ignore_stderr = false)
     meta = Zillabyte::CLI::Config.get_config_info(dir, self, options)
@@ -1331,10 +1327,43 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   #
   #
   def read_name_from_conf(options = {})
-    type = options[:type]
+    type = options[:output_type]
     hash = Zillabyte::API::Apps.get_rich_meta_info_from_script Dir.pwd, options
     error("No id given and current directory does not contain a valid Zillabyte configuration file. Please specify an app id or run command from the directory containing the app.",type) if hash["error"]
     hash["name"]
   end
 
+  def fetch_logs(hash, operation=nil, exit_on=nil)
+    def color_for(operation_name)
+      @color_map[operation_name] ||= @all_colors[ @color_map.size % @all_colors.size ]
+      @color_map[operation_name]
+    end
+
+    @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["app"]}/flow_logs/app_#{hash["app"]}.log"
+    else
+      cmd = "curl -G http://#{hash["app"]}:#{hash["token"]}@#{hash["server"]}:#{hash["port"]}/getLogs?app=#{hash["app"]}"
+    end
+
+    begin  
+      PTY.spawn( cmd ) do |r, w, pid|
+        r.each do |line|
+          begin
+            op = line.match(/\[(.*?)\]/)[0].to_s[1...-1]
+            op_name = op.split(".")[0]
+            next if op_name != operation and operation != "_ALL_"
+            line_split = line.split("[")
+            print line_split[0] + "[" + op.colorize(color_for(op)) + line_split[1..-1].join("[")[op.length..-1]
+            break if exit_on and line.include? exit_on
+          rescue Exception => e
+            next
+          end
+        end
+      end  
+    rescue PTY::ChildExited => e  
+    end  
+  end
+
 end

data/lib/zillabyte/cli/config.rb

@@ -18,7 +18,7 @@ module Zillabyte
         else
           conf_file = File.join(dir, options[:config_file] || DEFAULT_CONFIG_FILE)
         end
-        type = options[:type]
+        type = options[:output_type]
 
         return nil unless File.exists?(conf_file)
         hash = YAML.load_file(conf_file)

data/lib/zillabyte/cli/executes.rb

@@ -0,0 +1,180 @@
+require "zillabyte/cli/base"
+require "zillabyte/cli/config"
+require "zillabyte/common"
+require "pty"
+require 'indentation'
+require 'open3'
+require 'securerandom'
+require 'colorize'
+require 'time_difference'
+
+
+# executes arbitrary input against apps
+#
+# HIDDEN
+class Zillabyte::Command::Executes < Zillabyte::Command::Base
+
+  POLL_DELAY = 3
+
+
+  # executes:exec ID INPUT_PARAMS [INPUT_PARAMS]
+  #
+  # executes an app against with the given parameters. INPUT_PARAMS
+  # is expected to be in JSON format. 
+  # 
+  # --json            # return the results as JSON
+  # --async           # returns immediately.  Use executes:results to fetch results
+  # --select FIELDS   # returns only the fields in this list. useful for scripting
+  #
+  # Examples: 
+  #
+  # $ zillabyte exec "web_screenshot", "{url: 'google.com'}"
+  # $ zillabyte exec "web_screenshot", "{url: 'google.com'}", "{url: 'facebook.com'}" 
+  def exec
+    
+    # INIT 
+    app_id = options[:id] || shift_argument
+    async = options[:async] || false
+    select_field = options[:select]
+    
+    # Get the inputs
+    input_params = []
+    while ((ip = shift_argument()) != nil)
+      input_params << JSON.parse(ip)
+    end
+    
+    # Sanity
+    error("At least one input parameter is required") if input_params.size == 0
+    error("Unable to execute multiple requests synchronously. Add the --async flag or call with only one input_param") if input_params.size > 1 and !async
+    error("The --select option and --async cannot be used at the same time") if async and select_field
+    
+    # Work with concrete ids or names
+    if !(app_id =~ /^\d*$/)
+      options[:is_name] = true
+    end
+    
+    # Build the hash
+    options[:input] = input_params
+    
+    # Make the request
+    res = api.request(
+      :expects => 200, 
+      :method => :post,
+      :body    => options.to_json,
+      :path => "/flows/#{CGI.escape(app_id)}/executes"
+    ).body
+    
+    
+    if async    
+      
+      # Async. Return right away... 
+      if res['status'] == 'success'
+        if options[:display_type] == :json
+          display res.to_s
+        else
+          # TODO: 
+          display res.to_s
+        end
+      else
+        error res['error_message']
+      end
+      
+    else
+      
+      # Synchronous... poll until done.. 
+      execute_ids = res['execute_ids']
+      while (true)
+        
+        res = get_results(app_id, execute_ids)
+        if res['status'] == 'success'
+          
+          execute_ids.each do |execute_id|
+            h = res['results'][execute_id]
+            if h['status'] == 'complete'
+              if select_field
+                display(h['data'][select_field])
+              else
+                display(h.to_json)
+              end
+              execute_ids.delete(execute_id)
+            end
+          end
+          
+        else
+          error(res.to_json)
+        end
+        
+        if execute_ids.size == 0
+          # success. done
+          return
+        else
+          # still more. keep polling
+          sleep(POLL_DELAY)
+        end
+        
+      end
+      
+    end
+    
+  end
+  alias_command "exec", "executes:exec"
+  alias_command "execute", "executes:exec"
+  
+  
+  
+  
+
+  # executes:results ID EXECUTE_ID [EXECUTE_ID]
+  #
+  # fetches the results associated with the given execute_id.
+  # 
+  # --json      # return the results as JSON
+  #
+  def results
+    
+    # INIT 
+    app_id = options[:id] || shift_argument
+    execute_ids = []
+    while ((eid = shift_argument()) != nil)
+      execute_ids << eid
+    end
+    
+    # Sanity
+    error("at least one execute id parameter is required") if execute_ids.size == 0
+    
+    # Work with concrete ids or names
+    if !(app_id =~ /^\d*$/)
+      options[:is_name] = true
+    end
+    
+    # Fetch the results... 
+    display( get_results(app_id, execute_ids).to_json )
+    
+    
+    
+  end
+  alias_command "results", "executes:results"
+  
+  
+  
+  private 
+  
+  def get_results(app_id, execute_ids)
+    
+    hash = {
+      :execute_ids => execute_ids
+    }
+    
+    res = api.request(
+      :expects => 200, 
+      :method => :get,
+      :body    => hash.to_json,
+      :path => "/flows/#{CGI.escape(app_id)}/executes"
+    ).body
+    
+    return res
+    
+  end
+  
+  
+end

data/lib/zillabyte/cli/nuke.rb

@@ -31,7 +31,7 @@ class Zillabyte::Command::Nuke < Zillabyte::Command::Base
     )
     res.body
     
-    if options[:type] == "json"
+    if options[:output_type] == "json"
       display res.body.to_json
     else
       display "Nuked #{res.body['deleted_apps']} app(s) and #{res.body['deleted_apps']} relations(s)"

data/lib/zillabyte/cli/query.rb

@@ -13,7 +13,7 @@ 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)
-  # --type TYPE          # the output format type i.e json
+  # --output_type OUTPUT_TYPE          # the output format type i.e json
   # -t, --tail TAIL      # continuously watches for new results
   #
   #Examples:
@@ -25,7 +25,7 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
     opts = {}
     opts[:offset] = options[:offset] || 0
     opts[:limit] = options[:limit] || 10
-    type = options[:type]
+    type = options[:output_type]
     tail = options[:tail] || false
     expression = options[:expression] || shift_argument 
     opts[:since] = options[:since]
@@ -117,7 +117,7 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
   # -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
+  # --output_type OUTPUT_TYPE          # The result display type
   #
   #Examples:
   #
@@ -132,7 +132,7 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
     tail = options[:tail] || false
     expression = options[:expression] || shift_argument 
     opts[:since] = options[:since]
-    type = options[:type]
+    type = options[:output_type]
     seen = {}
     
     if expression.nil?
@@ -249,7 +249,7 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
 
     query = options[:query] || shift_argument
     file = options[:file] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
     error("no query given", type) if query.nil?
     error("no file given", type) if file.nil?
     file = "#{file}.gz" unless File.extname(file) == ".gz"
@@ -312,13 +312,13 @@ 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
+  # --output_type OUTPUT_TYPE       # specify an output format type i.e. json
   def pull_to_s3
 
     query = options[:query] || shift_argument
     error("query cannot be empty", type) if query.nil?
 
-    type = options [:type]
+    type = options [:output_type]
 
     user_s3_access_key = options[:s3_access_key] || shift_argument
     user_s3_secret = options[:s3_secret] || shift_argument

data/lib/zillabyte/cli/relations.rb

@@ -18,7 +18,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   # relations
   #
   # lists your custom relations 
-  # --type TYPE                   # specify an output type i.e. json
+  # --output_type OUTPUT_TYPE                   # specify an output type i.e. json
   # 
   def index
     self.list
@@ -26,12 +26,12 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   
 
   # relations
-  #  v 
+  #   
   # lists your custom relations 
   # 
-  #  --type TYPE # The output format type
+  #  --output_type OUTPUT_TYPE # The output format type
   def list
-    type = options[:type] || nil
+    type = options[:output_type] || nil
 
     response = api.request(
       :expects  => 200,
@@ -61,11 +61,11 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   # deletes a relation 
   # 
   # -f, --force         # Delete without asking for confirmation
-  # --type TYPE     # The output format type
+  # --output_type OUTPUT_TYPE     # The output format type
   def delete 
     id = options[:id] || shift_argument
     forced = options[:force]
-    type = options[:type] || nil
+    type = options[:output_type] || nil
 
     if !forced
 
@@ -103,20 +103,20 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   #
   # creates a new relation
   #
-  # --schema SCHEMA              # Column names and types in the format "field_1:type_1,field_2:type_2,..."
+  # --schema SCHEMA              # Column names and types in the format "field_1:output_type_1,field_2:output_type_2,..."
   # --public SCOPE               # Make the relation public
   # --file FILE                  # A data file 
   # --filetype FILETYPE          # File format type, defaults to csv
   # --description DESCRIPTION    # Description of relation contents
   # --aliases ALIASES            # Relation name aliases in the format "alias_1,alias_2,..."
-  # --type TYPE                  # The output format type
+  # --output_type OUTPUT_TYPE                  # The output format type
   #
   def create
 
     name = options[:name] || shift_argument
     file = options[:file] || nil
     filetype = options[:filetype] || nil
-    type = options[:type]
+    type = options[:output_type]
 
     error("no name given", type) if name.nil?
 
@@ -156,13 +156,13 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   #
   # adds data to an existing relation
   # --filetype FILETYPE                 # Input File format type, defaults to csv
-  # --type TYPE                     # Output formatting type i.e. json
+  # --output_type OUTPUT_TYPE                     # Output formatting type i.e. json
   #
   def append
 
     id = options[:id] || shift_argument
     file = options[:file] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
 
     filetype = options[:filetype]
     filetype ||= File.extname(file || "").gsub(".", "")
@@ -200,13 +200,13 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   # pulls relation data into OUTPUT.gz
   #
   #  --cycle_id [cycle_id]              # retrieve data generated for that cycle, only if this relation is associated with an app. (defaults to the last cycle
-  #  --type TYPE                        # specify a communication format (i.e json) for programmatic interaction
+  #  --output_type OUTPUT_TYPE                        # specify a communication format (i.e json) for programmatic interaction
   #
   def pull
 
     id = options[:id] || shift_argument
     file = options[:file] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
     error("no id given", type) if id.nil?
     error("no file given", type) if file.nil?
 
@@ -259,13 +259,13 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   # pulls relation data to S3_BUCKET/FILE_KEY/part***.gz
   #
   #  --cycle_id [cycle_id]                                # retrieve data generated for that cycle, only if this relation is associated with an app. (defaults to the last cycle)
-  #  -t, --type TYPE                                      # the output format types
+  #  -t, --output_type OUTPUT_TYPE                                      # the output format types
   #
 
   def pull_to_s3
 
     id = options[:id] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
     error("no id given", type) if id.nil?
 
     user_s3_access_key = options[:s3_access_key] || shift_argument
@@ -300,10 +300,10 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   #
   #  --cycle_id [cycle_id]   # retrieve data generated for that cycle, only if this relation is associated with an app. (defaults to the last cycle)
   #  --no_truncation         # don't truncate long strings
-  #  --type TYPE             # the type of the output
+  #  --output_type OUTPUT_TYPE             # the type of the output
   def show
     name = options[:name] || shift_argument
-    type = options[:type]
+    type = options[:output_type]
     error "no id given" if name.nil?
     
     # Initial request..
@@ -438,7 +438,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       error("specify public or private using --public")
     end
 
-    {:schema => schema, :public => is_public, :description => description, :aliases => aliases, :type => type}
+    {:schema => schema, :public => is_public, :description => description, :aliases => aliases, :output_type => type}
   end
 
 

data/lib/zillabyte/cli/repl.rb

@@ -1,5 +1,6 @@
 require "zillabyte/cli/base"
 require 'readline'
+require("shellwords")
 # REPL console for zillabyte commands
 #
 class Zillabyte::Command::Repl < Zillabyte::Command::Base
@@ -11,8 +12,8 @@ class Zillabyte::Command::Repl < Zillabyte::Command::Base
   # --history HISTORY# HIDDEN hack to allow history for readline
   def index
     if !options[:quiet]
-      v = `zillabyte version`
-      display "\n#{v}Type q,exit or Ctrl+D to quit\n\n"
+      Zillabyte::Command.run("version")
+      display "Type q,exit or Ctrl+D to quit\n\n"
     end
     server = `echo $ZILLABYTE_API_HOST` || ""
     prompt = ""
@@ -29,13 +30,28 @@ class Zillabyte::Command::Repl < Zillabyte::Command::Base
       end
     end
     # TODO: Add tab completion for basic commands, app/relation names etc.
+    buf = ""
     while cmd = Readline.readline(prompt, true)
       if cmd && cmd.length > 0
         if cmd.downcase == "exit" || cmd.downcase == "q"
           display "" # TODO Make Ctrl+D print a newline too
           return
         else
-          exec "zillabyte #{cmd}; zillabyte repl --quiet --history '#{Readline::HISTORY.to_a.to_json}'"
+          buf << cmd
+          begin
+            args = Shellwords.split(buf)
+            raise if args.empty?()
+            command = args.shift
+            buf = ""
+            begin
+              pid = fork() do
+                Zillabyte::Command.run(command, args)
+              end
+            ensure
+              Process.waitpid(pid)
+            end
+          rescue => e
+          end
         end
       end
     end

data/lib/zillabyte/cli/version.rb

@@ -8,7 +8,7 @@ class Zillabyte::Command::Version < Zillabyte::Command::Base
   # 
   # display version number of the CLI
   def index(*direct_args)
-    if options[:type] == "json"
+    if options[:output_type] == "json"
       display( {:version => Zillabyte::CLI::VERSION}.to_json )
     else
       display "Zillabyte CLI Version #{Zillabyte::CLI::VERSION}"

data/lib/zillabyte/command.rb

@@ -168,7 +168,7 @@ module Zillabyte
       # Make the --json command universal.. 
       if invalid_options.include?("--json")
         invalid_options.delete("--json")
-        opts[:type] = "json"
+        opts[:output_type] = "json"
       end
 
       @current_args = args

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.0.23"
+    VERSION = "0.0.24"
   end
 end

data/zillabyte-cli.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", "~> 3.2.11"
   spec.add_dependency "actionpack", "~> 3.2.13"
   spec.add_dependency "multi_json", "~> 1.0"
-  spec.add_dependency "mini_portile", "~> 0.5.0"
   
   spec.add_dependency "bundler", "~> 1.3"
   spec.add_dependency "colorize", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,20 +122,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: mini_portile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +247,7 @@ files:
 - lib/zillabyte/cli/base.rb
 - lib/zillabyte/cli/config.rb
 - lib/zillabyte/cli/counters.rb
+- lib/zillabyte/cli/executes.rb
 - lib/zillabyte/cli/help.rb
 - lib/zillabyte/cli/helpers/data_schema_builder.rb
 - lib/zillabyte/cli/helpers/table_output_builder.rb