zillabyte-cli 0.1.4 → 0.1.5

data/lib/zillabyte/cli/query.rb

@@ -293,7 +293,7 @@ class Zillabyte::Command::Query < Zillabyte::Command::Base
     query = options[:query] || shift_argument
     error("query cannot be empty", type) if query.nil?
 
-    type = options [:output_type]
+    type = options[:output_type]
 
     user_s3_access_key = options[:s3_access_key] || shift_argument
     user_s3_secret = options[:s3_secret] || shift_argument

data/lib/zillabyte/cli/repl.rb

@@ -1,6 +1,4 @@
 require "zillabyte/cli/base"
-require 'readline'
-require("shellwords")
 # REPL console for zillabyte commands
 #
 class Zillabyte::Command::Repl < Zillabyte::Command::Base
@@ -13,7 +11,10 @@ class Zillabyte::Command::Repl < Zillabyte::Command::Base
   # --history HISTORY                           # HIDDEN hack to allow history for readline
   #
   def index
+    require("readline")
+    require("shellwords")
     if !options[:quiet]
+      Zillabyte::Command.load("version")
       Zillabyte::Command.run("version")
       display "Type q,exit or Ctrl+D to quit\n\n"
     end
@@ -47,6 +48,7 @@ class Zillabyte::Command::Repl < Zillabyte::Command::Base
             buf = ""
             begin
               pid = fork() do
+                Zillabyte::Command.load(command)
                 Zillabyte::Command.run(command, args)
               end
             ensure

data/lib/zillabyte/command.rb

@@ -1,20 +1,31 @@
-require 'zillabyte/helpers'
-require "optparse"
-
 module Zillabyte
   module Command
     class CommandFailed  < RuntimeError; end
 
-    extend Zillabyte::Helpers
-
-    def self.load
-      Dir[File.join(File.dirname(__FILE__), "cli", "*.rb")].each do |file|
-        require file
+    # command should be non-nil
+    def self.load(command)
+      # To speed up load times, we try to load only the minimal required
+      # libraries if the fully qualified name is given (i.e.
+      # command:subcommand)
+      base_dir = File.join(File.dirname(__FILE__), "cli")
+      command_file = "#{command[/^([^:]*):?/, 1]}.rb"
+      # fnmatch? check is for safety (to ensure the command matches only a
+      # single file).
+      if File.fnmatch?("*.rb", command_file, File::FNM_PATHNAME)
+        begin
+          require(File.join(base_dir, command_file))
+          return
+        rescue LoadError
+          # Command wasn't a direct match, so fall through to the normal load.
+        end
       end
-      Dir[File.join(File.dirname(__FILE__), "cli", "helpers", "*.rb")].each do |file|
-        require file
+      # Normal load (we don't know what command we're going to run, so we
+      # speculatively load everything).
+      Dir[File.join(base_dir, "*.rb")].each do |file|
+        require(file)
       end
-      unregister_commands_made_private_after_the_fact
+    ensure
+     unregister_commands_made_private_after_the_fact
     end
 
     def self.commands
@@ -118,11 +129,13 @@ module Zillabyte
 
       if args.include?('-h') || args.include?('--help')
         args.unshift(cmd) unless cmd =~ /^-.*/
+        self.load("help")
         cmd = 'help'
         command = parse(cmd)
       end
 
       if cmd == '--version' or cmd == '-version'
+        self.load("version")
         cmd = 'version'
         command = parse(cmd)
       end
@@ -132,7 +145,7 @@ module Zillabyte
 
       opts = {}
       invalid_options = []
-
+      require("optparse")
       parser = OptionParser.new do |parser|
         # remove OptionParsers Officious['version'] to avoid conflicts
         # see: https://github.com/ruby/ruby/blob/trunk/lib/optparse.rb#L814
@@ -177,6 +190,7 @@ module Zillabyte
       
       @anonymous_command = [ARGV.first, *@anonymized_args].join(' ')
       begin
+        require("fileutils")
         usage_directory = "#{home_directory}/.zillabyte/usage"
         FileUtils.mkdir_p(usage_directory)
         usage_file = usage_directory << "/#{Zillabyte::CLI::VERSION}"
@@ -210,6 +224,9 @@ module Zillabyte
     end
 
     def self.run(cmd, arguments=[])
+      require("excon/errors")
+      require("zillabyte/helpers")
+      extend(Zillabyte::Helpers)
       begin
         object, method = prepare_run(cmd, arguments.dup)
         object.send(method)

data/lib/zillabyte/common/tar.rb

@@ -1,11 +1,6 @@
 # https://gist.github.com/sinisterchipmunk/1335041
 
-require 'rubygems'
-require 'rubygems/package'
-require 'zlib'
-require 'fileutils'
-
-module Zillabyte::Common
+module Zillabyte; module Common
   class Tar 
 
     # Creates a tar file in memory recursively
@@ -17,6 +12,8 @@ module Zillabyte::Common
     # Returns a StringIO whose underlying String
     # is the contents of the tar file.
     def self.tar(path, ignore_files = [])
+      require("stringio")
+      require("rubygems/package")
       tarfile = StringIO.new("")
       ignore_regexp = if ignore_files.empty?()
         []
@@ -59,6 +56,8 @@ module Zillabyte::Common
     # returning a new StringIO representing the 
     # compressed file.
     def self.gzip(tarfile)
+      require("stringio")
+      require("zlib")
       gz = StringIO.new("")
       z = Zlib::GzipWriter.new(gz)
       z.write tarfile.string
@@ -81,6 +80,8 @@ module Zillabyte::Common
     # untars the given IO into the specified
     # directory
     def self.untar(io, destination)
+      require("fileutils")
+      require("rubygems/package")
       Gem::Package::TarReader.new io do |tar|
         tar.each do |tarfile|
           destination_file = File.join destination, tarfile.full_name
@@ -99,4 +100,4 @@ module Zillabyte::Common
     end
   end
   
-end
+end; end

data/lib/zillabyte/helpers.rb

@@ -1,5 +1,4 @@
-# require "vendor/zillabyte/okjson"
-require "json"
+require("json")
 
 module Zillabyte
   module Helpers
@@ -117,6 +116,7 @@ module Zillabyte
     def add_git_remote(name, remote = "zillabyte")
       
       remotes = {}
+      require("zillabyte/auth")
       remotes[remote] = Zillabyte::Auth.git_host
       
       if ENV["ZILLABYTE_EXTRA_GIT_REMOTES"]
@@ -148,6 +148,7 @@ module Zillabyte
     
     
     def get_flow_name(dir = Dir.pwd)
+      require("zillabyte/api/flows")
       meta = Zillabyte::API::Flows.get_rich_meta_info_from_script(dir)
       return meta["name"] if meta
       return nil
@@ -155,6 +156,7 @@ module Zillabyte
     
     
     def handle_downloading_manifest(file, res, type = nil)
+      require("open-uri")
       if res["manifest"]
         res["manifest"].each_with_index do |uri, index|
         

data/lib/zillabyte/runner/app_runner.rb

@@ -1,8 +1,4 @@
-require "zillabyte/cli/base"
-require "zillabyte/runner"
 require "zillabyte/runner/multilang_operation"
-require 'thread'
-
 
 # HIDDEN:
 class Zillabyte::Runner::AppRunner < Zillabyte::Command::Base 
@@ -175,6 +171,7 @@ class Zillabyte::Runner::AppRunner < Zillabyte::Command::Base
 
 
   def cdisplay(name, message)
+    require("colorize")
     color = @colors[name] || :default
     if message == ""
       display ""
@@ -196,6 +193,7 @@ class Zillabyte::Runner::AppRunner < Zillabyte::Command::Base
 
 
   def query_agnostic(query)
+    require("zillabyte/api")
     @session.api.query.agnostic(query)
   end
 
@@ -205,6 +203,8 @@ class Zillabyte::Runner::AppRunner < Zillabyte::Command::Base
 
 
   def describe_app(meta)
+    require("colorize")
+    require("indentation")
     colors ||= [:green, :yellow, :magenta, :cyan, :white, :blue, :light_yellow, :light_blue, :red, :light_magenta, :light_cyan]
     rjust = 20
     display "#{'app name'.rjust(rjust)}: #{meta['name']}"

data/lib/zillabyte/runner/component_operation.rb

@@ -1,9 +1,4 @@
-require 'json'
-require 'mkfifo'
-require "zillabyte/runner"
 require "zillabyte/runner/multilang_operation"
-require "zillabyte/runner/component_runner"
-require 'zillabyte/api/components'
 
 
 
@@ -213,6 +208,7 @@ class Zillabyte::Runner::ComponentOperation
 
     # Start communication with API
     api = @__tester.session.api
+    require("zillabyte/api/components")
     caller = Zillabyte::API::Components.new(api)
     component_id = @__node["id"]
     output_format = @__node["output_format"]
@@ -567,6 +563,7 @@ class Zillabyte::Runner::ComponentOperation
         cmd = "cd \"#{@__dir}\"; PYTHONPATH=~/zb1/multilang/python/Zillabyte python \"#{full_script}\" #{arg}  #{stderr_opt}"
       end
     when "js"
+      require("zillabyte/api/settings")
       cmd = "cd \"#{@__dir}\"; NODE_PATH=~/zb1/multilang/js/src/lib #{Zillabyte::API::NODEJS_BIN}  \"#{full_script}\" #{arg} #{stderr_opt}"
     else
       cdisplay("no language specified")

data/lib/zillabyte/runner/component_runner.rb

@@ -1,8 +1,5 @@
-require "zillabyte/cli/base"
-require "zillabyte/runner"
 require "zillabyte/runner/multilang_operation"
 require "zillabyte/runner/component_operation"
-require 'thread'
 
 # HIDDEN:
 class Zillabyte::Runner::ComponentRunner < Zillabyte::Command::Base 
@@ -189,6 +186,7 @@ class Zillabyte::Runner::ComponentRunner < Zillabyte::Command::Base
 
 
   def cdisplay(name, message)
+     require("colorize")
      color = @colors[name] || :default
       if message == ""
         display ""
@@ -203,6 +201,8 @@ class Zillabyte::Runner::ComponentRunner < Zillabyte::Command::Base
   end
 
   def describe_component(meta)
+    require("colorize")
+    require("indentation")
     colors ||= [:green, :yellow, :magenta, :cyan, :white, :blue, :light_yellow, :light_blue, :red, :light_magenta, :light_cyan]
     rjust = 20
 

data/lib/zillabyte/runner/multilang_operation.rb

@@ -1,10 +1,6 @@
-require 'json'
-require 'mkfifo'
-require "zillabyte/runner/component_operation"
-
 
 # Emulate a multilang operation
-class Zillabyte::Runner::MultilangOperation
+module Zillabyte; module Runner; class MultilangOperation
 
   HANDSHAKE_MESSAGE = "{\"pidDir\": \"/tmp\"}\n"
   DONE_MESSAGE = "{\"command\": \"done\"}\n"
@@ -16,7 +12,11 @@ class Zillabyte::Runner::MultilangOperation
   ENDMARKER = "\nend\n"
 
   def self.run(node, dir, consumee, consumer_pipes, tester, meta, options = {})
+    require("mkfifo")
+    require("zillabyte/runner/component_operation")
 
+    require("pty")
+    require("open3")
     @__node = node
     @__name = node["name"]
     @__type = node["type"]
@@ -875,7 +875,9 @@ class Zillabyte::Runner::MultilangOperation
     end
 
     # Build table
+    require("terminal-table")
     table = Terminal::Table.new :title => @__name
+    require("csv")
     csv_str = CSV.generate do |csv|
       header_written = false;
       messages.each do |obj|
@@ -1137,4 +1139,4 @@ class Zillabyte::Runner::MultilangOperation
   end
 
 
-end
+end; end; end

data/zillabyte-cli.gemspec

@@ -21,22 +21,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
-  #spec.add_development_dependency "pry"
-  
+
   spec.add_dependency "netrc",       "~> 0.7.7"
   spec.add_dependency "rest-client", "~> 1.6.1"
-  
+
   spec.add_dependency "excon", "~> 0.31"
   spec.add_dependency "terminal-table", "~> 1.4"
   spec.add_dependency "activesupport", "~> 3.2.11"
   spec.add_dependency "multi_json", "~> 1.0"
-  
+
   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"
-  spec.add_dependency "time_difference"
   spec.add_dependency "mkfifo"
 
   spec.post_install_message = """

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,34 +136,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: chronic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: ascii_charts
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: indentation
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +150,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: time_difference
-  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: mkfifo
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +181,6 @@ files:
 - lib/zillabyte/api/data.rb
 - lib/zillabyte/api/flows.rb
 - lib/zillabyte/api/keys.rb
-- lib/zillabyte/api/locks.rb
 - lib/zillabyte/api/logs.rb
 - lib/zillabyte/api/metrics.rb
 - lib/zillabyte/api/queries.rb

data/lib/zillabyte/api/locks.rb

@@ -1,4 +0,0 @@
-module Zillabyte
-	module Lock
-	end
-end