zillabyte-cli 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11fa3e9bf4153e02116008ae0f04067004f00f47
-  data.tar.gz: 5b0a30dbddda2dfd3f03e5309f91802bad78cae1
+  metadata.gz: aa7c1271f40be305d46a9c440926de250e2bcbb5
+  data.tar.gz: a840c1321b322b4824d11fb03c46112cadfab23f
 SHA512:
-  metadata.gz: 163b0f3e39bcdd1f4565f39c16e658d18beef3a75127b1ea158f720a22b63773db514ccd6aaf6f1a1cdc490278a07eaca4e72dabe648cb09e47e0f4955fcfbd0
-  data.tar.gz: 9d3a5f6de29ec004f5f0accbd1806e836eac2e4218694dd72fd69d4c2e9e9bf506283da2b26c3773612eee838fd7cf6330e915f4bba59ae644d53fbe790bc3f1
+  metadata.gz: 382f3fc91b512bec0f75d621f1c9d21a1a0528a955c70e9289fe0d27b149a22b6f6fcecdf1137afada30e963e19915a73a3214908c881e4441ce3cc4d6dab200
+  data.tar.gz: cf13694d82ae79a5770a59d0e63c50f589f7e12981e58c4446828a6f6a12572bb076b47f1b36fcffb3ff0ccb66a506362f7e3720fcb7b6ba2833eaa85102d61e

data/lib/zillabyte/runner/component_operation.rb

@@ -1,4 +1,3 @@
-require "zillabyte/runner/multilang_operation"
 
 
 
@@ -12,6 +11,8 @@ class Zillabyte::Runner::ComponentOperation
 
   # Run the operation
   def self.run(node, dir, consumee_pipes, consumer_pipes, tester, meta, options = {})
+    require "zillabyte/runner/multilang_operation"
+    require("zillabyte/runner/operation")
 
     @__node = node
     @__name = node["name"]
@@ -165,7 +166,7 @@ class Zillabyte::Runner::ComponentOperation
           end
         end
         tuple_json = build_tuple_json(tuple)
-        display_json = Hash[JSON.parse(tuple_json)["tuple"].map {|k,v| [truncate_message(k), truncate_message(v)]}].to_json
+        display_json = Hash[JSON.parse(tuple_json)["tuple"].map {|k,v| [Zillabyte::Runner::Operation.truncate_message(k), Zillabyte::Runner::Operation.truncate_message(v)]}].to_json
         send_to_consumers(tuple_json)   
       end
 
@@ -231,7 +232,7 @@ class Zillabyte::Runner::ComponentOperation
             rpc_inputs << obj['tuple'][field.keys[0]]
           end
 
-          display_json = Hash[obj['tuple'].map{|k, v| [truncate_message(k), truncate_message(v)]}].to_json
+          display_json = Hash[obj['tuple'].map{|k, v| [Zillabyte::Runner::Operation.truncate_message(k), Zillabyte::Runner::Operation.truncate_message(v)]}].to_json
           
 
           # Send RPC call
@@ -504,7 +505,6 @@ class Zillabyte::Runner::ComponentOperation
     end
   end
 
-
   # Get the write pipe of the stream consumer
   def self.get_write_stream(stream, consumer, number=1)
      wr_pipe = "wr_parent_" + number.to_s
@@ -537,7 +537,7 @@ class Zillabyte::Runner::ComponentOperation
   # Emit tuple_json to the consumer of a stream
   def self.emit_consumer_tuple(stream, consumer, tuple_json)
     begin
-      display_json = Hash[JSON.parse(tuple_json)["tuple"].map {|k,v| [truncate_message(k), truncate_message(v)]}].to_json
+      display_json = Hash[JSON.parse(tuple_json)["tuple"].map {|k,v| [Zillabyte::Runner::Operation.truncate_message(k), Zillabyte::Runner::Operation.truncate_message(v)]}].to_json
     rescue JSON::ParserError
       cdisplay "Error: invalid JSON"
     end

data/lib/zillabyte/runner/multilang_operation.rb

@@ -14,6 +14,7 @@ module Zillabyte; module Runner; class MultilangOperation
   def self.run(node, dir, consumee_pipes, consumer_pipes, tester, meta, options = {})
     require("mkfifo")
     require("zillabyte/runner/component_operation")
+    require("zillabyte/runner/operation")
 
     require("pty")
     require("open3")
@@ -84,7 +85,7 @@ module Zillabyte; module Runner; class MultilangOperation
           end
 
           tuple_json = build_tuple_json(tuple)
-          display_json = Hash[JSON.parse(tuple_json)["tuple"].map {|k,v| [truncate_message(k), truncate_message(v)]}].to_json
+          display_json = Hash[JSON.parse(tuple_json)["tuple"].map {|k,v| [Zillabyte::Runner::Operation.truncate_message(k), Zillabyte::Runner::Operation.truncate_message(v)]}].to_json
           send_to_consumers(tuple_json)   
       end
 
@@ -1167,7 +1168,7 @@ module Zillabyte; module Runner; class MultilangOperation
       if obj['tuple']
 
         tuple = obj['tuple']
-        display_json = Hash[obj['tuple'].map{|k, v| [truncate_message(k), truncate_message(v)]}].to_json
+        display_json = Hash[obj['tuple'].map{|k, v| [Zillabyte::Runner::Operation.truncate_message(k), Zillabyte::Runner::Operation.truncate_message(v)]}].to_json
 
         if col_map.keys.length != tuple.keys.length
           cdisplay "Error: invalid keys for sink tuple : Expected #{col_map.keys} , got: #{tuple.keys}"
@@ -1355,7 +1356,6 @@ module Zillabyte; module Runner; class MultilangOperation
   end
 
 
-
   # Handshake connection to multilang
   def self.handshake(write_stream, read_stream)
     begin
@@ -1458,7 +1458,7 @@ module Zillabyte; module Runner; class MultilangOperation
   # Emit tuple_json to the consumer of a stream
   def self.emit_consumer_tuple(stream, consumer, tuple_json)
     begin
-      display_json = Hash[JSON.parse(tuple_json)["tuple"].map {|k,v| [truncate_message(k), truncate_message(v)]}].to_json
+      display_json = Hash[JSON.parse(tuple_json)["tuple"].map {|k,v| [Zillabyte::Runner::Operation.truncate_message(k), Zillabyte::Runner::Operation.truncate_message(v)]}].to_json
     rescue JSON::ParserError
       cdisplay "Error: invalid JSON"
     end

data/lib/zillabyte/runner/operation.rb

@@ -1,11 +1,18 @@
 require 'json'
 require 'mkfifo'
-require "zillabyte/runner"
 
 
 # Shared state between operations
-class Zillabyte::Runner::Operation
+module Zillabyte; module Runner; class Operation
 
+  # Format a message for display
+  def self.truncate_message(msg)
+    return msg if(!msg.instance_of?(String))
+    t_length = 50 # truncates entries to this length
+    m_length = msg.length
+    msg_out = m_length > t_length ? msg[0..t_length-3]+"..." : msg
+    msg_out
+  end
   
-end
+end; end; end
 

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.1.21"
+    VERSION = "0.1.22"
   end
 end

metadata

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