zillabyte-cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWNmZGNhMDJiZmIyNDFlYWYwMTM3MGUzYzliYjk4MmUyN2E1NTk0ZQ==
+    OTIwZDM4NGVlY2I5YWQ0MjMzMGZmMDQwMjcxMDQ0YjAxMGQxOTY1Yg==
   data.tar.gz: !binary |-
-    YzI1NzE2ZDZkNmZjMzM2NmY3MWM3ZjdhNWJjZjczNDBiN2IzNTY5YQ==
+    YjY4ZjE5Njk0ZmJiOGFkNDM3ODBiOTM5YTQ5OGUyNGQ2M2MxYTRhZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDhhYWUxNjJiYmEyZDYxOWFhMWU5ODMxNDE4MGNhZjExMjY3ZmJlMTc1MGZh
-    NDlhMmYzM2JjNTZmMGM5MGJkZTk4YTRmMGExNDViMWUzYmZmZmY4NjllN2Zk
-    NGE3NTdjNmQzYzkyNzJjYWVjZTNhMmI1MmM5MWZjNTY4YjQyYjU=
+    NDljMmMxOWRkY2Q3MDk4N2YwYzc1YTRlYzViM2M4ZDgwYWMzMTdjZDgyNGRl
+    NzAxZDY5ZTRjYzRhNmIxODhlM2EwNDAyNTBjMDcxYWEwY2ZhMWZmZWExMzRk
+    NWFlN2E5MzI5OGQ0YjFkNWQ0NjRkMDg2ODE2ZjllN2M5Nzk1OGE=
   data.tar.gz: !binary |-
-    YTYwY2NlYzM3MzdlYTM4MmJlMWQzZTZlM2NmOGMxNzY3OGZmODk0YTA2YmIy
-    ODFiOGFlN2QwN2I3NmUwMjA2MzdhMDI4ZmE0OGU5NzMwNjgzYjU2YjAzODhj
-    NThhZGI1MjllZTM3Y2Q1OTUxZDMyZWU4OTg4YjM2MzNmMmIwYTU=
+    NzdhYjQ0M2NlZGNkYWEyY2RhNDVlNjU3MTFmYTEzODQyMTYyNjMyY2I2NGE0
+    ZTc3YWMwZjZiNzg5NjYwY2Y4ZjVmY2NmOGQzZjc1NzBlNGZlMTRhMjlhNmM3
+    MzY1N2E2MGZmMTJkMTlmOTAwZGQyZDVlYTZhMDk3ZjdkOWVmNDk=

data/bin/zb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'zillabyte' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+require_relative '../lib/zillabyte-cli'
+Zillabyte::CLI.start(*ARGV)
+

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/zillabyte/api/queries.rb

@@ -69,6 +69,7 @@ class Zillabyte::API::Queries < Zillabyte::API::Base
     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"]

data/lib/zillabyte/cli/base.rb

@@ -1,11 +1,9 @@
 require "fileutils"
 require "zillabyte/api"
 require "zillabyte/command"
-require "action_view"
 
 class Zillabyte::Command::Base 
   include Zillabyte::Helpers 
-  include ActionView::Helpers::DateHelper
 
   META_COLUMNS = ["since", "confidence", "source"]
 

data/lib/zillabyte/cli/data.rb

@@ -24,6 +24,7 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     self.list
   end
   
+  
 
   # data
   #   
@@ -54,7 +55,12 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     display "Total number of datasets: "+rows.length.to_s if type.nil?
 
   end
-
+  alias_command "relations:list", "data:list"
+  alias_command "relations", "data:list"
+  alias_command "datasets:list", "data:list"
+  alias_command "datasets", "data:list"
+  alias_command "dataset:list", "data:list"
+  alias_command "dataset", "data:list"
 
   # data:delete ID
   # 
@@ -97,6 +103,10 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
       end
     end
   end
+  alias_command "relations:delete", "data:delete"
+  alias_command "relation:delete", "data:delete"
+  alias_command "datasets:delete", "data:delete"
+  alias_command "dataset:delete", "data:delete"
 
 
   # data:create NAME
@@ -149,6 +159,11 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     end
 
   end
+  alias_command "relations:create", "data:create"
+  alias_command "relation:create", "data:create"
+  alias_command "datasets:create", "data:create"
+  alias_command "dataset:create", "data:create"
+  
   
   
   # data:append ID FILE
@@ -194,6 +209,12 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     end
 
   end
+  alias_command "relations:append", "data:append"
+  alias_command "relation:append", "data:append"
+  alias_command "datasets:append", "data:append"
+  alias_command "dataset:append", "data:append"
+  
+  
 
   # data:pull ID OUTPUT
   #
@@ -223,6 +244,17 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     end
 
   end
+  alias_command "download", "data:pull"
+  alias_command "data:download", "data:pull"
+  alias_command "relations:pull", "data:pull"
+  alias_command "relation:pull", "data:pull"
+  alias_command "relations:download", "data:pull"
+  alias_command "relation:download", "data:pull"
+  alias_command "datasets:pull", "data:pull"
+  alias_command "dataset:pull", "data:pull"
+  alias_command "datasets:download", "data:pull"
+  alias_command "dataset:download", "data:pull"
+  
 
   # data:pull:s3 ID S3_KEY S3_SECRET S3_BUCKET s3_FILE_KEY
   #
@@ -260,6 +292,10 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     end
   end
   alias_command "data:pull:s3", "data:pull_to_s3"
+  alias_command "relations:pull:s3", "data:pull_to_s3"
+  alias_command "relation:pull:s3", "data:pull_to_s3"
+  alias_command "datasets:pull:s3", "data:pull_to_s3"
+  alias_command "dataset:pull:s3", "data:pull_to_s3"
 
 
   # data:show ID
@@ -364,7 +400,11 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     end
     
   end
-
+  alias_command "relations:show", "data:show"
+  alias_command "relation:show", "data:show"
+  alias_command "datasets:show", "data:show"
+  alias_command "dataset:show", "data:show"
+  
 
   private
 

data/lib/zillabyte/cli/flows.rb

@@ -114,11 +114,11 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # --mode MODE                                 # Specify development or production mode for dependencies #HIDDEN
   #   
   def prep()
-    mode, bundle_flags = case options[:mode]
+    mode, bundle_extra = case options[:mode]
     when nil, "development"
       [:development, ""]
     when "production"
-      [:production, "--deployment"]
+      [:production, "; bundle install --deployment"]
     else
       error("Unsupported mode #{options[:mode].inspect()}.  Zillabyte currently supports development and production.")
     end
@@ -140,7 +140,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     when "ruby"
       # Execute in the bundler context
       full_script = File.join(dir, meta["script"])
-      cmd = "cd \"#{meta['home_dir']}\"; unset BUNDLE_GEMFILE; unset RUBYOPT; bundle install #{bundle_flags}"
+      cmd = "cd \"#{meta['home_dir']}\"; unset BUNDLE_GEMFILE; unset RUBYOPT; bundle install #{bundle_extra}"
       exec(cmd)
     when "python"
       vDir = "#{meta['home_dir']}/vEnv"
@@ -248,7 +248,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       message = row[2].strip
       color_map[name] ||= colors.shift
       if time
-        display "#{"* #{name} - #{time_ago_in_words(time)} ago".colorize(color_map[name])}:" if type.nil?
+        display "#{"* #{name} - #{time}".colorize(color_map[name])}:" if type.nil?
       else
         display "#{"* #{name}".colorize(color_map[name])}:" if type.nil?
       end

data/lib/zillabyte/cli/query.rb

@@ -5,7 +5,7 @@ require "zillabyte/cli/base"
 class Zillabyte::Command::Query < Zillabyte::Command::Base
 
   MAX_POLL_SECONDS = 60 * 5
-  POLL_SLEEP = 0.5
+  POLL_SLEEP = 1
 
   # query:sxp EXPRESSION
   #

data/lib/zillabyte/runner/app_runner.rb

@@ -175,13 +175,23 @@ class Zillabyte::Runner::AppRunner < Zillabyte::Command::Base
 
 
   def cdisplay(name, message)
-
-      color = @colors[name] || :default
-      if message == ""
-        display ""
+    color = @colors[name] || :default
+    if message == ""
+      display ""
+    else
+      
+      if message.is_a?(Array)
+        lines = message
       else
-        display "#{name} - #{message}".colorize(color)
+        lines = message.split("\n")
       end
+      
+      prefix = "#{name} - "
+      display "#{prefix}#{lines.first}".colorize(color)
+      lines[1..-1].each do |line|
+        display "#{' '*prefix.size}#{line}".colorize(color)
+      end
+    end
   end
 
 

data/lib/zillabyte/runner/multilang_operation.rb

@@ -869,7 +869,7 @@ class Zillabyte::Runner::MultilangOperation
     end
 
     if messages.empty?
-      cdisplay "empty relation"
+      cdisplay "no tuples"
       cdisplay "use Ctrl-C to exit"
       return
     end

data/zillabyte-cli.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "excon", "~> 0.31"
   spec.add_dependency "terminal-table", "~> 1.4"
   spec.add_dependency "activesupport", "~> 3.2.11"
-  spec.add_dependency "actionpack", "~> 3.2.13"
   spec.add_dependency "multi_json", "~> 1.0"
   
   spec.add_dependency "bundler", "~> 1.3"
@@ -40,4 +39,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency "time_difference"
   spec.add_dependency "mkfifo"
 
+  spec.post_install_message = """
+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 app:init'
+    Or... check out our Quick Starts by visiting http://docs.zillabyte.com/
+
+Questions, comments? Please visit us at http://docs.zillabyte.com
+"""
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,20 +94,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.11
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -224,10 +210,12 @@ description: The Official Zillabyte CLI Gem
 email:
 - gem@zillabyte.com
 executables:
+- zb
 - zillabyte
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/zb
 - bin/zillabyte
 - lib/zillabyte/api/apps.rb
 - lib/zillabyte/api/base.rb
@@ -309,7 +297,11 @@ homepage: http://www.zillabyte.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+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 app: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