zillabyte-cli 0.1.4 → 0.1.5

data/lib/zillabyte/cli.rb

@@ -1,31 +1,15 @@
-load('zillabyte/helpers.rb') # reload helpers after possible inject_loadpath
-# load('zillabyte/updater.rb') # reload updater after possible inject_loadpath
-
-require 'zillabyte/cli/config'
-require "zillabyte/auth"
-require "zillabyte/command"
-require 'terminal-table'
-require 'chronic'
-require 'ascii_charts'
-
-# workaround for rescue/reraise to define errors in command.rb failing in 1.8.6
-if RUBY_VERSION =~ /^1.8.6/
-  # require('zillabyte-api')
-  require('rest_client')
-end
-
-module Zillabyte::CLI
-
-  extend Zillabyte::Helpers
+module Zillabyte; module CLI
 
   def self.start(*args)
     begin
-      command = args.shift.strip rescue "help"
-      Zillabyte::Command.load
+      command = args.shift().strip() rescue "help"
+      require("zillabyte/command")
+      Zillabyte::Command.load(command)
       Zillabyte::Command.run(command, args)
     rescue Interrupt
       `stty icanon echo`
-      error("Command cancelled.")
+      require("zillabyte/helpers")
+      Zillabyte::Helpers.error("Command cancelled.")
     rescue => error
       raise
       #display(error)
@@ -33,5 +17,4 @@ module Zillabyte::CLI
     end
   end
 
-end
-
+end; end

data/lib/zillabyte/cli/apps.rb

@@ -1,14 +1,5 @@
-require "zillabyte/cli/flows"
-require "zillabyte/cli/config"
-require "zillabyte/runner/app_runner"
-require "zillabyte/common"
-require "pty"
-require 'indentation'
-require 'open3'
-require 'securerandom'
-require 'colorize'
-require 'time_difference'
-require 'net/http'
+require("zillabyte/cli/flows")
+require("zillabyte/cli/helpers/table_output_builder")
 
 # manage custom apps
 #
@@ -296,8 +287,10 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
 
     display "initializing empty #{lang} app in #{dir}" if type.nil?
     erb_binding = binding
+    require("fileutils")
     FileUtils.mkdir_p dir
-    
+
+    require("erb")
     Dir[File.join(File.expand_path("../templates/apps/#{lang}", __FILE__), "*")].each do |source_file|
       
       next if File.directory?(source_file)
@@ -496,6 +489,8 @@ class Zillabyte::Command::Apps < Zillabyte::Command::Flows
   private 
 
   def describe_app(meta, colors = {})
+    require("colorize")
+    require("indentation")
     @colors ||= [:green, :yellow, :magenta, :cyan, :light_black, :light_green, :light_yellow, :light_blue, :light_magenta, :light_cyan]
     rjust = 20
     display "#{'app name'.rjust(rjust)}: #{meta['name']}"

data/lib/zillabyte/cli/base.rb

@@ -1,6 +1,4 @@
-require "fileutils"
-require "zillabyte/api"
-require "zillabyte/command"
+require("zillabyte/helpers")
 
 class Zillabyte::Command::Base 
   include Zillabyte::Helpers 
@@ -20,6 +18,8 @@ class Zillabyte::Command::Base
   end
 
   def api
+    require("zillabyte/api")
+    require("zillabyte/auth")
     @__api ||= Zillabyte::API.new(:api_key => Zillabyte::Auth.api_key, :session => self)
   end  
   

data/lib/zillabyte/cli/components.rb

@@ -1,7 +1,4 @@
-require 'yaml'
 require "zillabyte/cli/flows"
-require "zillabyte/cli/config"
-require "zillabyte/common"
 
 # manage custom components
 #
@@ -48,7 +45,9 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
 
     display "initializing empty #{lang} component in #{dir}" if type.nil?
     erb_binding = binding
+    require("fileutils")
     FileUtils.mkdir_p dir
+    require("erb")
     
     Dir[File.join(File.expand_path("../templates/components/#{lang}", __FILE__), "*")].each do |source_file|
       
@@ -88,6 +87,7 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
     end
 
     display "components:\n" if type.nil?
+    require("zillabyte/cli/helpers/table_output_builder")
     display TableOutputBuilder.build_table(headings, rows, type)
     display "Total number of components: " + rows.length.to_s if type.nil?
   end
@@ -235,6 +235,7 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
     dir = options[:directory] || Dir.pwd
     dir = File.expand_path(dir)
     
+    require("zillabyte/api/flows")
     hash = Zillabyte::API::Flows.get_rich_meta_info_from_script(dir, session, options)
     name = hash['name']
     
@@ -247,6 +248,7 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
 
     # Push the component... 
     session.display("packaging directory... ") if session && type.nil?
+    reqire("zillabyte/common/tar")
     tar = Zillabyte::Common::Tar.tar(dir)
     
     # Create the component
@@ -262,6 +264,7 @@ class Zillabyte::Command::Components < Zillabyte::Command::Flows
     
     # Push the tar... 
     if(res['uri'])
+      require("net/http")
       uri = URI(res['uri'])
       try_again = 1
       while(try_again)

data/lib/zillabyte/cli/config.rb

@@ -1,5 +1,3 @@
-require 'yaml'
-
 module Zillabyte
 
   module CLI
@@ -14,13 +12,14 @@ module Zillabyte
        
         conf_file = nil
         if options[:config_file] and File.exists?(options[:config_file])
-          conf_file = options[:config_file]   
+          conf_file = options[:config_file]
         else
           conf_file = File.join(dir, options[:config_file] || DEFAULT_CONFIG_FILE)
         end
         type = options[:output_type]
 
         return nil unless File.exists?(conf_file)
+        require("yaml")
         hash = YAML.load_file(conf_file)
         
         # set other fields on the configuraiton
@@ -29,6 +28,7 @@ module Zillabyte
         # The top_dir and rel_home_dir allows us to package up dependencies that
         # belong to sibling directories (e.g. the collectors directory)
         top_dir = File.expand_path(hash['top_dir'] || ".", dir)
+        require("pathname")
         top_path = Pathname.new(top_dir)
         rel_dir = Pathname.new(dir).relative_path_from(top_path).to_s
 

data/lib/zillabyte/cli/data.rb

@@ -1,10 +1,4 @@
 require "zillabyte/cli/base"
-require "zillabyte/cli/helpers/table_output_builder"
-require "csv"
-require "open-uri"
-require "json"
-require "base64"
-
 
 # manage custom datasets
 #
@@ -51,6 +45,7 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     end
 
     display "datasets\n" if type.nil? && rows.size > 0
+    require("zillabyte/cli/helpers/table_output_builder")
     display TableOutputBuilder.build_table(headings, rows, type)
     display "Total number of datasets: "+rows.length.to_s if type.nil?
 
@@ -195,6 +190,7 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
       
       # TODO: post to direct signed s3 (http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/PresignedPost.html)
       display(".", false)
+      require("base64")
       res = self.api.data.append(id, {:gzip_rows => Base64.encode64(gzip(rows.to_json()))})
       # res = self.api.data.append(id, {:rows => rows})
       
@@ -389,7 +385,7 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
         end
         rows << new_row
       end
-
+      require("zillabyte/cli/helpers/table_output_builder")
       display TableOutputBuilder.build_table(headings, rows, type)
     else
       if type == "json"
@@ -532,7 +528,7 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
     case filetype
     when "csv"
       begin
-
+        require("csv")
         CSV.foreach(file) do |row|
           if row.size != n_columns
             error("dataset expects #{n_columns} column(s). Found a row with #{row.size}::\n #{row}", type)
@@ -610,6 +606,8 @@ class Zillabyte::Command::Data < Zillabyte::Command::Base
 
 
   def gzip(string)
+      require("stringio")
+      require("zlib")
       wio = StringIO.new("w")
       w_gz = Zlib::GzipWriter.new(wio)
       w_gz.write(string)

data/lib/zillabyte/cli/flows.rb

@@ -1,16 +1,4 @@
-require "zillabyte/cli/base"
-require "zillabyte/cli/config"
-require "zillabyte/common"
-require "pty"
-require 'indentation'
-require 'open3'
-require 'securerandom'
-require 'colorize'
-require 'time_difference'
-require 'net/http'
-require "zillabyte/runner/component_runner"
-require "zillabyte/runner/app_runner"
-
+require("zillabyte/cli/base")
 
 # HIDDEN: superclass for components and apps
 #
@@ -87,6 +75,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
         error("target directory not empty. use --force to override", type)
       end
     else
+      require("fileutils")
       FileUtils.mkdir_p(dir)
     end
     
@@ -114,6 +103,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # --mode MODE                                 # Specify development or production mode for dependencies #HIDDEN
   #   
   def prep()
+    require("zillabyte/cli/config")
     mode, bundle_extra = case options[:mode]
     when nil, "development"
       [:development, ""]
@@ -204,6 +194,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def errors
+    require("colorize")
 
     # Init
     flow_id = options[:id] || shift_argument
@@ -219,6 +210,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     type = options[:output_type]
 
     # Make the request
+    require("cgi")
     res = api.request(
       :expects => 200,
       :method => :get,
@@ -241,6 +233,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
       a[1] <=> b[1]
     end
     color_map = {}
+    require("zillabyte/cli/log_formatter")
     colors = LogFormatter::COLORS.clone
     rows.each do |row|
       name = row[0]
@@ -270,7 +263,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def live_run
-
+    require("zillabyte/cli/config")
     name = options[:name] || shift_argument
     type = options[:output_type]
 
@@ -306,7 +299,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def info
-
     dir = options[:directory] || shift_argument
     if dir.nil?
       dir = Dir.pwd
@@ -315,10 +307,12 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     end
     options[:directory] = dir
 
+    require("securerandom")
     info_file = "#{dir}/#{SecureRandom.uuid}"
     type = options[:output_type]
 
     cmd = command("--info --file #{info_file}", type, dir)
+    require("zillabyte/cli/apps")
     flow_info = Zillabyte::Command::Apps.get_info(cmd, info_file, dir, options)
 
     if type == "json"
@@ -421,7 +415,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   def self.get_info(cmd, info_file, dir, options = {})
     type = options[:output_type]
-
     response = `#{cmd}`
     if($?.exitstatus == 1)
 
@@ -482,6 +475,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
     options[:directory] = dir
     
     # Get the flow_type
+    require("zillabyte/api/flows")
     meta = Zillabyte::API::Flows.get_rich_meta_info_from_script(dir, session, {:test => true})
     if meta.nil? || meta["nodes"].nil?
       error "this is not a valid zillabyte app directory"
@@ -499,11 +493,14 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
     case meta["flow_type"]
     when "component"
+      require("zillabyte/runner/component_runner")
       runner = Zillabyte::Runner::ComponentRunner.new()
     when "app"
+      require("zillabyte/runner/app_runner")
       runner = Zillabyte::Runner::AppRunner.new()
     else
       # Default to App
+      require("zillabyte/runner/app_runner")
       runner = Zillabyte::Runner::AppRunner.new()
     end
 
@@ -582,6 +579,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   
 
   def command(arg="--execute_live", type = nil, dir = Dir.pwd, ignore_stderr = false)
+    require("zillabyte/cli/config")
     meta = Zillabyte::CLI::Config.get_config_info(dir, self, options)
 
     #meta = Zillabyte::API::Functions.get_rich_meta_info_from_script(dir, self)
@@ -616,12 +614,15 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   def read_name_from_conf(options = {})
     type = options[:output_type]
+    require("zillabyte/api/apps")
     hash = Zillabyte::API::Apps.get_rich_meta_info_from_script Dir.pwd, options
     error("No id given and current directory does not contain a valid Zillabyte configuration file. Please specify a flow id or run command from the directory containing the flow.",type) if hash["error"]
     hash["name"]
   end
 
   def fetch_logs(hash, operation=nil, exit_on=nil)
+    require("colorize")
+    require("pty")
     def color_for(operation_name)
       @color_map[operation_name] ||= @all_colors[ @color_map.size % @all_colors.size ]
       @color_map[operation_name]

data/lib/zillabyte/cli/help.rb

@@ -1,4 +1,4 @@
-require "zillabyte/cli/base"
+require("zillabyte/cli/base")
 
 # list commands and display help
 #
@@ -12,7 +12,8 @@ class Zillabyte::Command::Help < Zillabyte::Command::Base
     if command = args.shift || direct_args.shift
       if command == "aliases"
         puts "Useful aliases: "
-        puts 
+        puts
+        Zillabyte::Command.load("")
         summary_for_aliases(Zillabyte::Command.command_aliases)
       else
         help_for_command(command)
@@ -102,6 +103,7 @@ private
   end
 
   def help_for_root
+    Zillabyte::Command.load("")
     puts "Usage: zillabyte COMMAND [command-specific-options]"
     puts
     puts "Primary help topics, type \"zillabyte help TOPIC\" for more details:"
@@ -132,6 +134,7 @@ private
   end
 
   def help_for_command(name)
+    Zillabyte::Command.load(name)
     if command_alias = Zillabyte::Command.command_aliases[name]
       display("Alias: #{name} redirects to #{command_alias}")
       name = command_alias

data/lib/zillabyte/cli/helpers/table_output_builder.rb

@@ -1,5 +1,4 @@
-class Zillabyte::Helpers::TableOutputBuilder
-
+module Zillabyte; module Helpers; class TableOutputBuilder
 
   def self.build_table(headings, rows, format = nil)
     if format == "json"
@@ -20,6 +19,7 @@ class Zillabyte::Helpers::TableOutputBuilder
     end
 
     def self.build_terminal_table(headings, rows)
+        require("terminal-table")
         Terminal::Table.new(:headings => headings, :rows => rows).to_s
     end
-end
+end; end; end

data/lib/zillabyte/cli/keys.rb

@@ -1,10 +1,5 @@
 require "zillabyte/cli/base"
 require "zillabyte/cli/helpers/table_output_builder"
-require "cgi"
-require "csv"
-require "open-uri"
-require "json"
-
 
 # manage authentication keys
 #

data/lib/zillabyte/cli/log_formatter.rb

@@ -48,6 +48,7 @@ class LogFormatter
     end
   
     def display(operation_name, operation_index, category, date, line)
+      require("colorize")
       puts "#{get_name(operation_name, operation_index).rjust(9).colorize(color_for(operation_name))} - #{line}"
     end
     
@@ -75,6 +76,7 @@ class LogFormatter
   class Startup < Base
     
     def display(operation_name, operation_index, category, date, line)
+      require("colorize")
       puts "#{get_name(operation_name, operation_index).rjust(15).colorize(color_for(operation_name))} : #{line}"
     end
     

data/lib/zillabyte/cli/nuke.rb

@@ -1,7 +1,4 @@
 require "zillabyte/cli/base"
-require "zillabyte/cli/config"
-require "zillabyte/common"
-
 
 # HIDDEN: resets all user state
 #