zillabyte-cli 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTIwZDM4NGVlY2I5YWQ0MjMzMGZmMDQwMjcxMDQ0YjAxMGQxOTY1Yg==
+    NjczNzk4NGFlYTc2MGY1M2JjZWExZDNmZjg4MzBkNDlmNGEzYTg3NA==
   data.tar.gz: !binary |-
-    YjY4ZjE5Njk0ZmJiOGFkNDM3ODBiOTM5YTQ5OGUyNGQ2M2MxYTRhZQ==
+    MzM4MDJlMjc3M2NiMmRhM2E5ZWQ5ZThmZjA2ZjY5YTcyZjI3ZTNhMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDljMmMxOWRkY2Q3MDk4N2YwYzc1YTRlYzViM2M4ZDgwYWMzMTdjZDgyNGRl
-    NzAxZDY5ZTRjYzRhNmIxODhlM2EwNDAyNTBjMDcxYWEwY2ZhMWZmZWExMzRk
-    NWFlN2E5MzI5OGQ0YjFkNWQ0NjRkMDg2ODE2ZjllN2M5Nzk1OGE=
+    OWQ5NzcxYTUzODMwNDI3ZDRmMmMyYmM4NTgwY2JjMzU5NDA2ZjZlODdkMWJk
+    YTM5YjI0ZmFhM2VlNDBjZDMzNjZjOGFmNWVlMTRiMTQzOWZhY2UwNDFkOWUw
+    YmUwYjY1ZGJlYjZhNmZjMzYzY2RjYzVkZTljMDc1MjEzNzk2ZjI=
   data.tar.gz: !binary |-
-    NzdhYjQ0M2NlZGNkYWEyY2RhNDVlNjU3MTFmYTEzODQyMTYyNjMyY2I2NGE0
-    ZTc3YWMwZjZiNzg5NjYwY2Y4ZjVmY2NmOGQzZjc1NzBlNGZlMTRhMjlhNmM3
-    MzY1N2E2MGZmMTJkMTlmOTAwZGQyZDVlYTZhMDk3ZjdkOWVmNDk=
+    NjZiMmI2YmM4MjA4NGFiYjNlY2M0MTc2YzQ5ODZmMjM5MjUzZWNlNmViMGQz
+    MmY3MGYxZTY2ZmZiOTk1OGJhZWZlZjU0MTcwMmRkMzYyYTcxZjYwODdlZDkz
+    NjA0MTY3Y2E2YWJlZjVhMzc4NTZmYTU3NDY1ZTNlYzQxMGI1ZGQ=

data/bin/zb

@@ -1,18 +1,4 @@
 #!/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'
+require("zillabyte-cli")
 Zillabyte::CLI.start(*ARGV)
-

data/bin/zillabyte

@@ -1,18 +1,4 @@
 #!/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'
+require("zillabyte-cli")
 Zillabyte::CLI.start(*ARGV)
-

data/lib/zillabyte-cli.rb

@@ -1,5 +1,2 @@
 require "zillabyte-cli/version"
-require "zillabyte/api"
 require "zillabyte/cli"
-require "zillabyte/common"
-require "zillabyte/queries"

data/lib/zillabyte-cli/version.rb

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

data/lib/zillabyte/api.rb

@@ -1,20 +1,4 @@
-# load('zillabyte/helpers.rb') # reload helpers after possible inject_loadpath
-# load('zillabyte/updater.rb') # reload updater after possible inject_loadpath
-
-require "base64"
-require "excon"
-# require "securerandom"
-require "uri"
-require "zlib"
-require "active_support/core_ext/object/to_query.rb"
-require 'json'
-
-
-# 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
+require("json")
 
 class Zillabyte::API
 
@@ -38,6 +22,7 @@ class Zillabyte::API
   
 
   def initialize(options={})
+    require("excon")
     options = OPTIONS.merge(options)
     @session = options.delete(:session)
     @api_key = options.delete(:api_key) || ENV['ZILLABYTE_API_KEY']
@@ -178,76 +163,71 @@ class Zillabyte::API
   
   
   def data
+    require("zillabyte/api/data")
     @_data ||= ::Zillabyte::API::Data.new(self)
   end
   
   def logs
+    require("zillabyte/api/logs")
     @_logs ||= ::Zillabyte::API::Logs.new(self)
   end
 
   def keys
+    require("zillabyte/api/keys")
     @_keys ||= ::Zillabyte::API::Keys.new(self)
   end
 
   def queries
+    require("zillabyte/api/queries")
     @_queries ||= ::Zillabyte::API::Queries.new(self)
   end
   alias_method :query, :queries
   
   def apps
+    require("zillabyte/api/apps")
     @_apps ||= ::Zillabyte::API::Apps.new(self)
   end
   alias_method :app, :apps
 
   def flows
+    require("zillabyte/api/flows")
     @_flows || ::Zillabyte::API::Flows.new(self)
   end
   alias_method :flow, :flows
   
   def components
+    require("zillabyte/api/components")
     @_components ||= ::Zillabyte::API::Components.new(self)
   end
   alias_method :component, :components
 
   def metrics
+    require("zillabyte/api/metrics")
     @_metrics ||= ::Zillabyte::API::Metrics.new(self)
   end
   alias_method :metric, :metrics
   
   def zillalogs
+    require("zilabyte/api/zillalogs")
     @_rules ||= ::Zillabyte::API::Zillalogs.new(self)
   end
   alias_method :zillalog, :zillalogs
   
   def sources
+    require("zillabyte/api/sources")
     @_sources ||= ::Zillabyte::API::Sources.new(self)
   end
   alias_method :source, :sources
   
   def collectors
+    require("zillabyte/api/collectors")
     @_collectors ||= ::Zillabyte::API::Collectors.new(self)
   end
   alias_method :collector, :collectors
   
   def semantic_tags
+    require("zillabyte/api/semantic_tags")
     @_rules ||= ::Zillabyte::API::SemanticTags.new(self)
   end
   alias_method :zillalog, :zillalogs
-
-  def self.load
-    require File.join(File.dirname(__FILE__), "api", "base.rb")
-    Dir[File.join(File.dirname(__FILE__), "api", "*.rb")].sort.each do |file|
-      require file
-    end
-    
-    Dir[File.join(File.dirname(__FILE__), "api", "helpers", "*.rb")].sort.each do |file|
-      require file
-    end
-  end
-
-
 end
-
-
-# Load all helpers...
-Zillabyte::API.load()

data/lib/zillabyte/api/apps.rb

@@ -1,6 +1,4 @@
-require 'net/http'
-require 'zillabyte/cli/config'
-require 'zillabyte/api/flows'
+require("zillabyte/api/flows")
 
 class Zillabyte::API::Apps < Zillabyte::API::Flows
 
@@ -88,7 +86,7 @@ class Zillabyte::API::Apps < Zillabyte::API::Flows
   # POST /apps
   #
   def push_directory(dir, session = nil, options = {})
-    
+    require("zillabyte/common/tar")
     type = options[:output_type]
     # Get the meta info
     options[:local_flag] = 1
@@ -134,6 +132,7 @@ class Zillabyte::API::Apps < Zillabyte::API::Flows
 
 
     if(res.body['uri'])
+      require("net/http")
       uri = URI(res.body['uri'])
       try_again = 1
       while(try_again)

data/lib/zillabyte/api/base.rb

@@ -1,4 +1,4 @@
-class Zillabyte::API::Base
+module Zillabyte; class API; class Base
 
   def initialize(api)
     @api = api
@@ -8,4 +8,4 @@ class Zillabyte::API::Base
     @api.request(*args)
   end
   
-end
+end; end; end

data/lib/zillabyte/api/components.rb

@@ -1,6 +1,4 @@
-require 'net/http'
-require 'zillabyte/cli/config'
-require 'zillabyte/api/flows'
+require("zillabyte/api/flows")
 
 class Zillabyte::API::Components < Zillabyte::API::Flows
 

data/lib/zillabyte/api/data.rb

@@ -1,4 +1,5 @@
-require 'net/http'
+require("zillabyte/api/base")
+require("cgi")
 
 class Zillabyte::API::Data < Zillabyte::API::Base
 

data/lib/zillabyte/api/flows.rb

@@ -1,5 +1,4 @@
-require 'net/http'
-require 'zillabyte/cli/config'
+require("zillabyte/api/base")
 
 class Zillabyte::API::Flows < Zillabyte::API::Base
 
@@ -88,7 +87,8 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
 
   # GET /flows/id/download
   def pull_to_directory(id, dir, session = nil, options = {})
-    
+    require("zillabyte/common/tar")
+    require("stringio")
     # Get the resource. note query params
     type = options[:output_type]
     session.display "downloading ##{id}" if session && type.nil?
@@ -105,11 +105,13 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
     else
       if(hash['tar'])
         session.display "unpacking to #{dir}" if type.nil?
+        require("base64")
         tar = StringIO.new(Base64.decode64(hash['tar']))
         hash.delete('tar')
         Zillabyte::Common::Tar.untar(tar, dir)
       #If you get an uri instead of the tar, then download the file directly from s3
       elsif(hash['uri'])
+        require("net/http")
         session.display "downloading ##{id} to #{dir}" if type.nil?
         uri = URI(hash['uri'])
         try_again = 1
@@ -143,6 +145,7 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
 #                                                                                                               #
 ####################################################IMPORTANT####################################################
   def self.get_rich_meta_info_from_script(dir, session = nil, options = {})
+    require("zillabyte/cli/config")
     hash = Zillabyte::CLI::Config.get_config_info(dir, session, options)
     if hash.nil?
       return {"status" => "error", "error" => "invalid_directory", "error_message" => "The specified directory (#{dir}) does not appear to contain a valid Zillabyte configuration file."}
@@ -153,7 +156,7 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
     full_script = File.join(dir, hash['script'])
     command = nil
     
-
+    require("securerandom")
     info_file = "#{dir}/#{SecureRandom.uuid}"
     arg = "--info --file #{info_file}"
 
@@ -169,6 +172,7 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
         command = "cd \"#{dir}\"; PYTHONPATH=~/zb1/multilang/python/Zillabyte python \"#{full_script}\" #{arg}"
       end
     when "js"
+      require("zillabyte/api/settings")
       #command = "#{Zillabyte::API::CASPERJS_BIN} #{Zillabyte::API::API_CLIENT_JS}  \"#{full_script}\" --info"
       command = "cd \"#{dir}\"; NODE_PATH=~/zb1/multilang/js/src/lib #{Zillabyte::API::NODEJS_BIN} \"#{full_script}\" #{arg}"
     else
@@ -176,6 +180,7 @@ class Zillabyte::API::Flows < Zillabyte::API::Base
       return nil
     end
 
+    require("zillabyte/cli/flows")
     results = Zillabyte::Command::Flows.get_info(command, info_file, dir, options)
 
     begin

data/lib/zillabyte/api/keys.rb

@@ -1,4 +1,5 @@
-require 'net/http'
+require("zillabyte/api/base")
+require("cgi")
 
 class Zillabyte::API::Keys < Zillabyte::API::Base
 

data/lib/zillabyte/api/logs.rb

@@ -1,5 +1,4 @@
-require 'net/http'
-require 'open-uri'
+require("zillabyte/api/base")
 
 class Zillabyte::API::Logs < Zillabyte::API::Base
 

data/lib/zillabyte/api/metrics.rb

@@ -1,3 +1,5 @@
+require("zillabyte/api/base")
+
 class Zillabyte::API::Metrics < Zillabyte::API::Base
 
 
@@ -22,8 +24,7 @@ class Zillabyte::API::Metrics < Zillabyte::API::Base
   
   # GET /metrics
   def show(id, options = {}, block = nil)
-    
-    
+    require("active_support/core_ext/object/to_query.rb")
     if block
       res = @api.request(
         :expects  => 200,

data/lib/zillabyte/api/queries.rb

@@ -1,3 +1,5 @@
+require("zillabyte/api/base")
+
 class Zillabyte::API::Queries < Zillabyte::API::Base
 
 

data/lib/zillabyte/api/semantic_tags.rb

@@ -1,3 +1,4 @@
+require("zillabyte/api/base")
 
 class Zillabyte::API::SemanticTags < Zillabyte::API::Base
 

data/lib/zillabyte/api/sources.rb

@@ -1,3 +1,5 @@
+require("zillabyte/api/base")
+
 class Zillabyte::API::Sources < Zillabyte::API::Base
 
 

data/lib/zillabyte/api/zillalogs.rb

@@ -1,3 +1,4 @@
+require("zillabyte/api/base")
 
 class Zillabyte::API::Zillalogs < Zillabyte::API::Base
 

data/lib/zillabyte/auth.rb

@@ -1,8 +1,3 @@
-require "cgi"
-require "zillabyte/helpers"
-
-require "netrc"
-
 class Zillabyte::Auth
   class << self
     include Zillabyte::Helpers
@@ -55,6 +50,7 @@ class Zillabyte::Auth
 
 
     def netrc_path
+      require("netrc")
       default = Netrc.default_path
       encrypted = default + ".gpg"
       if File.exists?(encrypted)
@@ -65,9 +61,10 @@ class Zillabyte::Auth
     end
 
     def netrc   # :nodoc:
+      require("netrc")
       @netrc ||= begin
         Netrc.read(netrc_path)
-      rescue Zillabyte::Auth::NetrcError => error
+      rescue Netrc::Error => error
         if error.message =~ /^Permission bits for/
           perm = File.stat(netrc_path).mode & 0777
           abort("Permissions #{perm} for '#{netrc_path}' are too open. You should run `chmod 0600 #{netrc_path}` so that your credentials are NOT accessible by others.")
@@ -104,12 +101,13 @@ class Zillabyte::Auth
 
     def write_credentials(email, auth_token)
       begin
+        require("fileutils")
         FileUtils.mkdir_p(File.dirname(netrc_path))
         FileUtils.touch(netrc_path)
         FileUtils.chmod 0600, netrc_path
         netrc[host] = [email, auth_token] 
         netrc.save
-      rescue Zillabyte::Auth::NetrcError => error
+      rescue Netrc::Error => error
         display 'Netrc Read or Save Error'
         display error.message
         exit 1
@@ -119,7 +117,7 @@ class Zillabyte::Auth
     def delete_credentials
       begin 
         netrc.delete(host) 
-      rescue Zillabyte::Auth::NetrcError => error
+      rescue Netrc::Error => error
         display 'Netrc Delete Error'
         display error.message
         exit 1
@@ -128,7 +126,7 @@ class Zillabyte::Auth
       tries = 0
       begin
         netrc.save
-      rescue Zillabyte::Auth::NetrcError => error
+      rescue Netrc::Error => error
         tries +=1
         display 'netrc save error'
         error.message
@@ -151,6 +149,7 @@ class Zillabyte::Auth
     end
 
     def valid_credentials?(email, auth_token)
+      require("zillabyte/api")
       api = Zillabyte::API.new(:api_key => auth_token, :session => self)
       response = api.request(
         :expects  => 200,
@@ -255,8 +254,5 @@ class Zillabyte::Auth
   end
 end
 
-class Zillabyte::Auth::NetrcError < Netrc::Error
-end
-
 class Zillabyte::Auth::InvalidCredentialsException < Exception
 end