zillabyte-cli 0.0.17 → 0.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODVkNDFiMGFlMjc2OWM5MzU2NmY3MzdjZWJiYzIwY2RkNWU2MTdlYQ==
+    M2YzNzJlOTE4Mzk3Y2QxZmYwMTY1NjNiNWUxYTBlZTg5ODk4OTgyNg==
   data.tar.gz: !binary |-
-    ZGI4OTFhZTY3N2E2NDhhZDNmNjBhNTFhNTExZTg4ODgzMTcwYjk3Zg==
-SHA512:
+    OGFkNGQ1MDYxMTE2NzJhMDIyNGJjMjc4YzNiNTQ2YmUzYjljZTRmMA==
+!binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWJkZDg3ZGQ2N2E4N2UxNDY4MTRmMDUwNjZhMWY2NjEyNzE1NDE5YWFjNzY0
-    MTRkZTQwZjU1NDUxMmVkMTM2ODE5YWMwNzQ4MzU1ZDE3MWE5ZjQ2MTNjZGY0
-    YmFlOTc5YmJjNzg3OTY4NGVjNGM0YTc3YjU4NTE4YmI1YjIyMmM=
+    NzQzM2E2NjIxYmZmZjhhNzlkYmQzMjgyNzkzMTg2YjRkMDQ4YTY1ZDQxY2Rk
+    MjU0NTU2MGMwYWJjNjgxYmE3NDk5MjNmZmJkNDdhOTBhZWViYzdkN2JlNWIw
+    MTMyZGZiYjYwNjdkNzI1Y2YyN2JlZWI2NDY2N2NiOTIyZjY5NjY=
   data.tar.gz: !binary |-
-    ZmMyZDU5Yzg5NjNlOWQyM2UyZTBlMjA3MThhN2M2M2VkMWI3YzYyOGRhMGQz
-    ZmI5OWM4NDNlNGYyOWFjMDdkNjRlYzM5NTA5MjFjNzlkZGI5MDdlODk1NTA3
-    MzI0N2RjMjQzMWZmNzJkMjA1MTUzYzlhODgwMGE5OWY4ZGMxZWQ=
+    YTllY2ZjNjViNTM3ZjcwODhlOGM5MDZhMWQ5YjAyZGMzMGY0MGZhOGNlNTcz
+    MGQzYjM1MzJkZmI5ZmQwZmJjYjQzNDk5MDI0MDY0N2JmNmVlZjJiYjcxNDY5
+    YWM1NmI3ZjE0NTJkM2ZiMzc4YzhlMDhmODJlMzAzOWFlNjBmMWY=

data/lib/zillabyte/api/apps.rb

@@ -14,15 +14,14 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
     res = @api.request(
       :expects  => 200,
       :method   => :get,
-      :path     => "/flows"
+      :path     => "/flows",
+      :body     => options.to_json
     )
     
     res.body
 
   end
   
-  
-  
 
   # GET /flows/id
   def get(id, options = {})
@@ -42,8 +41,6 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
 
   end
   
-  
-  
 
   # GET /flows/id/kill
   def kill(id, options = {})
@@ -115,29 +112,29 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
   end
   
   
-  # GET /flows/id
+  # GET /flows/id/download
   def pull_to_directory(id, dir, session = nil, options = {})
     
     # Get the resource. note query params
-    session.display "downloading ##{id}" if session
+    type = options[:type]
+    session.display "downloading ##{id}" if session && type.nil?
     res = @api.request(
       :expects  => 200,
       :method   => :get,
-      :path     => "/flows/#{id}/download" 
-      #:path     => "/flows/#{id}?indirect_url=1" 
-      #:path     => "/flows/#{id}?tar=1" 
+      :path     => "/flows/#{id}/download",
+      :body     => options.to_json
     )
-    
+
     hash = res.body
     unless hash['status'] == 'error'
       if(hash['tar'])
-        session.display "unpacking to #{dir}" if session
+        session.display "unpacking to #{dir}" if type.nil?
         tar = StringIO.new(Base64.decode64(hash['tar']))
         hash.delete('tar')
         Zillabyte::Common::Tar.untar(tar, dir)
-#If you get an uri instead of the tar, then download the file directly from s3
+      #If you get an uri instead of the tar, then download the file directly from s3
       elsif(hash['uri'])
-        session.display "downloading ##{id} to #{dir}" if session
+        session.display "downloading ##{id} to #{dir}" if type.nil?
         uri = URI(hash['uri'])
         try_again = 1
         while(try_again)
@@ -191,7 +188,7 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
     options = {
       :name => hash['name'],
       :meta => hash,
-#      :tar => Base64.encode64(tar.read)
+      # :tar => Base64.encode64(tar.read)
     }.merge(options)
     
     session.display("uploading #{tar.size} bytes... ", false) if session && type.nil?
@@ -259,7 +256,7 @@ class Zillabyte::API::Apps < Zillabyte::API::Base
         command = "cd \"#{dir}\"; PYTHONPATH=~/zb1/multilang/python/Zillabyte python \"#{full_script}\" #{arg}"
       end
     when "js"
-#      command = "#{Zillabyte::API::CASPERJS_BIN} #{Zillabyte::API::API_CLIENT_JS}  \"#{full_script}\" --info"
+      #command = "#{Zillabyte::API::CASPERJS_BIN} #{Zillabyte::API::API_CLIENT_JS}  \"#{full_script}\" --info"
       command = "cd \"#{dir}\"; NODE_PATH=~/zb1/multilang/js/src/lib #{Zillabyte::API::NODEJS_BIN} \"#{full_script}\" #{arg}"
     else
       session.error "unsupported language: #{hash["language"]}" if session

data/lib/zillabyte/api/data.rb

@@ -7,7 +7,7 @@ class Zillabyte::API::Data < Zillabyte::API::Base
     res = @api.request(
       :expects  => 200,
       :method   => :get,
-      :path     => "/relations/#{id}",
+      :path     => "/relations/#{CGI.escape(id)}",
       :body     => options.to_json 
     )
     res.body
@@ -28,7 +28,7 @@ class Zillabyte::API::Data < Zillabyte::API::Base
     res = @api.request(
       :expects  => 200,
       :method   => :post,
-      :path     => "/relations/#{id}/pull",
+      :path     => "/relations/#{CGI.escape(id)}/pull",
       :body     => options.to_json 
     )
     res.body
@@ -38,7 +38,7 @@ class Zillabyte::API::Data < Zillabyte::API::Base
     res = @api.request(
       :expects => 200,
       :method  => :post,
-      :path    => "/relations/#{id}/pull_to_s3",
+      :path    => "/relations/#{CGI.escape(id)}/pull_to_s3",
       :body    => options.to_json
     )
     res.body
@@ -53,7 +53,7 @@ class Zillabyte::API::Data < Zillabyte::API::Base
       # schema
       # relations
     }.merge(options)
-    
+
     res = @api.request(
       :expects  => 200,
       :method   => :post,
@@ -66,12 +66,13 @@ class Zillabyte::API::Data < Zillabyte::API::Base
   end
   
   
-  def delete(id, option={})
+  def delete(id, options={})
     
     res = @api.request(
       :expects => 200,
       :method  => :delete,
-      :path    => "/relations/#{id}" 
+      :path    => "/relations/#{CGI.escape(id)}",
+      :body    => options.to_json
     )
 
     res.body
@@ -84,7 +85,7 @@ class Zillabyte::API::Data < Zillabyte::API::Base
     res = @api.request(
       :expects  => 200,
       :method   => :post,
-      :path     => "/relations/#{id}/append",
+      :path     => "/relations/#{CGI.escape(id)}/append",
       :body     => options.to_json
     )
     hash = res.body

data/lib/zillabyte/api.rb

@@ -65,13 +65,17 @@ class Zillabyte::API
     end
 
     type = nil
-    if @options
-      type = @options[:type]
+    if params[:body]
+      begin
+          param_hash = JSON.parse(params[:body])
+          type = param_hash["type"]
+      rescue JSON::ParserError => e
+          @session.error("invalid parameters", type)
+      end
     end
 
-
     begin
-      
+
       # If a block is given, then we assume we're streaming (i.e. for logs)
       if block_given?
         
@@ -111,11 +115,13 @@ class Zillabyte::API
           end
         end
       end
-      
+
       # Execute the request
       response = @connection.request(params)
 
 
+
+
     rescue Excon::Errors::HTTPStatusError => error
 
         
@@ -125,6 +131,7 @@ class Zillabyte::API
           hash = JSON.parse(error.response.body)
           if hash['error_message']
             @session.error(hash['error_message'], type)
+
           end
         rescue JSON::ParserError => e
           # Trickle to generic message below

data/lib/zillabyte/cli/apps.rb

@@ -108,13 +108,17 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # $ zillabyte apps:pull . 
   #
   def pull
-    
-    id = options[:id] || shift_argument 
+
+    app_id = options[:id] || shift_argument
+
+    if !(app_id =~ /^\d*$/)
+      options[:is_name] = true
+    end
+
     dir = options[:directory] || shift_argument
     type = options[:type]
-
     
-    error("no id given", type) if id.nil?
+    error("no id given", type) if app_id.nil?
     error("no directory given", type) if dir.nil?
     
     # Create if not exists..
@@ -126,7 +130,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
       FileUtils.mkdir_p(dir)
     end
     
-    res = api.apps.pull_to_directory id, dir, session
+    res = api.apps.pull_to_directory app_id, dir, session, options
     
     if res['error']
       error("error: #{res['error_message']}", type)
@@ -150,10 +154,13 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   # --type TYPE # specify an output type i.e. json
   #
   def delete
-    id = options[:id] || shift_argument
-    if id.nil?
-      id = read_name_from_conf(options)
-      options[:flow_name] = true
+    app_id = options[:id] || shift_argument
+
+    if app_id.nil?
+      app_id = read_name_from_conf(options)
+      options[:is_name] = true
+    elsif !(app_id =~ /^\d*$/)
+      options[:is_name] = true
     end
     forced = options[:force]
     type = options[:type]
@@ -176,7 +183,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     confirmed = forced || confirm == "yes"
 
     if confirmed
-      response = api.apps.delete(id, options)
+      response = api.apps.delete(app_id, options)
       if type == "json"
         display {}.to_json
       else
@@ -195,7 +202,6 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   def prep
     
     dir = options[:directory] || shift_argument || Dir.pwd
-
     meta = Zillabyte::CLI::Config.get_config_info(dir)
 
     case meta["language"]
@@ -203,7 +209,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
       
       # Execute in the bundler context
       full_script = File.join(dir, meta["script"])
-      cmd = "cd \"#{meta['home_dir']}\"; unset BUNDLE_GEMFILE; bundle install"
+      cmd = "cd \"#{meta['home_dir']}\"; unset BUNDLE_GEMFILE; unset RUBYOPT; bundle install"
       exec(cmd)
       
     when "python"
@@ -258,7 +264,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
 
 
 
-  # apps:logs APP_ID [OPERATION_NAME]
+  # apps:logs ID [OPERATION_NAME]
   #
   # streams logs from the distributed workers
   # 
@@ -267,7 +273,14 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   #
   def logs
 
-    app_id = options[:app] || shift_argument
+    app_id = options[:id] || shift_argument
+    if app_id.nil?
+      app_id = read_name_from_conf(options)
+      options[:is_name] = true
+    elsif !(app_id =~ /^\d*$/)
+      options[:is_name] = true
+    end
+
     operation_id = options[:operation] || shift_argument || '_ALL_'
     category = options[:verbose] || '_ALL_'
     type = options[:type]
@@ -275,16 +288,10 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     carry_settings = {
       :category => category
     }
-    api_options = {}
 
-    if app_id.nil?
-      app_id = read_name_from_conf(options)
-      api_options[:flow_name] = true
-    end
-   
     display "Retrieving logs for app ##{app_id}...please wait..." if type.nil?
     lf = LogFormatter::Operation.new
-    self.api.logs.get(app_id, operation_id, api_options) do |line|
+    self.api.logs.get(app_id, operation_id, options) do |line|
       
       error(line['error_message'], type) if line['error']
       lf.print_log_line(line) if type.nil?
@@ -309,7 +316,9 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     # No name?
     if app_id.nil?
       app_id = read_name_from_conf(options)
-      options[:flow_name] = true
+      options[:is_name] = true
+    elsif !(app_id =~ /^\d*$/)
+      options[:is_name] = true
     end
 
     type = options[:type]
@@ -372,7 +381,9 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
 
     if app_id.nil?
       app_id = read_name_from_conf(options)
-      options[:flow_name] = true
+      options[:is_name] = true
+    elsif !(app_id =~ /^\d*$/)
+      options[:is_name] = true
     end
 
     if trigger_next
@@ -401,7 +412,7 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
     if response["job_id"]
       options[:job_id] = response["job_id"]
       app_id = response["flow_id"]
-      options.delete :flow_name
+      options.delete :is_name
 
       start = Time.now.utc
       display "Next cycle request sent. If your app was RETIRED this may take slightly longer." if type.nil?
@@ -892,12 +903,14 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Base
   #
   def kill
 
-    id = options[:id] || shift_argument
+    app_id = options[:id] || shift_argument
     type = options[:type]
 
-    if id.nil?
-      id = read_name_from_conf(options)
-      options[:flow_name] = true
+    if app_id.nil?
+      app_id = read_name_from_conf(options)
+      options[:is_name] = true
+    elsif !(app_id =~ /^\d*$/)
+      options[:is_name] = true
     end
 
     display "Killing app ##{id}...please wait..." if type.nil?

data/lib/zillabyte/cli/relations.rb

@@ -80,9 +80,9 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     end
 
     confirmed = forced || confirm == "yes"
-
     if confirmed
-      res = api.data.delete(id)
+      res = api.data.delete(id, options)
+
       if res['error']
         error(res['error'], type)
       else
@@ -110,7 +110,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   # --type TYPE                  # The output format type
   #
   def create
-    
+
     name = options[:name] || shift_argument
     file = options[:file] || nil
     filetype = options[:filetype] || nil
@@ -136,7 +136,6 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     end
 
     res = api.data.create name, hash
-    
     if res['error']
       error("#{res['error_message']}", type)
     else
@@ -146,7 +145,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
         display "relation ##{res['id']} #{res['action']}. size: #{res['size'] || 0} rows."
       end
     end
-    
+
   end
   alias_command "rl:create", "relations:create"
   
@@ -169,11 +168,11 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     error("no file given", type) if file.nil?
 
 
-    relation = self.api.data.get(id)
+    relation = self.api.data.get(id, options)
     columns = relation["columns"].map{|col| {col["index"] => col["type"]}}
     rows = sanity_check_file(file,filetype,{"columns" => columns}, type)
    
-    res = self.api.data.append(id, {:rows => rows})
+    res = self.api.data.append(id, options.merge({:rows => rows}))
     if type == "json"
       display {}.to_json
     else
@@ -189,7 +188,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   # pulls relation data into OUTPUT.gz
   #
   #  --cycle_id [cycle_id]              # retrieve data generated for that cycle, only if this relation is associated with an app. (defaults to the last cycle
-  #  --type TYPE                        # the output format type
+  #  --type TYPE                        # specify a communication format (i.e json) for programmatic interaction
   #
   def pull
 
@@ -427,7 +426,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       error("specify public or private using --public")
     end
 
-    {:schema => schema, :public => is_public, :description => description, :aliases => aliases}
+    {:schema => schema, :public => is_public, :description => description, :aliases => aliases, :type => type}
   end
 
 

data/lib/zillabyte/cli/repl.rb

@@ -0,0 +1,22 @@
+require "zillabyte/cli/base"
+
+# REPL console for zillabyte commands
+#
+class Zillabyte::Command::Repl < Zillabyte::Command::Base
+
+  # repl
+  #
+  # Start a console session for zillabyte
+  #
+  def index
+    
+      while true
+        
+        display "zilla> ", false
+        cmd = ask
+        exec "zillabyte #{cmd}; zillabyte repl"
+        
+      end
+
+  end
+end

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

@@ -0,0 +1,16 @@
+# This is a template; feel free to change it.
+# For more details, check out http://docs.zillabyte.com/quickstart/hello_world/
+
+require 'zillabyte' 
+
+app = Zillabyte.app("hello_world_app")
+  .source("select * from web_pages")
+  .each{ |page|
+    if page['html'].include? "hello world"
+      emit :url => page['url']
+    end
+  }
+  .sink{
+    name "has_hello_world"
+    column "url", :string
+  }

data/lib/zillabyte/cli/templates/ruby/zillabyte.conf.yaml

@@ -1,2 +1,2 @@
 language: ruby
-script: simple_app.rb
+script: app.rb

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -243,7 +243,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/zillabyte
-- lib/#zillabyte-cli.rb#
 - lib/zillabyte/api/apps.rb
 - lib/zillabyte/api/base.rb
 - lib/zillabyte/api/data.rb
@@ -257,7 +256,6 @@ files:
 - lib/zillabyte/api/zillalogs.rb
 - lib/zillabyte/api.rb
 - lib/zillabyte/auth.rb
-- lib/zillabyte/cli/#logs.rb#
 - lib/zillabyte/cli/apps.rb
 - lib/zillabyte/cli/auth.rb
 - lib/zillabyte/cli/base.rb
@@ -270,15 +268,15 @@ files:
 - lib/zillabyte/cli/log_formatter.rb
 - lib/zillabyte/cli/query.rb
 - lib/zillabyte/cli/relations.rb
+- lib/zillabyte/cli/repl.rb
 - lib/zillabyte/cli/sources.rb
 - lib/zillabyte/cli/templates/js/simple_function.js
 - lib/zillabyte/cli/templates/js/zillabyte.conf.yaml
-- lib/zillabyte/cli/templates/python/#simple_function.py#
 - lib/zillabyte/cli/templates/python/requirements.txt
 - lib/zillabyte/cli/templates/python/simple_function.py
 - lib/zillabyte/cli/templates/python/zillabyte.conf.yaml
+- lib/zillabyte/cli/templates/ruby/app.rb
 - lib/zillabyte/cli/templates/ruby/Gemfile
-- lib/zillabyte/cli/templates/ruby/simple_app.rb
 - lib/zillabyte/cli/templates/ruby/zillabyte.conf.yaml
 - lib/zillabyte/cli/version.rb
 - lib/zillabyte/cli/zillalogs.rb
@@ -317,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+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/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\
-)

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

@@ -1,42 +0,0 @@
-require 'zillabyte'
-
-Zillabyte.simple_app do
-
-  # This specifies the app's name and is mandatory.
-  name "simple_app"
-  
-  # This directive instructs zillabyte to give your app every 
-  # web page in our known universe.  Your app will have access
-  # to two fields: URL and HTML
-  matches "select * from web_pages"
-  
-  # This directive tells Zillabyte what kind of data your app
-  # 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} ]
-          ]
-        ]
-
-  
-  # 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. 
-  execute do |tuple|
-    
-    # get the fields
-    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 world')
-      emit("has_hello_world", "URL" => url)
-    end
-    
-  end
-
-end