zillabyte-cli 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 22d9cc6afd2e4518c3b9e30f5bdef4ce6e04d401
-  data.tar.gz: 075831a2470881c465517981241b81d3c8515758
-SHA512:
-  metadata.gz: 55df4217f4fe7e95a68722b993e550b2c950367b0f7e0e239036e7f7f0152fcd4eea6e268339f5c877817f58f402029e41403e8f2e7e0644e8eb09dd74a79510
-  data.tar.gz: 014b495c10c3850dc318936a32491fd51d3f751a84117973e241bb33de194027c36ae5b5fb8ac147763addda6d6d40ec79091353b0e5de5c32ad09ec68d6626a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTk1OGRiMDFjYmZkNTBiNTE0YjI5MGVmZjEzZTQ0MzVlNjMzMGM4Mw==
+  data.tar.gz: !binary |-
+    ZWJmODIwODA3MzAwNWJiN2JkY2U0ODAyMDI5OTI5ZjU4ZGI4MmZkMA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzE4ZjNhMmU0YjVjM2EyNWE5ZWM4ODJmY2I4ZDA1YWQ1Zjk5OTY3NTkzNmMw
+    NDk0NjI1MmIxYjg4YjhiY2M1ZWYwNjcxNDU5ZTExMmJlMTk5MDRhNGQwMmVi
+    YTdmNDdhYjRiZmE2ZTI0ZDEzMDBiMzJlMTI4MDg4NTJjMGVhYjU=
+  data.tar.gz: !binary |-
+    YTQ0MDdmYTAyOTYwZmJjM2E5ZDFjYzc3OGI1MzNkNDMzMDkyZTlmM2EzMjMx
+    NmQ2NzNjNmQ5NWU1YzJkZmViYTkyZjU1MTcyMTZmYzlhMmNlZDM5MTU1MTA2
+    YjU0ZjVmZDA3NTNiMzY3NjAzZTI5YTg0NzdjMWQ1YTM2ZTU3NmY=

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-09-30 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
@@ -145,16 +145,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
@@ -163,15 +156,12 @@ files:
 - lib/zillabyte/api/keys.rb
 - lib/zillabyte/api/logs.rb
 - lib/zillabyte/api/metrics.rb
-- lib/zillabyte/api/queries.rb
 - lib/zillabyte/api/semantic_tags.rb
 - 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
@@ -187,7 +177,6 @@ files:
 - lib/zillabyte/cli/host.rb
 - lib/zillabyte/cli/keys.rb
 - lib/zillabyte/cli/nuke.rb
-- lib/zillabyte/cli/query.rb
 - lib/zillabyte/cli/repl.rb
 - lib/zillabyte/cli/rpc.rb
 - lib/zillabyte/cli/sources.rb
@@ -196,69 +185,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/log_fetcher.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/api/queries.rb

@@ -1,83 +0,0 @@
-require("zillabyte/api/base")
-
-class Zillabyte::API::Queries < Zillabyte::API::Base
-
-
-  # GET /sxp
-  def sxp(expression, method, options = {})
-
-    options = {
-      'sxp' => expression
-    }.merge(options)
-    
-    res = request(
-      :expects  => 200,
-      :method   => method,
-      :path     => "/query_sxp",
-      :body     => options.to_json
-    )
-    
-    res.body
-
-  end
-
-  def pull_to_s3(query, options)
-    options = {
-      'query' => query
-    }.merge(options)
-
-    res = @api.request(
-      :expects => 200,
-      :method  => :post,
-      :path    => "/query_pull_to_s3",
-      :body    => options.to_json
-    )
-    res.body
-  end
-
-
-  # GET /sql
-  def sql(expression, method, options = {})
-
-    options = {
-      'sql' => expression
-    }.merge(options)
-    
-    res = request(
-      :expects  => 200,
-      :method   => method,
-      :path     => "/query_sql",
-      :body     => options.to_json
-    )
-    
-    res.body
-
-  end
-  
-  
-
-  def agnostic(expression, options = {})
-    case expression
-    when Array
-      res = sxp(expression, :post, options)
-    when String
-      res = sql(expression, :post, options)
-      col_aliases = res["column_aliases"] #save the column aliases
-    else
-      throw "unknown expression type: #{expression}"
-    end
-
-    options[:job_id] = res["job_id"]
-    res = {'status' => nil}
-    while(res['status'] != 'completed')
-      res = sql(expression, :get, options)
-      sleep(1) if res['status'] != 'completed'
-    end
-    res["return"]["column_aliases"] = col_aliases if col_aliases #send the column aliases back too
-    res["return"]
-  end
-  
-
-
-
-end

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/query.rb

@@ -1,322 +0,0 @@
-require "zillabyte/cli/base"
-require("zillabyte/cli/helpers/table_output_builder")
-
-# executes queries
-#
-class Zillabyte::Command::Query < Zillabyte::Command::Base
-
-  MAX_POLL_SECONDS = 60 * 5
-  POLL_SLEEP = 1
-
-  # query:sxp EXPRESSION
-  #
-  # Executes SXP queries against the zillabyte corpus.
-  #
-  # -o, --offset OFFSET                         # Skips to the offset [default: 0]
-  # -l, --limit LIMIT                           # Sets the result limit [default: 20]
-  # -t, --tail TAIL                             # Continuously watches for new results
-  # --meta                                      # Show meta columns (since, confidence, source)
-  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
-  #
-  #Examples:
-  #
-  # $ zillabyte query:sxp "(uses company 'web_css')" --limit 100
-  #
-  def sxp
-    
-    opts = {}
-    opts[:offset] = options[:offset] || 0
-    opts[:limit] = options[:limit] || 10
-    type = options[:output_type]
-    show_meta = options[:meta] || false
-    tail = options[:tail] || false
-    expression = options[:expression] || shift_argument 
-    opts[:since] = options[:since]
-    
-    if expression.nil?
-      error("no expression given", type)
-    end
-    
-    seen = {}
-    
-    begin
-    
-      validate_arguments!
-      res = api.query.sxp(expression, :post, opts)
-    
-      if res['job_id']
-        job_id = res['job_id']
-        opts[:job_id] = job_id
-
-        start = Time.now.utc
-        display "Fetching your data, please wait..." if type.nil?
-
-        while(Time.now.utc < start + MAX_POLL_SECONDS) do
-
-          res = api.query.sxp(expression, :get, opts)
-          case res['status']
-          when 'completed'
-            if(res['return'])
-              res = res['return']
-            else
-              error("something is wrong #{res}", type)
-            end
-          # success! continue below
-            break
-          when 'running'
-            sleep(POLL_SLEEP)
-          else
-            error("unknown status: #{res}", type)
-          end
-
-        end
-      else
-        if res['error']
-          error(res['error_message'] || res['error'], type)
-        else
-          error("remote server error(r256)", type)
-        end
-      end
-
-      filtered = []
-      headings = []
-      if res['results'].first
-        headings = res['results'].first.keys
-        META_COLUMNS.each {|c| concrete_headings.delete c} if (!show_meta)
-        rows = res['results'].each do |obj|
-          new_row = headings.map do |heading|
-            obj[heading]
-          end
-          unless seen[new_row.to_s]
-            filtered << new_row
-            seen[new_row.to_s] = true
-          end
-        end
-      end
-    
-      if filtered.size > 0
-        display TableOutputBuilder.build_table(headings, filtered)
-      else
-        unless tail
-          display "no results" if type.nil?
-        end
-      end
-      
-      opts[:since] = DateTime.now
-          
-    end while (tail && sleep(5))
-
-  end
-  alias_command "sxp", "query:sxp"
-
-
-
-
-  # query:sql EXPRESSION
-  #
-  # Executes SQL queries against the zillabyte corpus.
-  #
-  # -o, --offset OFFSET                         # Skips to the offset [default: 0]
-  # -l, --limit LIMIT                           # Sets the result limit [default: 20]
-  # -t, --tail TAIL                             # Continuously watches for new results
-  # -s, --since SINCE                           # Grab newer records since SINCE
-  # --no_truncation                             # Doesn't truncate long strings
-  # --meta                                      # Show meta columns (since, confidence, source)
-  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
-  #
-  #Examples:
-  #
-  # $ zillabyte query:sql "select * from company" --limit 100
-  #
-  def sql
-    
-    opts = {}
-    opts[:offset] = options[:offset] || 0
-    opts[:limit] = options[:limit] || 10
-
-    tail = options[:tail] || false
-    expression = options[:expression] || shift_argument 
-    opts[:since] = options[:since]
-    show_meta = options[:meta] || false
-    type = options[:output_type]
-    seen = {}
-    
-    if expression.nil?
-      error("no expression given", type)
-    end
-    
-    begin
-    
-      validate_arguments!
-      res = api.query.sql(expression, :post, opts)
-
-      if res['job_id']
-        job_id = res['job_id']
-        opts[:job_id] = job_id
-
-        start = Time.now.utc
-
-        col_aliases = res['column_aliases']
-        while(Time.now.utc < start + MAX_POLL_SECONDS) do
-
-          res = api.query.sql(expression, :get, opts)
-          case res['status']
-          when 'completed'
-            if(res['return'])
-              res = res['return']
-            else
-              throw "something is wrong: #{res}"
-            end
-          # success! continue below
-            break
-          when 'running'
-            sleep(POLL_SLEEP)
-       #   display ".", false
-          else
-            throw "unknown status: #{res}"
-          end
-
-        end
-      else
-        if res['error']
-          error(res['error_message'] || res['error'], type)
-        else
-          error("remote server error(r256)", type)
-        end
-      end
-
-      headings = []
-      filtered = []
-      if res['rows'] && res['rows'].first
-        concrete_headings = res['rows'].first.keys
-        META_COLUMNS.each {|c| concrete_headings.delete c} if (!show_meta)
-        concrete_headings.each do |ch|
-          has_alias = false
-          col_aliases.each do |al|
-            if(al["concrete_name"] == ch)
-              headings << al["alias"]
-              has_alias = true
-            end
-          end
-          headings << ch if !has_alias
-        end
-        rows = res['rows'].each do |obj|
-          # if obj['since']
-          #   opts[:since] = [obj['since'], opts[:since]].compact.max
-          # end
-          
-          new_row = concrete_headings.map do |heading|
-            if options[:no_truncation]
-              obj[heading]
-            else
-              if obj[heading].to_s.size > 30
-                obj[heading].to_s[0..30] + "..."
-              else
-                obj[heading]
-              end
-            end
-          end
-          
-          unless seen[new_row.to_s]
-            filtered << new_row
-            seen[new_row.to_s] = true
-          end
-        end
-      end
-    
-      if filtered.size > 0
-        opts[:since] = Time.now.utc
-        display TableOutputBuilder.build_table(headings, filtered, type)
-
-      else
-        unless tail
-          if type == "json"
-            display {}.to_json
-          else
-            display "no results"
-          end
-        end
-      end
-      
-          
-    end while (tail && sleep(5))
-
-  end
-  alias_command "sql", "query:sql"
-
-
-
-
-  # query:pull QUERY FILE
-  #
-  # Executes a query and downloads the results to FILE.
-  #
-  def pull
-
-    query = options[:query] || shift_argument
-    file = options[:file] || shift_argument
-    type = options[:output_type]
-    error("no query given", type) if query.nil?
-    error("no file given", type) if file.nil?
-    file = "#{file}.gz" unless File.extname(file) == ".gz"
-
-    options[:query] = query
-
-    res = api.request(
-      :expects  => 200,
-      :method   => :post,
-      :path     => "/query_pull",
-      :body     => options.to_json 
-    )
-    res = res.body
-    
-    handle_downloading_manifest(file, res, type)
-
-    if type == "json"
-      display "{}"
-    else
-      display "finished downloading results to file"
-    end
-    
-  end
-  alias_command "sql:pull", "query:pull"
-
-
-
-  # query:pull:s3 QUERY S3_KEY S3_SECRET S3_BUCKET s3_FILE_KEY
-  #
-  # Executes a query and pulls data to S3_BUCKET/FILE_KEY/part***.gz.
-  #
-  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
-  #
-  def pull_to_s3
-
-    query = options[:query] || shift_argument
-    error("query cannot be empty", type) if query.nil?
-
-    type = options[:output_type]
-
-    user_s3_access_key = options[:s3_access_key] || shift_argument
-    user_s3_secret = options[:s3_secret] || shift_argument
-    user_s3_bucket = options[:s3_bucket] || shift_argument
-    user_s3_file_key = options[:s3_file_key] || shift_argument
-    error("no s3 access key provided", type) if user_s3_access_key.nil?
-    error("no s3 secret provided", type) if user_s3_secret.nil?
-    error("no s3 bucket provided", type) if user_s3_bucket.nil?
-    error("no s3 file path specified", type) if user_s3_file_key.nil?
-
-    s3_params = {:s3_access_key => user_s3_access_key, :s3_secret => user_s3_secret, 
-                 :s3_bucket => user_s3_bucket, :s3_file_key => user_s3_file_key}
-
-    res = self.api.queries.pull_to_s3(query, s3_params)
-
-    if type == "json"
-      display {}.to_json
-    else
-      display "downloading query results to s3://#{res["s3_bucket"]}/#{res["s3_file_key"]}/"
-      display "if the dataset is large, this may take a while, please check your s3 account after a few minutes"
-    end
-  end
-  alias_command "query:pull:s3", "query:pull_to_s3"
-
-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/queries.rb

@@ -1,39 +0,0 @@
-module Zillabyte::Queries
-  
-  
-  
-  def self.array_to_sxp_expression(exp)
-    s = []
-    s << "("
-    s << exp[0]
-    exp[1].each do |ss|
-      s << " "
-      s << ss
-    end
-    s << ")"
-    s = s.join("")
-  end
-  
-  
-  def self.convert_clause_to_sxp(match)
-    return nil if match.nil? or match.size == 0
-    queue = match.clone
-    s = array_to_sxp_expression(queue.shift)
-    while queue.size > 0
-      next_exp = array_to_sxp_expression(queue.shift)
-      s = "(and #{s} #{next_exp})"
-    end
-    s
-  end
-  
-  # def self.load
-  #   Dir[File.join(File.dirname(__FILE__), "functions", "*.rb")].each do |file|
-  #     require file
-  #   end  
-  # end
-end
-
-
-# Load all helpers...
-# Zillabyte::Functions.load()
-