zillabyte-cli 0.0.11 → 0.0.12

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/lib/zillabyte-cli/version.rb~

@@ -0,0 +1,5 @@
+module Zillabyte
+  module CLI
+    VERSION = "0.0.11"
+  end
+end

data/lib/zillabyte/api/data.rb

@@ -4,19 +4,35 @@ class Zillabyte::API::Data < Zillabyte::API::Base
 
   # GET /datasets/1
   def get(id, options = {})
-    
     res = @api.request(
       :expects  => 200,
       :method   => :get,
       :path     => "/relations/#{id}",
       :body     => options.to_json 
     )
-
     res.body
-    
   end
   
+  def pull(id, options = {})
+    res = @api.request(
+      :expects  => 200,
+      :method   => :post,
+      :path     => "/relations/#{id}/pull",
+      :body     => options.to_json 
+    )
+    res.body
+  end
   
+  def pull_to_s3(id, options)
+    res = @api.request(
+      :expects => 200,
+      :method  => :post,
+      :path    => "/relations/#{id}/pull_to_s3",
+      :body    => options.to_json
+    )
+    res.body
+  end
+
   # POST /datasets
   def create(name, options = {})
     

data/lib/zillabyte/api/flows.rb

@@ -63,9 +63,46 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
 
   end
   
+  def delete(id, options ={})
+    res = @api.request(
+      :expects  => 200,
+      :method   => :delete,
+      :path     => "/flows/#{id}",
+      :body     => options.to_json 
+    )
+    res.body
+  end
+
+  def list_cycles(id, options={})
+    res = @api.request(
+      :expects => 200,
+      :method  => :get,
+      :path    => "/flows/#{id}/cycles",
+      :body    => options.to_json
+    )
+    res.body
+
+  end
   
+  def create_cycle(id, options ={})
+    res = @api.request(
+      :expects => 200,
+      :method  => :post,
+      :path    => "/flows/#{id}/cycles",
+      :body    => options.to_json
+    )
+    res.body
+  end
   
-  
+  def run_forever(id, options ={})
+    res = @api.request(
+      :expects => 200,
+      :method  => :post,
+      :path    => "/flows/#{id}/cycles/run_forever",
+      :body    => options.to_json
+    )
+    res.body
+  end
   
   
   

data/lib/zillabyte/cli/flows.rb

@@ -5,6 +5,7 @@ require "pty"
 require 'indentation'
 require 'open3'
 require 'securerandom'
+require 'colorize'
 
 # manage custom flows
 #
@@ -24,7 +25,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   #
   def list
     
-    headings = ["id", "name", "state"]
+    headings = ["id", "name", "state", "cycles"]
     rows = api.flow.list.map do |row|
       if headings.size == 0
         headings = row.keys 
@@ -103,6 +104,33 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   alias_command "pull", "flows:pull"
 
 
+  # flows:delete ID
+  #
+  # deletes a flow. if the flow is running, this command will kill it. 
+  #
+  # -f, --force # don't ask for confirmation
+  def delete
+    id = options[:id] || shift_argument
+    forced = options[:force]
+    if not forced
+      while true
+        
+        display "This operation cannot be undone. Are you sure you want to delete this flow? (yes/no):", false
+        confirm = ask
+        break if confirm == "yes" || confirm == "no"
+        display "Please enter 'yes' to delete the flow or 'no' to exit"
+      end
+    end
+
+    confirmed = forced || confirm == "yes"
+
+    if confirmed
+      response = api.flows.delete(id)
+      display response["body"]
+
+    end
+
+  end
 
   
   # flows:prep [DIR]
@@ -171,6 +199,72 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
 
 
+  # flow:show FLOW_ID [OPERATION]
+  #
+  # streams logs from the distributed workers
+  # 
+  # -t, --tail  # continuously watches for new results
+  # -v, --verbose LEVEL  # sets the verbosity (error, info, debug) (default: info)
+  #
+  def logs
+
+    flow_id = options[:flow] || shift_argument
+    operation_id = options[:operation] || shift_argument || '_ALL_'
+    tail = options[:tail]
+    priority = options[:verbose] || 'debug'
+    carry_settings = {
+      :priority => priority
+    }
+    api_options = {}
+    
+    error "no id given" if flow_id.nil?
+    
+    begin
+      
+      res = self.api.logs.get(flow_id, operation_id, api_options)
+
+      carry_settings = show_log_output(res, carry_settings)
+      api_options[:since] = carry_settings[:since]
+      
+      if (tail)
+        sleep(5) # HACK
+      end
+    end while(tail)
+
+  end  
+  alias_command "logs", "flows:logs"
+
+
+  # flow:cycles ID [OPTIONS]
+  #  
+  # operations on the flow's cycles (batches).
+  # with no options, the command lists the flows cycles
+  # -n, --next # request the flow to move to the next cycle
+  # -f, --forever # don't wait on cycles any more
+  def cycles
+    flow_id = options[:id] || shift_argument
+    trigger_next = options[:next] || false
+    trigger_forever = options[:forever] || false
+    error "id required" if flow_id.nil?
+
+    if trigger_next
+      # Trigger the next flow
+      response = api.flows.create_cycle(flow_id)
+    elsif trigger_forever
+      response = api.flows.run_forever(flow_id)
+    else
+      # List the flows
+      response = api.flows.list_cycles(flow_id)
+
+    end
+
+    
+    display response
+  end
+  
+
+
+
   # flows:test [TEST_DATASET_ID]
   #
   # tests a local flow with sample data
@@ -307,15 +401,55 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
           end
           
         end
+
+      # An Aggregate?  
+      elsif type == "aggregate"
+        if node['consumes']
+          input_stream = node['consumes']
+        else
+          input_stream = stream_messages.keys.first
+        end
+        messages = stream_messages[input_stream] || []
+        stream_messages[input_stream] = []
         
-      end
-      
-      
-      
+        group_by = node['group_by']
+        group_tuples = {}
+        messages.each do |msg|
+          msg = JSON.parse(msg)
+          tuple = msg["tuple"].to_json
+          meta = msg["meta"].to_json
+          column_aliases = msg["column_aliases"] || {}
+          aliases = Hash[column_aliases.map{|h| [h["alias"],h["concrete_name"]]}]
+          gt = {}
+          group_by.each do |field|
+            field_name = aliases[field] || field
+            gt[field] = msg["tuple"][field_name]
+          end
+          
+          msg_no_brackets = "\"tuple\": #{tuple}, \"meta\": #{meta}, \"column_aliases\": #{column_aliases.to_json}"
+          if group_tuples[gt]
+            group_tuples[gt] << msg_no_brackets
+          else
+            group_tuples[gt] = [msg_no_brackets]
+          end
+        end
+
+        group_tuples.each do |group_tuple, tuples|
+          stream_messages[input_stream] << "{\"command\": \"begin_group\", \"tuple\": #{group_tuple.to_json}, \"meta\":{}}\n"
+          tuples.each do |t|
+            stream_messages[input_stream] << "{\"command\": \"aggregate\", #{t}}\n"
+          end
+          stream_messages[input_stream] << "{\"command\": \"end_group\"}\n"
+        end
+     
       # A Sink? 
-      if type == "sink"
+      elsif type == "sink"
        
-        if split_branches || stream_messages.size > 1 
+        if split_branches || stream_messages.size > 1
+          split_branches = true
+          if node['consumes'].nil?
+            error "The node #{name} must declare which stream it 'consumes'"
+          end
           sink_stream = node["consumes"]
           messages = stream_messages[sink_stream] || []
         else
@@ -354,7 +488,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
         
         
         
-        next        
+        next
       end
       
 
@@ -491,6 +625,11 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
         end
       rescue PTY::ChildExited
         puts "The child process exited!"
+      ensure
+        # We need to check here to see if we need to turn on multistream mode.
+        # Note that we still need the redundant checks above, in case the user
+        # didn't honor the emits contract.
+        split_branches = true if node["emits"].size() > 1
       end
     end
     
@@ -517,7 +656,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
 
   
-  # flows:live_run [DIR]
+  # flows:live_run [OPERATION_NAME] [PIPE_NAME] [DIR]
   #
   # runs a local flow with live data
   # 
@@ -598,6 +737,66 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   private 
   
+  def show_log_output(lines, settings = {})
+    
+    @colors ||= [:green, :yellow, :magenta, :cyan, :light_black, :light_green, :light_yellow, :light_blue, :light_magenta, :light_cyan]
+
+    max_category_size = 0
+    all_lines = []
+    
+    lines.each_pair do |operation, lines|
+      settings[operation] ||= {}      
+      settings[operation][:color] ||= @colors.shift
+      lines.each do |line_h|
+        
+        line = line_h['line']
+        priority = line_h['priority']
+        date = line_h['date']
+        
+        all_lines << {
+          :line => line,
+          :category => operation,
+          :priority => priority,
+          :color => settings[operation][:color],
+          :date => date
+        }
+        max_category_size = [max_category_size, operation.size].max
+        
+        if settings[:since]
+          settings[:since] = [date, settings[:since]].max
+        else
+          settings[:since] = date
+        end
+        
+      end
+      
+    end
+    
+    all_lines.sort! do |a,b|
+      a[:date] <=> b[:date]
+    end
+    
+    requested_priority = settings[:priority]
+
+    all_lines.each do |h|
+      color = h[:color]
+      
+      case h[:priority]
+      when 'error'
+        color = :red if h[:priority] == 'error'
+      when 'info'
+        next if ['error'].member?(requested_priority)
+      when 'system'
+      when 'debug'
+        next if ['info', 'error'].member?(requested_priority)
+      end
+      
+      display "#{h[:category].rjust(max_category_size)} #{h[:priority].rjust(6)} - #{h[:line]}".colorize(color)
+    end
+    
+    settings
+  end
+  
 
 
   

data/lib/zillabyte/cli/relations.rb

@@ -1,5 +1,7 @@
 require "zillabyte/cli/base"
 require "csv"
+require "open-uri"
+require "aws-sdk"
 
 # manage custom relations
 #
@@ -122,23 +124,25 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   #
   # creates a new relation
   #
-  # --schema SCHEMA  # a JSON array of column types
-  # --public         # Make the relation public
-  # --file           # A data file 
-  # --type           # type of data file [csv (default), xlsx]
+  # --schema SCHEMA              # a JSON object of column types
+  # --public SCOPE               # Make the relation public
+  # --file FILE                  # A data file 
+  # --type FILE_TYPE             # type of data file [csv (default), xlsx]
+  # --description DESCRIPTION    # Description of relation contents
   #
   def create
     
     name = options[:name] || shift_argument
-    file = options[:file] || shift_argument || nil
+    file = options[:file] || nil
     type = options[:type] || nil
 
     error "no name given" if name.nil?
 
-    schema = JSON.parse(options[:schema]) if options[:schema]
-    is_public = options[:public] || false
+    schema = options[:schema] if options[:schema]
+    is_public = options[:public] || nil
+    description = options[:description] || nil
    
-    hash = set_relation_properties(schema,is_public)
+    hash = set_relation_properties(schema,is_public,description)
     if file
       type ||= File.extname(file).gsub(".", "")
       rows = sanity_check_file(file,type, {"columns" => hash[:schema]})
@@ -174,15 +178,96 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     type ||= File.extname(file).gsub(".", "")
 
     relation = self.api.data.get(id)
-    rows = sanity_check_file(file,type,relation)
+    columns = relation["columns"].map{|col| {col["index"] => col["type"]}}
+    rows = sanity_check_file(file,type,{"columns" => columns})
    
     res = self.api.data.append(id, {:rows => rows})
-    display "relation #{id} appended"
+    display "relation ##{id} appended #{res["size"]} rows"
 
   end
   alias_command "append", "relations:append"
   alias_command "rl:append", "relations:append"
 
+  # relations:pull ID OUTPUT
+  #
+  # pulls relation data into OUTPUT
+  # if s3 parameters specified, pulls relation data to S3_BUCKET/OUTPUT/
+  #
+  # --type TYPE # interpret file as type [csv, xlsx]
+  #
+  def pull
+
+    id = options[:id] || shift_argument
+    file = options[:file] || shift_argument
+    error "no id given" if id.nil?
+    error "no output file given" if file.nil?
+    type = options[:type]
+    type ||= File.extname(file).gsub(".", "")
+
+    res = self.api.data.pull(id)
+    if(res["uri"])
+      File.open(file, "w") do |f|
+        f.write open(res["uri"]).read
+      end
+    elsif(res["s3_credentials"])
+      display "request sent...depending on the size of your file, this may take a while..."
+      s3 = AWS::S3.new(res["s3_credentials"])
+      bucket = s3.buckets[res["s3_bucket"]]
+      obj = bucket.objects.with_prefix("#{res["s3_file_key"]}/")
+      while(true)
+        keys = obj.collect(&:key)
+        if keys.length > 0 and keys.include?("#{res["s3_file_key"]}/manifest")
+          File.open(file, "w") do |f|
+            obj.each do |o|
+              if o.key == "#{res["s3_file_key"]}/manifest"
+                next
+              end
+              f.write(o.read)
+            end
+          end
+          break
+        else
+          sleep(3)
+          obj = bucket.objects.with_prefix("#{res["s3_file_key"]}/")
+        end
+      end
+    end
+    display "pulled data from relation ##{id} to file #{file}"
+
+  end
+  alias_command "rl:pull", "relations:pull"
+
+  # relations:pull:s3 ID S3_KEY S3_SECRET S3_BUCKET S3_FILE_PATH
+  #
+  # pulls relation data to S3_BUCKET/FILE_PATH/
+  #
+  # --type TYPE # interpret file as type [csv, xlsx]
+  #
+  def pull_to_s3
+
+    id = options[:id] || shift_argument
+    error "no id given" if id.nil?
+
+    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_path = options[:s3_file_path] || 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_path.nil?
+
+    s3_params = {:s3_access_key => user_s3_access_key, :s3_secret => user_s3_secret, 
+                 :s3_bucket => user_s3_bucket, :s3_object_key => user_s3_file_path}
+
+    res = self.api.data.pull_to_s3(id, s3_params)
+    display "downloading relation data 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
+  alias_command "relations:pull:s3", "relations:pull_to_s3"
+  alias_command "rl:pull:s3", "relations:pull_to_s3"
+
 
   # relations:show ID
   #
@@ -246,11 +331,16 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
 
 
 
-  def set_relation_properties(schema,is_public)
-    valid_types=["STRING", "NUMERIC", "FLOAT"]
+  def set_relation_properties(schema,is_public,description)
+    if description.nil?
+      display "Enter a description for your relation (defaults to empty string)."
+      description = ask.strip
+    end
+
+    valid_types=["STRING", "INTEGER", "FLOAT"]
     meta_names=["confidence", "since", "source"]
     if schema.nil?
-      schema = []
+      schema = ""
       
       # Get the column types (required)
       index = 1
@@ -261,7 +351,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
         display "Column #{index} name (empty when done): ", false
         cname = ask.strip
         break if cname == "" || cname.nil?
-        if((cname[0].downcase == "v" and cname[1...-1].respond_to?("to_i") and cname[1...-1].to_i >= 0) or meta_names.member?(cname.downcase))
+        if(cname =~ /^v[0-9]+$/i or meta_names.member?(cname.downcase))
           warn "\"v[number]\", \"confidence\", \"since\" and \"source\" are special names in Zillabyte. Please name your column name something else."
           next
         end
@@ -277,27 +367,64 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
           next
         end   
         index += 1
-        schema << {cname => ctype}
+        schema += "#{cname}:#{ctype},"
         already_aliased[cname] = 1
+      end  
+      schema = schema[0...-1] 
+    end
+    schema = schema.split(",").map { |x| Hash[*x.split(":")] }
+    display "using schema: #{schema.to_json}"
+
+    if is_public.nil?
+      while true
+        display "Would you like your relation to be public? (yes or no)"
+        pp = ask.strip.downcase
+        if(pp == "yes" or pp == "y")
+          is_public = "public"
+          break
+        elsif(pp == "no" or pp == "n")
+          is_public = "private"
+          break
+        end
       end
-      
-      display "using schema: #{schema.to_json}"
-      
     end
-    {:schema => schema, :public => is_public}
+
+    {:schema => schema, :public => is_public, :description => description}
   end
 
   def sanity_check_file(file,type,dataset)
     rows = []
-    
+  
+    n_columns = dataset["columns"].size
+    float_cols = []
+    int_cols = []
+    (0...n_columns).each do |i|
+      value = dataset["columns"][i].values[0].downcase
+      # use integer instead of numeric to be consistent with multilang type declarations
+      if(value == 'integer')
+        int_cols << i
+      elsif(value == "float")
+        float_cols << i
+      end
+    end
+
     case type
     when "csv"
       CSV.foreach(file) do |row|
-        if row.size != dataset['columns'].size
-          puts "relation expect #{dataset['columns'].size} column(s). Found a row with #{row.size}::\n #{row}" 
-        else
-          rows << row
+        if row.size != n_columns
+          error "relation expect #{n_columns} column(s). Found a row with #{row.size}::\n #{row}"
+        end
+        float_cols.each do |i|
+          if(!(row[i] =~ /^[+-]?(\d+(.\d+)?)$/))
+            error "column #{i+1} should be a FLOAT in row::\n #{row}"
+          end
+        end
+        int_cols.each do |i|
+          if(!(row[i] =~ /^[+-]?(\d+)$/))
+            error "column #{i+1} should be an INTEGER in row::\n #{row}"
+          end
         end
+        rows << row
       end
       
     else

data/lib/zillabyte/cli/templates/js/simple_function.js

@@ -9,8 +9,8 @@ function prep(controller) {
  * of machines.
  */
 function exec(controller, tuple) {
-  if(tuple.values["html"].indexOf("hello world") !== -1) {
-    controller.emit("has_hello_world",{"url":tuple.values["url"]});
+  if(tuple["html"].indexOf("hello world") !== -1) {
+    controller.emit("has_hello_world",{"url":tuple["url"]});
   }
 }
 

data/lib/zillabyte/cli/templates/python/simple_function.py

@@ -7,8 +7,8 @@ def prep(controller):
 # web page.  This algorithm is run in parallel on possibly hundreds
 # of machines.
 def execute(controller, tup):
-  if("hello world" in tup.values["html"]):
-    controller.emit("has_hello_world",{"url":tup.values["url"]})
+  if("hello world" in tup["html"]):
+    controller.emit("has_hello_world",{"url":tup["url"]})
   return
 
 zillabyte.simple_function(\

data/lib/zillabyte/cli/templates/ruby/Gemfile.lock

@@ -0,0 +1,37 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    ascii_charts (0.9.1)
+    chronic (0.10.2)
+    colorize (0.6.0)
+    excon (0.31.0)
+    i18n (0.6.9)
+    indentation (0.1.1)
+    mime-types (2.1)
+    multi_json (1.8.4)
+    netrc (0.7.7)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    terminal-table (1.4.5)
+    zillabyte (0.0.9)
+      zillabyte-cli
+    zillabyte-cli (0.0.10)
+      activesupport (~> 3.2.11)
+      ascii_charts (~> 0.9.1)
+      bundler (~> 1.3)
+      chronic (~> 0.10)
+      colorize (~> 0.6)
+      excon (~> 0.31)
+      indentation (~> 0.1)
+      netrc (~> 0.7.7)
+      rest-client (~> 1.6.1)
+      terminal-table (~> 1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  zillabyte

data/lib/zillabyte/cli/templates/ruby/simple_function.rb

@@ -19,15 +19,15 @@ Zillabyte.simple_function do |fn|
   fn.execute do |controller, tuple|
     
     # get the fields
-    url = tuple['v0']
-    html = tuple['v1']
+    url = tuple['url']
+    html = tuple['html']
     
     # For the purpose of this test, to show results from the test set,
     # we'll loosen the search to include either hello or world
     # instead of
     # if html.include?('hello world')
-    if html.include?('hello') or html.include?('world')
-      controller.emit("URL" => url)
+    if html.include?('hello world')
+      controller.emit("has_hello_world", "URL" => url)
     end
     
   end

data/zillabyte-cli.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "chronic", "~> 0.10"
   spec.add_dependency "ascii_charts", "~> 0.9.1"
   spec.add_dependency "indentation", "~> 0.1"
+  spec.add_dependency "aws-sdk", "~> 1.33.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -187,6 +187,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.33.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.33.0
 description: The Official Zillabyte CLI Gem
 email:
 - gem@zillabyte.com
@@ -217,7 +233,6 @@ files:
 - lib/zillabyte/cli/help.rb
 - lib/zillabyte/cli/helpers/data_schema_builder.rb
 - lib/zillabyte/cli/host.rb
-- lib/zillabyte/cli/logs.rb
 - lib/zillabyte/cli/query.rb
 - lib/zillabyte/cli/relations.rb
 - lib/zillabyte/cli/sources.rb
@@ -227,6 +242,7 @@ files:
 - lib/zillabyte/cli/templates/python/simple_function.py
 - lib/zillabyte/cli/templates/python/zillabyte.conf.yaml
 - lib/zillabyte/cli/templates/ruby/Gemfile
+- lib/zillabyte/cli/templates/ruby/Gemfile.lock
 - lib/zillabyte/cli/templates/ruby/simple_function.rb
 - lib/zillabyte/cli/templates/ruby/zillabyte.conf.yaml
 - lib/zillabyte/cli/version.rb
@@ -239,6 +255,7 @@ files:
 - lib/zillabyte/helpers.rb
 - lib/zillabyte/queries.rb
 - lib/zillabyte-cli/version.rb
+- lib/zillabyte-cli/version.rb~
 - lib/zillabyte-cli.rb
 - LICENSE
 - README.md

data/lib/zillabyte/cli/logs.rb

@@ -1,117 +0,0 @@
-require "zillabyte/cli/base"
-require "pty"
-require 'colorize'
-
-# manage custom logs
-#
-class Zillabyte::Command::Logs < Zillabyte::Command::Base
-
-
-
-  
-  
-  # logs:show FLOW_ID [OPERATION]
-  #
-  # shows the logs
-  # 
-  # -t, --tail  # continuously watches for new results
-  # -v, --verbose LEVEL  # sets the verbosity (error, info, debug) (default: info)
-  #
-  def show
-
-    flow_id = options[:flow] || shift_argument
-    operation_id = options[:operation] || shift_argument || '_ALL_'
-    tail = options[:tail]
-    priority = options[:verbose] || 'debug'
-    carry_settings = {
-      :priority => priority
-    }
-    api_options = {}
-    
-    error "no id given" if flow_id.nil?
-    
-    begin
-      
-      res = self.api.logs.get(flow_id, operation_id, api_options)
-
-      carry_settings = show_log_output(res, carry_settings)
-      api_options[:since] = carry_settings[:since]
-      
-      if (tail)
-        sleep(5) # HACK
-      end
-    end while(tail)
-
-  end  
-  alias_command "logs", "logs:show"
-
-
-
-
-
-
-
-  private
-  
-  def show_log_output(lines, settings = {})
-    
-    @colors ||= [:green, :yellow, :magenta, :cyan, :light_black, :light_green, :light_yellow, :light_blue, :light_magenta, :light_cyan]
-
-    max_category_size = 0
-    all_lines = []
-    
-    lines.each_pair do |operation, lines|
-      settings[operation] ||= {}      
-      settings[operation][:color] ||= @colors.shift
-      lines.each do |line_h|
-        
-        line = line_h['line']
-        priority = line_h['priority']
-        date = line_h['date']
-        
-        all_lines << {
-          :line => line,
-          :category => operation,
-          :priority => priority,
-          :color => settings[operation][:color],
-          :date => date
-        }
-        max_category_size = [max_category_size, operation.size].max
-        
-        if settings[:since]
-          settings[:since] = [date, settings[:since]].max
-        else
-          settings[:since] = date
-        end
-        
-      end
-      
-    end
-    
-    all_lines.sort! do |a,b|
-      a[:date] <=> b[:date]
-    end
-    
-    requested_priority = settings[:priority]
-
-    all_lines.each do |h|
-      color = h[:color]
-      
-      case h[:priority]
-      when 'error'
-        color = :red if h[:priority] == 'error'
-      when 'info'
-        next if ['error'].member?(requested_priority)
-      when 'system'
-      when 'debug'
-        next if ['info', 'error'].member?(requested_priority)
-      end
-      
-      display "#{h[:category].rjust(max_category_size)} #{h[:priority].rjust(6)} - #{h[:line]}".colorize(color)
-    end
-    
-    settings
-  end
-  
-
-end