zillabyte-cli 0.9.24 → 0.9.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzUxOTcyYjZiYTZiYmE2YTA0M2FhMmI3OGM5NzM2NTQxOWY4ZmI3Yw==
+    ZGEwYzFlOWIyNTcxMjcwNDhlMDE0ODhlYzI1ODY4Y2EyOWQ0NDYzOQ==
   data.tar.gz: !binary |-
-    YmIzZmNiMzJiYjQ5MzhhMjk2MDU4MjEyNDc0N2E0NmM3YmVkYWZhMg==
+    NTQ5YzllZjNkZWIyYTA0Mjc2OWZjYjI4ODdhMTk4N2ZkZjRhN2M5MQ==
 SHA512:
   metadata.gz: !binary |-
-    MmI1ZWUyMjUyZTUxMDNhNWEzYzg1OTg3NjI3NWI0YzJiMDc2Mjc2Yzk3NTE2
-    ODZlOGQ5Y2JkODU2ZGMyYzQ5MTcyOGQ1NWYxMzRiNzc1NWZlYjYxNDM1OTMx
-    OWZjM2Y5ZGY2OGFkM2M0MDVkMTZjZDUzYzAwNWQ2MDZkMDBlNGU=
+    MjM0Mjk3NzM1MGQ4ZWNlMjE0YTlhZGVlMThmZjJiMmRmN2U3NGQ3NDk3MGFk
+    NTE2NjQyYzNhMGEzMGJiNzhkMWVkZWExMjdlM2MxZWFkY2IzMTkxZjVhYjM5
+    MTY5NjI3YzE4MTY5YzExNjk1YTNlOGNjNTMwNjA5NGQzYTBhMmM=
   data.tar.gz: !binary |-
-    YzcyYWI2OGUzNWI3ODk3NmI4YjIzNTY3ZDY3M2E2OTU0MmE1OTkyYjVlYWQ4
-    NmI4NDQ1MzNmNWI0MjU0YzAyNjY4MTIwMjBmODcyYmU4NWIwMGViMThkODIx
-    MmU0YzZlYzMxYTc1ZDQ5NDc0MTMxMzNhMjE4YThmYjgzZTI5NWY=
+    MTEzYjE1OGRiNDEyYTFhNjA3NGM5MjZhYzQzOGFlMWZhNzlmOTBmOGQ3NzYw
+    MjEyMjRkMjcwOWVhMjNiNjdhNzk2NjE4YmJlYTQ0Mjk2MTk2MDFiOGViNzVh
+    NTUzZDkzY2JkZTI2NTY2OTNkOGUzODM5N2UxNTE1ZGQzYmNlZmE=

data/lib/zillabyte/cli/download.rb

@@ -41,7 +41,7 @@ class Zillabyte::Command::Download < Zillabyte::Command::Base
       # Delete old jar(s)
       FileUtils.rm_rf("#{jar_home}/.", secure: true) if !jars.empty?
       # Copy new jar from gmb
-      `cp ~/zb1/motherbrain.jvm/open_grandmotherbrain/target/#{LATEST_JAR_VERSION}.jar #{jar_home}`
+      `cp ~/zb1/motherbrain/target/#{LATEST_JAR_VERSION}.jar #{jar_home}`
       current_jar_version = LATEST_JAR_VERSION
     else
       if !jars.empty?

data/lib/zillabyte/cli/flows.rb

@@ -675,7 +675,8 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # Run a flow locally with sample data.
   # 
   # --dir DIR                                   # Flow directory
-  # --input_file  INTPUT_FILE                   # Input csv file containing parameters for multiple queries
+  # --input_file    INTPUT_FILE                 # Input csv file containing parameters for multiple queries to an rpc
+  # --output_prefix OUTPUT_PREFIX               # Prefix for output file containing app results. Results will be stored in [prefix]_[sink_name].csv for each sink.
   # --env ENV                                   # HIDDEN
   # --use_local_jar                             # HIDDEN
   #
@@ -696,7 +697,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       exit
     end
 
-    if meta["flow_type"] == "component"
+    if meta["flow_type"] == "component" #component
       file = options[:input_file]
 
       component_input_stream = nil
@@ -736,6 +737,8 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
         exit(1)
       end
       component_args = {component_input_stream => component_args}
+    else #app
+      output_prefix = options[:output_prefix]
     end
 
     # Check that multilang version is atleast 0.1.0
@@ -761,6 +764,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       cmd += " --api.host api.zillabyte.com --api.port 80"
     end 
     cmd += " --rpc.args #{Shellwords.escape(component_args.to_json)}" if component_args
+    cmd += " --output.prefix #{output_prefix}" if output_prefix
 
     match_str = "[f#{meta["name"]}]"
     display "Begin local execution..."

data/lib/zillabyte/common/log_fetcher.rb

@@ -22,15 +22,10 @@ class LogFetcher
     exit_on = [exit_on] unless exit_on.is_a?(Array)
 
     @color_map = {}
-
-    local_file = "/tmp/flows/f#{hash["flow"]}/flow_logs/flow_#{hash["flow"]}.log"
-    if(hash["server"] == "localhost" && File.exists?(local_file))
-      cmd = "tail -n 500 -F \"#{local_file}\""
-    else
-      cmd = "curl -G http://#{hash["flow"]}:#{hash["token"]}@#{ip}:#{hash["port"]}/getLogs?flow=#{hash["flow"]}"
-    end
     
-
+    # TODO: (nitpick) we should use ruby instead of shelling to curl -- we can't guarantee curl will exist 
+    cmd = "curl -G http://#{hash["flow"]}:#{hash["token"]}@#{ip}:#{hash["port"]}/getLogs?flow=#{hash["flow"]}"
+    
     begin  
       PTY.spawn( cmd ) do |r, w, pid|
         @pid = pid;

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.9.24"
+    VERSION = "0.9.25"
   end
 end

metadata

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