zillabyte-cli 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 92e75d91289dcf56900c9e9d145910a44cd7d8f5
-  data.tar.gz: f055414a6fac2898da96d332667e921106ff88eb
-SHA512:
-  metadata.gz: 5d64345b60eee16d53efa88cc61090ba97cc39a31be2c1ccc0cd3f539d442f254fd434a4a45a78aa36c4d8b195c7c837a212f9032fbab42c4412836c10cd3d98
-  data.tar.gz: 80011b41c32f75922d7932eb7092f034e92d0a121ee3a6cd1495ec9bf323df69fa13e44f2da3a6061b7d7acb2ee81be8f640e361e7f63e6956dba78dd52f6b29
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTZjYWM4MDcxZTUyNzM4MGZiMGQyZTAyN2U4YTlkNzViZGQ1MWEyMw==
+  data.tar.gz: !binary |-
+    NTEwZDVkZjFmMmZjNjU2NWFkNTRkMjgwODRhYWI3MWE5NDA1NDBlOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YmExNmVlMmZmYmE5YWM4ZjdiMmJmMzBjM2M5ZTkwNzBjODE3MTNmNzI5ZTM3
+    NjBlNzVlYTg4ZWQxMGI3MDAzMzRkZjI5NzIyOTY0ZDQ2YWVlNDhhMTMwMjIw
+    M2E0MTFiODFjZjQ5NzJkZGQxMTJiNjhhMmMyMzM4MTJhOWJlZGI=
+  data.tar.gz: !binary |-
+    YWU0MjQyY2Q1OGFkYzkyODE1NjMyZjVmODQ2NTFjZGNhOGY1M2I0ODNjNjdl
+    MzFhMjM4ODRjMTU3ZDVlNjE0N2U5ZTI3YWViZGEyOTc1YzZjNzc4ZWRiYWNk
+    MTBjZWE3ZGQ0MjcxNWZiYWQyYTYwZGZhN2JhYjRiNzkyZjc5Njg=

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.1.23"
+    VERSION = "0.1.24"
   end
 end

data/lib/zillabyte/runner/component_operation.rb

@@ -57,12 +57,13 @@ class Zillabyte::Runner::ComponentOperation
   def self.run_input()
     input = @__options[:input]
 
+    fields = @__node["fields"].map {|f| f.keys[0]}
+
     # Read input from file
     if input
       messages = []
       cdisplay "reading from file...."
       csv_rows = CSV.read("#{input}")
-      fields = @__node["fields"].map {|f| f.keys[0]}
       csv_rows.each do |row|
         tuple = {}
         fields.each {|f| tuple[f] = row.shift}
@@ -146,32 +147,20 @@ class Zillabyte::Runner::ComponentOperation
           break
         end
 
-        # Build tuple
-        begin
-
-          tuple = JSON.parse(msg)
-        rescue JSON::ParserError 
-          cdisplay "Error: invalid JSON"           
-          next
+        # Build tuples
+        args = msg.gsub(/[\'\"]/, '').split(' ')
+        component_args = []
+
+        while(true) do
+          break if args.empty?
+          tuple = {}
+          fields.each {|f| tuple[f] = args.shift}
+          tuple_json = build_tuple_json(tuple)
+          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
-
-
-        # Check input for correct fields
-        has_fields = true
-        fields = @__node['fields'].flat_map {|h| h.keys}
-        tuple.each_key do |field|
-          if !fields.include? field
-            cdisplay "Error: invalid schema for node"
-            next
-          end
-        end
-        tuple_json = build_tuple_json(tuple)
-        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
-
     end
-   
   end
 
 

data/lib/zillabyte/runner/component_runner.rb

@@ -218,7 +218,7 @@ class Zillabyte::Runner::ComponentRunner < Zillabyte::Command::Base
             if source == ""
               source = name
             else
-              display "Cannot run component with multiple input sources without input files"
+              display "Error: Cannot run component with multiple input sources without input files"
               return
             end
           end
@@ -231,11 +231,18 @@ class Zillabyte::Runner::ComponentRunner < Zillabyte::Command::Base
 
         while true
 
-          # TODO this doesnt handle multiple sources
-          #source = @operation_pipes["source_1"][:node]
-
-          display "Enter an input tuple in JSON format i.e.{ \"url\" : \"foo.com\", \"html\" : \"bar.html\" }"
+          fields = @node_map[source]['fields'].map {|h| h.keys[0].upcase }
+          display "Enter an input tuple in the form : #{fields.join('1 ')}1 #{fields.join('2 ')}2 ..."
           msg = ask
+
+          if msg != "end"
+            args = msg.split(' ')
+            if (args.length % fields.length != 0)
+              display "Error: Argument length must be a multiple of the schema length"
+              next
+            end
+          end
+
           # Send tuple to source
           @operation_pipes[source]["wr_parent_1"].puts msg
         end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-02 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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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'
 - !ruby/object:Gem::Dependency
   name: mkfifo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The Official Zillabyte CLI Gem
@@ -173,16 +173,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- LICENSE
-- README.md
 - bin/zb
 - bin/zbd
 - bin/zillabyte
-- lib/#zillabyte-cli.rb#
-- lib/zillabyte-cli.rb
-- lib/zillabyte-cli/version.rb
-- lib/zillabyte/api.rb
 - lib/zillabyte/api/apps.rb
 - lib/zillabyte/api/base.rb
 - lib/zillabyte/api/components.rb
@@ -196,10 +189,8 @@ files:
 - lib/zillabyte/api/settings.rb
 - lib/zillabyte/api/sources.rb
 - lib/zillabyte/api/zillalogs.rb
+- lib/zillabyte/api.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
@@ -224,68 +215,67 @@ files:
 - lib/zillabyte/cli/templates/apps/python/app.py
 - lib/zillabyte/cli/templates/apps/python/requirements.txt
 - lib/zillabyte/cli/templates/apps/python/zillabyte.conf.yaml
+- lib/zillabyte/cli/templates/apps/ruby/app.rb.erb
 - lib/zillabyte/cli/templates/apps/ruby/Gemfile
 - lib/zillabyte/cli/templates/apps/ruby/README.md
-- lib/zillabyte/cli/templates/apps/ruby/app.rb.erb
 - lib/zillabyte/cli/templates/apps/ruby/zillabyte.conf.yaml
 - lib/zillabyte/cli/templates/components/js/simple_function.js
 - lib/zillabyte/cli/templates/components/js/zillabyte.conf.yaml
 - lib/zillabyte/cli/templates/components/python/component.py
 - lib/zillabyte/cli/templates/components/python/requirements.txt
 - lib/zillabyte/cli/templates/components/python/zillabyte.conf.yaml
-- lib/zillabyte/cli/templates/components/ruby/Gemfile
 - lib/zillabyte/cli/templates/components/ruby/component.rb.erb
+- lib/zillabyte/cli/templates/components/ruby/Gemfile
 - 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
+- lib/zillabyte/cli.rb
 - lib/zillabyte/command.rb
-- lib/zillabyte/common.rb
 - lib/zillabyte/common/session.rb
 - lib/zillabyte/common/tar.rb
+- lib/zillabyte/common.rb
 - lib/zillabyte/helpers.rb
 - lib/zillabyte/queries.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
+- lib/zillabyte/runner.rb
+- lib/zillabyte-cli/version.rb
+- lib/zillabyte-cli.rb
+- LICENSE
+- README.md
 - zillabyte_emails.csv
 - zillaconf.json
+- Gemfile
+- zillabyte-cli.gemspec
 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: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: The Official Zillabyte CLI Gem

data/lib/#zillabyte-cli.rb#

@@ -1,5 +0,0 @@
-require "zillabyte-cli/version"
-require "zillabyte/api"
-require "zillabyte/cli"
-require "zillabyte/common"
-require "zillabyte/queries"

data/lib/zillabyte/cli/#logs.rb#

@@ -1,12 +0,0 @@
-require "zillabyte/cli/base"
-
-# manage custom logs
-#
-class Zillabyte::Command::Logs < Zillabyte::Command::Base
-
-
-
-  
-  
-
-end

data/lib/zillabyte/cli/#repl.rb#

@@ -1,43 +0,0 @@
-require "zillabyte/cli/base"
-require 'readline'
-# REPL console for zillabyte commands
-#
-class Zillabyte::Command::Repl < Zillabyte::Command::Base
-
-  # repl
-  #
-  # start a console session for zillabyte
-  # --quiet # HIDDEN
-  # --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"
-    end
-    server = `echo $ZILLABYTE_API_HOST` || ""
-    prompt = ""
-    if server && server.chomp.length > 0
-      prompt = "#{server.chomp} " 
-    end
-    prompt += "zillabyte $ "
-    if options[:history]
-      #p options[:history]
-      history = JSON.parse(options[:history])
-      history.last(50).each do |his|
-        # TODO: Handle single quotes ??
-        Readline::HISTORY << his
-      end
-    end
-    # TODO: Add tab completion for basic commands, app/relation names etc.
-    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}'"
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-import zillabyte
-
-def prep(controller):
-  return
-
-# This is the heart of your algorithm.  It's processed on every
-# 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"]})
-  return
-
-zillabyte.simple_function(\
-  # This directive instructs zillabyte to give your function every
-  # web page in our known universe.  Your function will have access
-  # to two fields: URL and HTML
-  matches = "select * from web_pa", \
-
-  # This directive tells Zillabyte what kind of data your function
-  # produces.  In this case, we're saying we will emit a tuple that
-  # is one-column wide and contains the field 'URL' 
-  emits = [["has_hello_world", [{"url":"string"}]]], \
-
-  prepare = prep, \
-  execute = execute\
-)