zillabyte-cli 0.9.20 → 0.9.21

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 5515d58cd964146df11ecf8fc09f45c0b1523ade
-  data.tar.gz: e1cf65e6a80d83150274d1f37d7ec2d06a36f310
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGNjNWZjOTI0NzM5OTA3Y2MwZGQ2NDZiOTEwZTJjMmVlOTU4ZGM5NQ==
+  data.tar.gz: !binary |-
+    MmE5ZjA2ZDM5Njc2ZGY2Y2FhMzA0NTEyMGI1MTIxYTZjYmFjOTgyMg==
 SHA512:
-  metadata.gz: 1f2a4a288347421d685fb12373702ee066fc9b5856863d4f04b83e7e3939afbcab8ff502ed63df009a709adb0f07d9fecc2647c71ae9aa2a61fd0bd8758b7e73
-  data.tar.gz: fa7a710aad4484c6d564e530c2af8873200430443789b2d524c62d7c27fbfc61fa293c22c25e460b980c4b9fb2846423cb35c071f466841426960cdb165371fe
+  metadata.gz: !binary |-
+    MjhhMTNlMjgwYTM3YjY0OTU3OWE3ZmUwMTQzN2QzMDRkMDA5NTZlODU2MmEw
+    NjVmZWJhODAwNjcxNmY4ZGRmNTA0N2ZmM2ExYTQ2ODNiNWRhNzVlNjhkNzhm
+    NGU0ODExNjBjMzYxNTZhYzVhZWY1MDJhM2VmZjZlNWFkNDI3Nzk=
+  data.tar.gz: !binary |-
+    MjczNTMzZDBlMDM1OTZmNjkyODI1MGJiZmI5ZDU5NTVjNmIyZDMwNWM1ZGNk
+    NjAzM2ZlYWMwYjhjZGE3NDUzYWMwYjQ0NzAzYzBhMjNhNTFlZjViNTZkM2Zj
+    ZTRmZDAzMWNlM2M1NDBlZTEwMTAzMmQzN2UzOWViN2NjNjY5Mzg=

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.9.20"
+    VERSION = "0.9.21"
   end
 end

data/lib/zillabyte/api/components.rb

@@ -19,12 +19,12 @@ class Zillabyte::API::Components < Zillabyte::API::Flows
 
     body = res.body
     body.map do |component|
-      next if component["schema"].nil?
+      next if component["nodes"].nil?
 
       inputs = ""
       outputs = ""
 
-      nodes = component["schema"]["nodes"]
+      nodes = component["nodes"]
       next if nodes.nil?
       nodes.each do |node|
         if node["type"] == "input" or node["type"] == "source"

data/lib/zillabyte/cli/base.rb

@@ -170,6 +170,21 @@ class Zillabyte::Command::Base
   def session
     self
   end
+
+  def version_okay?(current_version, min_version)
+    current_version = current_version.split(".").map {|v| v.to_i}
+    minimum_version = min_version.split(".").map {|v| v.to_i}
+    if current_version[0] > minimum_version[0]
+      return true
+    elsif current_version[0] == minimum_version[0]
+      if current_version[1] > minimum_version[1]
+        return true
+      elsif current_version[1] == minimum_version[1]
+        return true if current_version[2] >= minimum_version[2]
+      end
+    end
+    return false
+  end
   
   
 end

data/lib/zillabyte/cli/data.rb

@@ -169,6 +169,36 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
   
   
   
+  
+  
+
+  # data:readme ID FILE
+  #
+  # Attaches a README file to a dataset
+  #
+  # #HIDDEN
+  def readme
+
+    id = options[:id] || shift_argument
+    file = options[:file] || shift_argument
+    error("no id given", type) if id.nil?
+    error("no file given", type) if file.nil? 
+    error("file doesn't exist") unless File.exists?(file)
+    content = File.read(file)
+
+    res = self.api.request(
+      :expects  => 200,
+      :method   => :post,
+      :path     => "/relations/#{CGI.escape(id)}/readme",
+      :body     => {:filename => file, :content => content}.to_json
+    )
+
+    display "README updated"
+  end
+  
+  
+  
+  
   # data:append ID FILE
   #
   # Adds data to an existing dataset.
@@ -406,7 +436,7 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
           if options[:no_truncation]
             obj[heading]
           else
-            if obj[heading].to_s.size > 30
+            if obj[heading].to_s.size > 30 && type != "json"
               obj[heading].to_s[0..30] + "..."
             else
               obj[heading]

data/lib/zillabyte/cli/download.rb

@@ -0,0 +1,67 @@
+require("zillabyte/cli/base")
+
+# HIDDEN: downloads the zillabyte openGMB jar
+#
+class Zillabyte::Command::Download < Zillabyte::Command::Base
+
+  MIN_LOCAL_JAR_VERSION = "0.0.1"
+  LATEST_JAR_VERSION = "0.0.1"
+  MIN_JAVA_VERSION = "1.7.0"
+
+  # --local                                   # HIDDEN
+  def jar(local = false)
+    local = true if options[:local]
+
+    # Check that java exists
+    display "Checking Java Runtime Environment version..."
+    java_version = `java -version 2>&1`
+    match = /(\d+\.\d+\.\d+)/.match(java_version)
+    if match
+      java_version = match.captures.first
+      display "JRE #{java_version} found."
+      if !version_okay?(java_version, MIN_JAVA_VERSION)
+        display "Your version of the Java Runtime Environment, #{java_version}, is incompatible with the Zillabyte jar. Please install JRE version > #{MIN_JAVA_VERSION}."
+        return
+      end
+    else
+      display "Java Runtime Environment not found. Please install JRE version > #{MIN_JAVA_VERSION}."
+      return
+    end
+
+    # Create the jar home if it doesn't exist
+    require ('fileutils')
+    jar_home = "#{Dir.home}/.zillabyte/jars"
+    FileUtils.mkdir_p(jar_home)
+
+    # Check the jar version
+    jars = Dir.glob("#{jar_home}/*.jar")
+    current_jar_version = "0.0.0"
+    if local
+      # For zb engineers: use dev open_gmb jar from local repo
+      # 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}`
+      current_jar_version = LATEST_JAR_VERSION
+    else
+      if !jars.empty?
+        current_jar_version = /^(\d+\.\d+\.\d+)\.jar$/.match(jars.first.split("/").last).captures.first
+        display "Found Zillabyte jar version #{current_jar_version}."
+      end
+      if jars.size > 1 or !version_okay?(current_jar_version, MIN_LOCAL_JAR_VERSION)
+        # delete the old jar(s)
+        FileUtils.rm_rf("#{jar_home}/.", secure: true) if !jars.empty?
+
+        # download the new jar
+        display "The Zillabyte jar was not found or your jar is outdated. Downloading the latest Zillabyte local jar..."
+        `cd #{jar_home} && curl -O https://s3.amazonaws.com/downloads.zillabyte.com/#{LATEST_JAR_VERSION}.jar`
+        current_jar_version = LATEST_JAR_VERSION
+      end
+    end
+
+    # Return the jar path
+    "#{jar_home}/#{current_jar_version}.jar"
+  end
+  alias_command "jar", "download:jar"
+
+end

data/lib/zillabyte/cli/flows.rb

@@ -100,13 +100,11 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       flows.each do |flow|
         if flow_name == flow["name"]
           if flow["state"] == "RUNNING"
-            display "An app/component with this name is already running. If you continue to push, the running app/component with this name will be terminated.  Would you like to continue to push?[y/N]", false
-
-            input = ask
-          
+            
+            display "This flow is already running and will be terminated. Continue? [y/N]: ", false
+            input = ask          
             if !(input.downcase == "y" || input.downcase == "yes")
               return
-
             end
           end
           break
@@ -114,9 +112,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       end
     end 
     
-
-
-
     res = api.flows.push_directory dir, hash, session, options
 
     if res['error']
@@ -125,7 +120,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       display "#{flow_type} ##{res['id']} #{res['action']}" if type.nil?
     end
 
-    display "Setting up your #{flow_type}...please wait..." if type.nil?
+    display "Setting up your #{flow_type}... please wait..." if type.nil?
     sleep(2) # wait for kill command 
 
     hash = self.api.logs.get(res['id'], nil, options)
@@ -134,8 +129,12 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     elsif flow_type == "component"
       fetch_logs(hash, "_ALL_", ["Component registered", "STOP_LOGGING"])
     end
-
-    display "{}" if type == "json"
+    
+    if type == "json"
+      display "{}" 
+    else
+      display "Flow deployed: #{get_flow_ui_link(res).colorize(:light_yellow)}"
+    end
 
   end
   alias_command "push", "flows:push"
@@ -316,7 +315,10 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       :body => options.to_json
     )
 
-    return if res.body.nil? or res.body["state"].nil?
+    return if res.body.nil?
+    error(res.body["error"], type) if res.body["error"]
+    return if res.body["state"].nil?
+
     flow_state = res.body["state"]
     if type.nil?
       display "State: #{flow_state}"
@@ -627,24 +629,23 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
 
 
-  # flows:local
+  # flows:local [RPC_ARGS]
   #
   # Run a flow locally with sample data.
   # 
-  # --config CONFIG_FILE                        # Use the given config file
-  # --input INPUT_FILE                          # Uses a CSV for component input (only applicable for components)
-  # --output OUTPUT_FILE                        # Writes sink output to a file
-  # --cycles CYCLES                             # Number of cycles to emit [default 1] (only applicable for apps)
   # --dir DIR                                   # Flow directory
-  # -i, --interactive                           # Interactively control input and read output (only applicable for apps)
+  # --input_file  INTPUT_FILE                   # Input csv file containing parameters for multiple queries
+  # --env ENV                                   # HIDDEN
+  # --use_local_jar                             # HIDDEN
   #
   def local
-     dir = options[:dir]
+    dir = options[:dir]
     if dir.nil?
       dir = Dir.pwd
     else
       dir = File.expand_path(dir)
     end
+    env = options[:env] || "prod"
     
     # Get the flow_type
     require("zillabyte/api/flows")
@@ -654,37 +655,90 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       exit
     end
 
+    if meta["flow_type"] == "component"
+      file = options[:input_file]
+
+      component_input_stream = nil
+      fields = []
+      meta["nodes"].each do |node|
+        if node["type"] == "input"
+          component_input_stream = node["name"]
+          fields = node["fields"].map {|field| field.keys.first}
+          break
+        end
+      end
+
+      component_args = []
+      if file
+        require('csv')
+        CSV.foreach(file) do |line|
+          line_arg = {}
+          line.each_with_index do |l, i|
+            line_arg[fields[i]] = l
+          end
+          component_args << line_arg
+        end 
+      else
+        args = {}
+        count = 0
+        while(true) do
+          next_arg = shift_argument
+          break if next_arg.nil?
+          args[fields[count]] = next_arg
+          count += 1
+        end
+        component_args << args if !args.empty?
+      end
+
+      if component_args.empty?
+        display "No input arguments given for RPC. Please see 'zillabyte help test' or 'zillabyte help local' for details."
+        exit(1)
+      end
+      component_args = {component_input_stream => component_args}
+    end
+
     # Check that multilang version is atleast 0.1.0
     version = meta["multilang_version"] || "0.0.0"
-    version_arr = version.split('.').map {|v| v.to_i}
-    if version_arr.empty? || (version_arr[0] == 0 && version_arr[1] < 1)
+    if !version_okay?(version, Zillabyte::CLI::VERSION)
       display "The version of zillabyte used in your flow is outdated."
       display "Please upgrade your zillabyte gem via 'bundle update zillabyte; gem cleanup zillabyte'"
       return
     end
 
-    case meta["flow_type"]
-    when "component"
-      require("zillabyte/runner/component_runner")
-      runner = Zillabyte::Runner::ComponentRunner.new()
-    when "app"
-      require("zillabyte/runner/app_runner")
-      runner = Zillabyte::Runner::AppRunner.new()
-    else
-      # Default to App
-      require("zillabyte/runner/app_runner")
-      runner = Zillabyte::Runner::AppRunner.new()
-    end
-
-    # Start Runner
-    runner.run(meta, dir, self, options)
+    # Take care of downloading the jar
+    local = options[:env] == "local" || options[:use_local_jar] ? true : false
+    jar_path = Zillabyte::Command::Download.new.jar(local)
 
+    # Submit app to jar
+    require('pty')
+    require('json')
+    require('shellwords')
+    cmd = "java -jar #{jar_path} --flow.name #{meta["name"]} --flow.class #{meta["flow_type"]} --directory #{dir}"
+    if env == "test" or env == "staging"
+      cmd += " --api.host test.api.zillabyte.com --api.port 80"
+    elsif env == "prod"
+      cmd += " --api.host api.zillabyte.com --api.port 80"
+    end 
+    cmd += " --rpc.args #{Shellwords.escape(component_args.to_json)}" if component_args
+
+    match_str = "[f#{meta["name"]}]"
+    display "Begin local execution..."
+    PTY.spawn(cmd) do |r, w, pid|
+      done_cycle = false
+      r.each do |line|
+        #display line
+        if(line.include? match_str)
+          line = line.chomp!.split(match_str).last
+          display line if !done_cycle
+        end
+        done_cycle = true if(line.include? "[app] Transitioned to state WAITING" or line.include? "[app] Transitioned to state IDLE")
+      end
+    end
   end
   alias_command "test", "flows:local"
   alias_command "local", "flows:local"
 
 
-
   # flows:kill ID
   #
   # Kills the given flow.

data/lib/zillabyte/helpers.rb

@@ -311,7 +311,18 @@ module Zillabyte
       require 'pathname'
       Pathname.new(dir).relative_path_from(Pathname.new(Dir.pwd)).to_s
     end
- 
+
+    def get_flow_ui_link(res) 
+      if res['id']
+        if ENV['ZILLABYTE_API_HOST'] == "api.zillabyte.com"
+          "http://app.zillabyte.com/flows/#{res['id']}"
+        else
+          "http://#{ENV['ZILLABYTE_API_HOST']}:#{ENV['ZILLABYTE_API_PORT']}/flows/#{res['id']}"
+        end
+      else
+        "http://app.zillabyte.com/flows"
+      end
+    end
 
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.21
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.31'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: indentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 description: The Official Zillabyte CLI Gem
@@ -151,7 +151,6 @@ files:
 - bin/zb
 - bin/zbd
 - bin/zillabyte
-- lib/#zillabyte-cli.rb#
 - lib/zillabyte-cli.rb
 - lib/zillabyte-cli/version.rb
 - lib/zillabyte/api.rb
@@ -169,8 +168,6 @@ files:
 - lib/zillabyte/api/zillalogs.rb
 - lib/zillabyte/auth.rb
 - lib/zillabyte/cli.rb
-- lib/zillabyte/cli/#logs.rb#
-- lib/zillabyte/cli/#repl.rb#
 - lib/zillabyte/cli/apps.rb
 - lib/zillabyte/cli/auth.rb
 - lib/zillabyte/cli/base.rb
@@ -178,6 +175,7 @@ files:
 - lib/zillabyte/cli/config.rb
 - lib/zillabyte/cli/counters.rb
 - lib/zillabyte/cli/data.rb
+- lib/zillabyte/cli/download.rb
 - lib/zillabyte/cli/flows.rb
 - lib/zillabyte/cli/git.rb
 - lib/zillabyte/cli/help.rb
@@ -206,7 +204,6 @@ files:
 - lib/zillabyte/cli/templates/components/ruby/Gemfile
 - lib/zillabyte/cli/templates/components/ruby/component.rb.erb
 - lib/zillabyte/cli/templates/components/ruby/zillabyte.conf.yaml
-- lib/zillabyte/cli/templates/python/#simple_function.py#
 - lib/zillabyte/cli/untitled.md
 - lib/zillabyte/cli/version.rb
 - lib/zillabyte/cli/zillalogs.rb
@@ -216,12 +213,6 @@ files:
 - lib/zillabyte/common/session.rb
 - lib/zillabyte/common/tar.rb
 - lib/zillabyte/helpers.rb
-- lib/zillabyte/runner.rb
-- lib/zillabyte/runner/app_runner.rb
-- lib/zillabyte/runner/component_operation.rb
-- lib/zillabyte/runner/component_runner.rb
-- lib/zillabyte/runner/multilang_operation.rb
-- lib/zillabyte/runner/operation.rb
 - zillabyte-cli.gemspec
 - zillabyte_emails.csv
 - zillaconf.json
@@ -229,28 +220,22 @@ homepage: http://www.zillabyte.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2
-
-  Getting Started with Zillabyte
-  ==============================
-
-  (1) Register for an auth token at http://zillabyte.com
-  (2) Log in by running 'zillabyte login' in the command line
-  (3) Build an empty app by running 'zillabyte apps:init'
-      Or... check out our Quick Starts by visiting http://docs.zillabyte.com/
-
-  Questions, comments? Please visit us at http://docs.zillabyte.com
+post_install_message: ! "\nGetting Started with Zillabyte\n==============================\n\n(1)
+  Register for an auth token at http://zillabyte.com\n(2) Log in by running 'zillabyte
+  login' in the command line\n(3) Build an empty app by running 'zillabyte apps:init'\n
+  \   Or... check out our Quick Starts by visiting http://docs.zillabyte.com/\n\nQuestions,
+  comments? Please visit us at http://docs.zillabyte.com\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []