zillabyte-cli 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTVkNDVmMWE1NWJiMzhmMTk5M2IxOGJkZDExYjIxMTY3MGRiNDBjMg==
+    MjgyYWY1MTY5MmQ1ZTRhZWMyNTEyMzExMWIwODViZjc2NzFjYzZkZQ==
   data.tar.gz: !binary |-
-    ZGEyMjU3NjM5MTE0NWE1N2I4ZDdkZjZlNTk2NmQzNzYzYmI2ZGZkYw==
+    NDNjOTk0MzU3NmNkZDZiMjIzYmEwYmQ1YjQzODM2M2QxZDU1M2E5Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDk2ZTcyMjk1ODg5NTE3NTU0ZGFmNDlkYTY4MWIzOGEyYjEyYjJlNDk0YTI2
-    OTAwYmRkMWU1MzliOWYyMmIyZWFjMTFiZWI0NWE0NmUzZTA3Y2Y4ZTkyNjMz
-    ODBkYWQ1ZDA1MjkzZGE1NTg5MDA0NzMwZmFhYzNhNmRlYzBiNTY=
+    ZWU1MTJjZmRhMGIwM2U2YmJlMmIxYjQyOTk1ZmE0Njk3NDZmNzE5OGFhNjZh
+    NjQ4NzM2M2VmOTllYTUxNjNiNGU1MjQxNjIyMjIzM2IzMjI5ODkyNmQ0YTIx
+    ZDkzZjA5OTZlMDdkMDY5MzFjNTllZTBkZWY5MWNhNDk2ZjQxODc=
   data.tar.gz: !binary |-
-    MjI3YzIzNGMzMjkzY2JjNjZmMjc2YzU4MDU3Y2RlNTQzYjE0OTYzN2VhNTc4
-    ZWRmMGZhMjc2M2FiYjkwYTc1OGY2YzUwNjM3YmRiOTU1NzA2OWFiNzBiNWU4
-    YTRjYTNiMzQyYWM5ZmVhZjdlZDY1MjI5ZDJkNjUzZjc3OWU1NTE=
+    NzIzM2I1OGU0YTA4ZGYwMDYzZDZlMTU0NzBjNTY3N2RjNzc5ZGUxMjNjZTY2
+    MGYwNzAzNDFiYWQwZWYxOTc3YTljNjhlY2NhNjU0NWRhNmIxNzIzMTA4ZWRi
+    MTZkNGUxZjNmNjNmYjI4YzczNzk2MGNmOGJmNTAwMTQ2NDYyZGE=

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/lib/zillabyte/api/data.rb

@@ -67,8 +67,16 @@ class Zillabyte::API::Data < Zillabyte::API::Base
   end
   
   
-  
-  
+  def delete(id, option={})
+    
+    res = @api.request(
+      :expects => 200,
+      :method  => :delete,
+      :path    => "/relations/#{id}" 
+    )
+
+    res.body
+  end
   
   
   # POST /datasets/1/append

data/lib/zillabyte/api/flows.rb

@@ -1,5 +1,4 @@
 require 'net/http'
-require 'mkfifo'
 require 'zillabyte/cli/config'
 
 class Zillabyte::API::Flows < Zillabyte::API::Base
@@ -214,7 +213,7 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
       end
     when "js"
 #      command = "#{Zillabyte::API::CASPERJS_BIN} #{Zillabyte::API::API_CLIENT_JS}  \"#{full_script}\" --info"
-      command = "cd \"#{dir}\"; NODE_PATH=~/zb1/multilang/js #{Zillabyte::API::NODEJS_BIN} \"#{full_script}\" #{arg} #{stderr}"
+      command = "cd \"#{dir}\"; NODE_PATH=~/zb1/multilang/js/src/lib #{Zillabyte::API::NODEJS_BIN} \"#{full_script}\" #{arg} #{stderr}"
     else
       progress.error "unsupported language: #{hash["language"]}" if progress
       return nil

data/lib/zillabyte/cli/flows.rb

@@ -299,11 +299,16 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
         if node['matches'] or node["relation"]
           matches = node['matches'] || (node["relation"]["query"])
           op_display.call "Grabbing remote data"
-          res = api.query.agnostic(matches)["rows"]
-          if(res.nil? or res.length == 0)
+          
+          res = api.query.agnostic(matches)
+          rows = res["rows"]
+          column_aliases = res["column_aliases"]
+          
+          
+          if(rows.nil? or rows.length == 0)
             raise NameError, "Could not find data that matches your 'matches' clause"
           end
-          res.each do |tuple|
+          rows.each do |tuple|
             values = {}
             meta = {}
             tuple.each do |k, v|
@@ -315,7 +320,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
                 values[k] = v
               end
             end
-            read_msg = {"tuple" => values, "meta" => meta}.to_json
+            read_msg = {"tuple" => values, "meta" => meta, "column_aliases" => column_aliases}.to_json
             op_display.call "emit tuple: #{values} #{meta}"
             stream_messages[default_stream] ||= []
             stream_messages[default_stream] << read_msg
@@ -669,7 +674,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
  
     when "js"
 #      cmd = "#{Zillabyte::API::CASPERJS_BIN} #{Zillabyte::API::API_CLIENT_JS}  \"#{full_script}\" #{arg}"
-      cmd = "cd \"#{dir}\"; NODE_PATH=~/zb1/multilang/js #{Zillabyte::API::NODEJS_BIN}  \"#{full_script}\" #{arg} #{stderr_opt}"
+      cmd = "cd \"#{dir}\"; NODE_PATH=~/zb1/multilang/js/src/lib #{Zillabyte::API::NODEJS_BIN}  \"#{full_script}\" #{arg} #{stderr_opt}"
 
     else
       error "no language specified"

data/lib/zillabyte/cli/help.rb

@@ -84,7 +84,7 @@ private
     puts
     summary_for_namespaces(additional_namespaces)
     puts
-    puts "For help getting started, visit http://www.developers.zillabyte.com."
+    puts "For help getting started, visit http://docs.zillabyte.com."
     puts
   end
 

data/lib/zillabyte/cli/query.rb

@@ -39,9 +39,19 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
       filtered = []
       headings = []
       if res['rows'].first
-        headings = res['rows'].first.keys
+        concrete_headings = res['rows'].first.keys
+        concrete_headings.each do |ch|
+          has_alias = false
+          res['column_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|
-          new_row = headings.map do |heading|
+          new_row = concrete_headings.map do |heading|
             obj[heading]
           end
           unless seen[new_row.to_s]
@@ -109,14 +119,23 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
       headings = []
       filtered = []
       if res['rows'].first
-        headings = res['rows'].first.keys
+        concrete_headings = res['rows'].first.keys
+        concrete_headings.each do |ch|
+          has_alias = false
+          res['column_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 = headings.map do |heading|
+          new_row = concrete_headings.map do |heading|
             if options[:no_truncation]
               obj[heading]
             else
@@ -169,4 +188,4 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
   
 
 
-end
+end

data/lib/zillabyte/cli/relations.rb

@@ -45,6 +45,34 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   alias_command "relation:list", "relations:list"
 
 
+  # relations:delete ID
+  # 
+  # deletes a relation 
+  # 
+  # -f, --force # Delete without asking for confirmation
+  def delete 
+    id = options[:id] || shift_argument
+    forced = options[:force]
+    if not forced
+      while true
+        
+        display "This operation cannot be undone. Are you sure you want to delete this relation? (yes/no):", false
+        confirm = ask
+        break if confirm == "yes" || confirm == "no"
+        display "Please enter 'yes' to delete the relation or 'no' to exit"
+      end
+    end
+
+    confirmed = forced || confirm == "yes"
+
+    if confirmed
+      response = api.data.delete(id)
+      display response["body"]
+    end
+    
+    
+  end
+
 
   # relations:status RELATION
   #
@@ -98,25 +126,32 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
   # creates a new relation
   #
   # --schema SCHEMA # a JSON array of column types
-  # --semantics SEMANTICS # a JSON array of semantics within the relation
   # --public # Make the relation public
   #
   def create
     
     name = options[:name] || shift_argument
+    file = options[:file] || shift_argument || nil
+    type = options[:type] || nil
+
     error "no name given" if name.nil?
 
     schema = JSON.parse(options[:schema]) if options[:schema]
-    semantics = JSON.parse(options[:semantics]) if options[:semantics]
     is_public = options[:public] || false
    
-    hash = set_relation_properties(schema,semantics,is_public) 
+    hash = set_relation_properties(schema,is_public)
+    if file
+      type ||= File.extname(file).gsub(".", "")
+      rows = sanity_check_file(file,type, {"columns" => hash[:schema]})
+      hash[:rows] = rows
+    end
+
     res = api.data.create name, hash
     
     if res['error']
       display "error: #{res['error_message']}"
     else
-      display "relation ##{res['id']} #{res['action']}. size: #{res['size']}"
+      display "relation ##{res['id']} #{res['action']}. size: #{res['size'] || 0} rows."
     end
     
   end
@@ -167,13 +202,24 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     res = self.api.data.get(name)
     
     if res["rows"].size > 0
-      
-      headings = res["rows"].first.keys
-      headings.delete("id")
+      headings = []
+      concrete_headings = res["rows"].first.keys
+      concrete_headings.delete("id")
+      concrete_headings.each do |ch|
+        has_alias = false
+        res['column_aliases'].each do |al|
+          if(al["concrete_name"] == ch)
+            headings << al["alias"]
+            has_alias = true
+          end
+        end
+        headings << ch if !has_alias
+      end
+
       table = Terminal::Table.new :headings => headings    
       res["rows"].each do |obj|
         
-        new_row = headings.map do |heading|
+        new_row = concrete_headings.map do |heading|
           if options[:no_truncation]
             obj[heading]
           else
@@ -216,7 +262,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     relations = options[:relations]
     is_public = options[:public] || false
    
-    hash = set_dataset_properties(schema,relations,is_public) 
+    hash = set_relation_properties(schema,relations,is_public) 
     res = api.data.create name, hash
 
     type = options[:type]
@@ -233,75 +279,45 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
 
 private
 
-  def set_dataset_properties(schema,relations,is_public)
+  def set_relation_properties(schema,is_public)
     valid_types=["STRING", "NUMERIC", "FLOAT"]
+    meta_names=["confidence", "since", "source"]
     if schema.nil?
       schema = []
       
       # Get the column types (required)
-      index = 0
+      index = 1
+      display "Please enter column names and types:\n", false
+      already_aliased = {}
       while true
-        
-        display "type for column v#{index} [#{valid_types.join(', ')}] (empty when done):", false
-        type = ask.upcase
-        break if type == "" || type.nil?
-        unless valid_types.member?(type)
-          warn "invalid type: #{type}"
+      
+        display "Column #{index} name (empty when done): ", false
+        cname = ask.strip
+        break if cname == "" || cname.nil?
+        if((cname[0].downcase == "v" and cname[1...-1].respond_to?("to_i") and cname[1...-1].to_i >= 0) or meta_names.member?(cname.downcase))
+          warn "\"v[number]\", \"confidence\", \"since\" and \"source\" are special names in Zillabyte. Please name your column name something else."
+          next
+        end
+        if(already_aliased[cname])
+          warn "Column name defined previously. Please use unique column names."
+          next
+        end
+
+        display "Type for column #{index} [#{valid_types.join(', ')}]: ", false
+        ctype = ask.upcase
+        unless valid_types.member?(ctype)
+          warn "invalid type: #{ctype}"
           next
         end   
-        index += 1           
-        schema << type
+        index += 1
+        schema << {cname => ctype}
+        already_aliased[cname] = 1
       end
       
       display "using schema: #{schema.to_json}"
       
     end
-    
-    if relations.nil?
-      
-      # Get the semantics (inner relations)
-      relations = []
-      display "would you like to define relations on your dataset? (yes/No): ", false
-      if ['y', 'yes'].include?(ask.downcase)
-        
-        # Display the first bit of the taple
-        display Terminal::Table.new(:rows => [schema], :headings => schema.size.times.map{|i| "v#{i}"}).to_s
-        
-        # Start collection relations 
-        while true
-          display "relation predicate (ex: \"(company v0)\", \"(coordinates v1 v2)\"): ", false
-          input = ask
-          break if input.nil? || input == ""
-          
-          pred = input.gsub("(","").gsub(")", "").split(/\s+/)
-          pred_name = pred[0]
-          pred_cols = pred[1..-1]
-          pred_cols.each_with_index do |col, pred_index|
-            m = /v(\d+)/.match(col)
-            if m.nil?
-              warn "the predicate variables must be of the form \"v[1-10]\""
-              next
-            end
-            
-            column = m[1].to_i
-            if column >= schema.size
-              warn "the variable #{col} is out of range"
-              next
-            end
-            
-            # Otherwise, successful 
-            relations[column] ||= []
-            relations[column] << "#{pred_name}.#{pred_index}"
-          end
-          
-        end
-        
-        # Show them what the relation looks like
-        display "using relation: #{relations.to_json}"
-        
-      end
-    end
-    {:schema => schema, :relations => relations, :public => is_public}
+    {:schema => schema, :public => is_public}
   end
 
   def sanity_check_file(file,type,dataset)

data/lib/zillabyte/cli/templates/ruby/Gemfile

@@ -1,3 +1,4 @@
+source 'https://rubygems.org'
+
+gem "zillabyte"
 
-gem "zillabyte", :path => "~/zb1/multilang/"
-gem "zillabyte-cli", :path => "~/zb1/cli/"

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

@@ -22,7 +22,10 @@ Zillabyte.simple_function do |fn|
     url = tuple['v0']
     html = tuple['v1']
     
-    # does this page contains the 'hello world' phrase? If so, emit it
+    # 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') or html.include?('world')
       controller.emit("URL" => url)
     end

data/zillabyte-cli.gemspec

@@ -20,23 +20,18 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   
   spec.add_dependency "netrc",       "~> 0.7.7"
   spec.add_dependency "rest-client", "~> 1.6.1"
   
-  spec.add_dependency "excon"
-  spec.add_dependency "terminal-table"
+  spec.add_dependency "excon", "~> 0.31"
+  spec.add_dependency "terminal-table", "~> 1.4"
   spec.add_dependency "activesupport", "~> 3.2.11"
   
-  spec.add_dependency "colorize"
-  spec.add_dependency "chronic"
-  spec.add_dependency "ascii_charts"
-  spec.add_dependency "indentation"
-  
-  spec.add_dependency "bundler"
-
-  spec.add_dependency "mkfifo"
-  
+  spec.add_dependency "bundler", "~> 1.3"
+  spec.add_dependency "colorize", "~> 0.6"
+  spec.add_dependency "chronic", "~> 0.10"
+  spec.add_dependency "ascii_charts", "~> 0.9.1"
+  spec.add_dependency "indentation", "~> 0.1"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +56,30 @@ dependencies:
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -109,89 +95,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.11
 - !ruby/object:Gem::Dependency
-  name: colorize
-  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'
-- !ruby/object:Gem::Dependency
-  name: chronic
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: ascii_charts
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: indentation
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: ascii_charts
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: mkfifo
+  name: indentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 description: The Official Zillabyte CLI Gem
 email:
 - gem@zillabyte.com