zillabyte-cli 0.0.20 → 0.0.21

data/lib/zillabyte/cli/auth.rb

@@ -10,7 +10,7 @@ class Zillabyte::Command::Auth < Zillabyte::Command::Base
 
   # auth:login
   #
-  # Sets the Zillabyte Auth token
+  # sets the Zillabyte auth token
   # 
   # --auth_token TOKEN # provide the token
   def login
@@ -25,7 +25,7 @@ class Zillabyte::Command::Auth < Zillabyte::Command::Base
   
   # auth:logout
   #
-  # Sets the Zillabyte Auth token
+  # sets the Zillabyte auth token
   #
   def logout
     Zillabyte::Auth.logout

data/lib/zillabyte/cli/config.rb

@@ -19,7 +19,7 @@ module Zillabyte
           conf_file = File.join(dir, options[:config_file] || DEFAULT_CONFIG_FILE)
         end
         type = options[:type]
-       
+
         return nil unless File.exists?(conf_file)
         hash = YAML.load_file(conf_file)
         
@@ -31,6 +31,7 @@ module Zillabyte
         top_dir = File.expand_path(hash['top_dir'] || ".", dir)
         top_path = Pathname.new(top_dir)
         rel_dir = Pathname.new(dir).relative_path_from(top_path).to_s
+
         ignore_files = if hash.has_key?("ignore_files")
           ignore_files = hash["ignore_files"]
           ignore_files_array = ignore_files.respond_to?(:to_a) ? ignore_files.to_a() : [ignore_files]

data/lib/zillabyte/cli/help.rb

@@ -6,7 +6,7 @@ class Zillabyte::Command::Help < Zillabyte::Command::Base
 
   PRIMARY_NAMESPACES = %w( relations query apps logs )
   
-
+  # help
   def index(*direct_args)
     
     if command = args.shift || direct_args.shift
@@ -45,6 +45,7 @@ private
   end
 
   def legacy_help_for_command(command)
+  
     Zillabyte::Command::Help.groups.each do |group|
       group.each do |cmd, description|
         return description if cmd.split(" ").first == command
@@ -90,7 +91,7 @@ private
       if command_alias.include?("-") or command_alias.include?(":")
         next #skip -h, -help and live-run etc.
       end
-      puts command_alias.ljust(a_size) + " --> " + alias_to.ljust(a_to_size) + " # " + commands[alias_to][:summary]
+      puts "#{command_alias.ljust(a_size)} --> #{alias_to.ljust(a_to_size)}  # #{commands[alias_to][:summary]}"
     end
   end
 

data/lib/zillabyte/cli/nuke.rb

@@ -0,0 +1,42 @@
+require "zillabyte/cli/base"
+require "zillabyte/cli/config"
+require "zillabyte/common"
+
+
+# HIDDEN: resets all user state
+#
+class Zillabyte::Command::Nuke < Zillabyte::Command::Base
+
+
+  
+  
+  # apps:nuke
+  #
+  # destroys all state associated with the current user
+  # 
+  # --force # this option must always be given
+  #
+  def index
+    
+    unless options[:force]
+      fail("--force must be given") 
+      raise
+    end
+    
+    res = api.request(
+      :expects => 200,
+      :method  => :post,
+      :path    => "/nukes",
+      :body    => options.to_json
+    )
+    res.body
+    
+    if options[:type] == "json"
+      display res.body.to_json
+    else
+      display "Nuked #{res.body['deleted_apps']} app(s) and #{res.body['deleted_apps']} relations(s)"
+    end
+    
+  
+  end
+end

data/lib/zillabyte/cli/relations.rb

@@ -11,7 +11,7 @@ require "json"
 class Zillabyte::Command::Relations < Zillabyte::Command::Base
 
   MAX_POLL_SECONDS = 60 * 5
-  POLL_SLEEP = 0.5
+  POLL_SLEEP = 1
 
   # relations
   #
@@ -87,7 +87,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
         error(res['error'], type)
       else
         if type == "json"
-          display {}.to_json
+          display "{}"
         else
           display res["body"]
         end
@@ -119,7 +119,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     error("no name given", type) if name.nil?
 
     schema = options[:schema] if options[:schema]
-    is_public = options[:public] || nil
+    is_public = options[:public] || false
     description = options[:description] || nil
     aliases = options[:aliases] || nil
 
@@ -140,7 +140,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       error("#{res['error_message']}", type)
     else
       if type == "json"
-        display {}.to_json
+        display "{}"
       else
         display "relation ##{res['id']} #{res['action']}. size: #{res['size'] || 0} rows."
       end
@@ -174,7 +174,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
    
     res = self.api.data.append(id, options.merge({:rows => rows}))
     if type == "json"
-      display {}.to_json
+      display "{}"
     else
       display "relation ##{id} appended #{res["size"]} rows"
     end
@@ -234,7 +234,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     end
 
     if type == "json"
-      display {}.to_json
+      display "{}"
     else
       display "pulled data from relation ##{id} to file #{file}"
     end
@@ -272,7 +272,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     res = self.api.data.pull_to_s3(id, s3_params)
 
     if type == "json"
-      display {}.to_json
+      display "{}"
     else
       display "downloading relation data to s3://#{res["s3_bucket"]}/#{res["s3_file_key"]}/"
       display "if the relation is large, this may take a while, please check your s3 account after a few minutes"
@@ -372,7 +372,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       display TableOutputBuilder.build_table(headings, rows, type)
     else
       if type == "json"
-        display {}.to_json
+        display "{}"
       else
         display "empty relation"
       end

data/lib/zillabyte/cli/repl.rb

@@ -1,22 +1,43 @@
 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
-  #
+  # start a console session for zillabyte
+  # --quiet # HIDDEN
+  # --history HISTORY# HIDDEN hack to allow history for readline
   def index
-    
-      while true
-        
-        display "zilla> ", false
-        cmd = ask
-        exec "zillabyte #{cmd}; zillabyte repl"
-        
+    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/ruby/Gemfile.lock

@@ -0,0 +1,81 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    ascii_charts (0.9.1)
+    aws-sdk (1.33.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
+    builder (3.0.4)
+    chronic (0.10.2)
+    colorize (0.7.2)
+    erubis (2.7.0)
+    excon (0.33.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    indentation (0.1.1)
+    journey (1.0.4)
+    json (1.8.1)
+    mime-types (2.2)
+    mini_portile (0.5.3)
+    multi_json (1.9.2)
+    netrc (0.7.7)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    terminal-table (1.4.5)
+    tilt (1.4.1)
+    time_difference (0.3.2)
+      activesupport
+    uuidtools (2.1.4)
+    zillabyte (0.0.20)
+      zillabyte-cli (~> 0.0.20)
+    zillabyte-cli (0.0.20)
+      actionpack (~> 3.2.13)
+      activesupport (~> 3.2.11)
+      ascii_charts (~> 0.9.1)
+      aws-sdk (~> 1.33.0)
+      bundler (~> 1.3)
+      chronic (~> 0.10)
+      colorize (~> 0.6)
+      excon (~> 0.31)
+      indentation (~> 0.1)
+      mini_portile (~> 0.5.0)
+      multi_json (~> 1.0)
+      netrc (~> 0.7.7)
+      rest-client (~> 1.6.1)
+      terminal-table (~> 1.4)
+      time_difference
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  zillabyte

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

@@ -3,7 +3,7 @@
 
 require 'zillabyte' 
 
-app = Zillabyte.app("hello_world_app")
+Zillabyte.app("hello_world_app")
   .source("select * from web_pages")
   .each{ |page|
     if page['html'].include? "hello world"
@@ -13,4 +13,4 @@ app = Zillabyte.app("hello_world_app")
   .sink{
     name "has_hello_world"
     column "url", :string
-  }
+  }

data/lib/zillabyte/cli/version.rb

@@ -4,8 +4,15 @@ require "zillabyte/cli/base"
 #
 class Zillabyte::Command::Version < Zillabyte::Command::Base
   
+  # version
+  # 
+  # display version number of the CLI
   def index(*direct_args)
-    display "Zillabyte CLI Version #{Zillabyte::CLI::VERSION}"
+    if options[:type] == "json"
+      display( {:version => Zillabyte::CLI::VERSION}.to_json )
+    else
+      display "Zillabyte CLI Version #{Zillabyte::CLI::VERSION}"
+    end
   end
 
 end

data/lib/zillabyte/command.rb

@@ -165,10 +165,16 @@ module Zillabyte
 
       args.concat(invalid_options)
 
+      # Make the --json command universal.. 
+      if invalid_options.include?("--json")
+        invalid_options.delete("--json")
+        opts[:type] = "json"
+      end
+
       @current_args = args
       @current_options = opts
       @invalid_arguments = invalid_options
-
+      
       @anonymous_command = [ARGV.first, *@anonymized_args].join(' ')
       begin
         usage_directory = "#{home_directory}/.zillabyte/usage"

data/lib/zillabyte/helpers.rb

@@ -17,11 +17,12 @@ module Zillabyte
     
     def error(message, format=nil)
       if format == "json"
-        $stderr.puts(({"error"=>message}).to_json)
+        $stdout.puts(({"error"=>message}).to_json)
+        exit
       else
         $stderr.puts(format_with_bang(message))
+        exit(1)
       end
-      exit(1)
     end
 
     def format_with_bang(message)

data/lib/zillabyte-cli/version.rb

@@ -1,5 +1,5 @@
 module Zillabyte
   module CLI
-    VERSION = "0.0.20"
+    VERSION = "0.0.21"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -257,6 +257,7 @@ files:
 - lib/zillabyte/api.rb
 - lib/zillabyte/auth.rb
 - lib/zillabyte/cli/apps.rb
+- lib/zillabyte/cli/apps.rb.orig
 - lib/zillabyte/cli/auth.rb
 - lib/zillabyte/cli/base.rb
 - lib/zillabyte/cli/config.rb
@@ -266,6 +267,7 @@ files:
 - lib/zillabyte/cli/helpers/table_output_builder.rb
 - lib/zillabyte/cli/host.rb
 - lib/zillabyte/cli/log_formatter.rb
+- lib/zillabyte/cli/nuke.rb
 - lib/zillabyte/cli/query.rb
 - lib/zillabyte/cli/relations.rb
 - lib/zillabyte/cli/repl.rb
@@ -277,6 +279,7 @@ files:
 - 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/Gemfile.lock
 - lib/zillabyte/cli/templates/ruby/zillabyte.conf.yaml
 - lib/zillabyte/cli/version.rb
 - lib/zillabyte/cli/zillalogs.rb