holistics 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26e77b302741a732ef4e316c0ec9c1625437e42f
-  data.tar.gz: c194bbd6d10e117bb73326773cc0fff889242b74
+  metadata.gz: 61601d17f426d38122402a767f5b4534e6671b50
+  data.tar.gz: 0c533d1dcb1f12c193ebc79fb168db3524a2fde6
 SHA512:
-  metadata.gz: c58d2d82458634296a4654474c6532314cbfcfac8fcd070b4a392f762c3d592df1445c735c1e6471c37b1f8ed602629797a0599bc5eb86e1ae08d80219e0154d
-  data.tar.gz: 8db5b264195102c9df96c86042538f92dddb01e0a850c26786f80be68931ca982e1bb6a7a0fac9a47ead34a9620dbddded6c45e0656c55132e9920bd585a8358
+  metadata.gz: 9b77f45439562d748fd22fb498e5dc9f130f9d36e18cd67b2bdf05c5a1230e528d6bdba20e4cabd6135d3fe2364f0ac6a9012b8d824ac985ebd8a5827cd0aa6e
+  data.tar.gz: 9ae95aa35c514d7860963d07180d091d3f3b67a75a59e16bff113817e4e231865687accec89143688e7e6f33105a57750eec562d9cb09c5f7eb036735881f97a

data/lib/holistics/api_client.rb

@@ -1,169 +1,171 @@
 require 'httparty'
-require 'holistics/tabular_formatter'
+require 'tabular_formatter'
 require 'yaml'
 require 'json'
 
-class ApiClient
-  SERVER_URL = 'https://secure.holistics.io/'
+module Holistics
+  class ApiClient
+    SERVER_URL = 'https://secure.holistics.io/'
 
-  def login token
-    puts 'Logging in...'
-    response, ok = holistics_authenticate(token)
-    if ok
-      parsed = JSON.parse(response.body)
-      puts 'Authentication successful. Info:'
-      puts "- ID: #{parsed['id']}"
-      puts "- Email: #{parsed['email']}"
+    def initialize
 
-      write_token_to_gconfig(token)
-    else
-      puts 'Error logging in. Please check your token again.'
     end
-  end
 
-  def holistics_authenticate(token)
-    url = api_url_for('users/info.json', token)
-    response = HTTParty.get(url)
-    return response, (response.code == 200)
-  end
+    def login token
+      puts 'Logging in...'
+      response, ok = holistics_authenticate(token)
+      if ok
+        parsed = JSON.parse(response.body)
+        puts 'Authentication successful. Info:'
+        puts "- ID: #{parsed['id']}"
+        puts "- Email: #{parsed['email']}"
 
-  def job_show options
-    job_id = options[:job_id]
-    tail_job(job_id)
-  end
+        write_token_to_gconfig(token)
+      else
+        puts 'Error logging in. Please check your token again.'
+      end
+    end
 
-  def ds_list
-    url = api_url_for('data_sources.json')
-    response = HTTParty.get(url)
-    err_and_exit("Error retrieving list of data sources", response) if response_has_error?(response)
+    def holistics_authenticate(token)
+      url = api_url_for('users/info.json', token)
+      response = HTTParty.get(url)
+      return response, (response.code == 200)
+    end
 
-    parsed = JSON.parse(response.body)
+    def job_show options
+      job_id = options[:job_id]
+      tail_job(job_id)
+    end
 
-    table = [%w(ID Type Name)]
-    rows = parsed.map { |record| [record['id'], record['dbtype'], record['name']] }
-    table.concat(rows)
+    def ds_list
+      url = api_url_for('data_sources.json')
+      response = HTTParty.get(url)
+      err_and_exit('Error retrieving list of data sources', response) if response_has_error?(response)
 
-    puts TabularFormatter.new(table).to_pretty_table
-  end
+      parsed = JSON.parse(response.body)
 
-  def send_transport(options)
-    puts 'Submitting transport job ...'
-    params = build_submit_params(options)
-    response = submit_transport_job(params)
+      table = [%w(ID Type Name)]
+      rows = parsed.map { |record| [record['id'], record['dbtype'], record['name']] }
+      table.concat(rows)
 
-    err_and_exit("Error submitting transport job", response) if response_has_error?(response)
+      puts TabularFormatter.new(table).to_pretty_table
+    end
 
-    parsed = JSON.parse(response.body)
-    job_id = parsed['job_id']
+    def send_transport(options)
+      puts 'Submitting transport job ...'
+      params = build_submit_params(options)
+      response = submit_transport_job(params)
 
-    puts "Job submitted. Job ID: #{job_id}."
-    tail_job(job_id)
-  end
+      err_and_exit("Error submitting transport job", response) if response_has_error?(response)
 
-  def tail_job(job_id)
-    last_ts = ''
-    while true
-      response = fetch_job_status(job_id)
       parsed = JSON.parse(response.body)
-      logs = parsed['job_logs']
+      job_id = parsed['job_id']
 
-      select_logs = logs.select { |log| log['created_at'] > last_ts }
-      select_logs.each do |log|
-        print_log(log)
-      end
-      last_ts = logs.last['created_at'] if logs.size > 0
-      break unless has_more?(parsed['status'])
-      sleep 1
+      puts "Job submitted. Job ID: #{job_id}."
+      tail_job(job_id)
     end
-  end
 
-  def fetch_job_status(job_id)
-    HTTParty.get(api_url_for("jobs/#{job_id}.json"))
-  end
+    def tail_job(job_id)
+      last_id = 0
+      while true
+        response = fetch_job_details(job_id, last_id)
+        parsed = JSON.parse(response.body)
 
-  def has_more?(status)
-    %w(running created).include?(status)
-  end
+        logs = parsed['logs']
 
-  def submit_transport_job(params)
-    HTTParty.post(server_url + 'transports/submit.json', body: params.to_json, headers: {'Content-Type' => 'application/json'})
-  end
+        logs.each { |log| print_log(log) }
 
-  def server_url
-    host =
-      if ENV['DEV'] || ENV['TEST']
-        'http://localhost:3000'
-      elsif ENV['STAGING']
-        'https://staging.holistics.io'
-      elsif ENV['HOST']
-        ENV['HOST']
-      else
-        SERVER_URL
+        last_id = logs.last['id'] if logs.size > 0
+        break unless parsed['has_more']
+
+        sleep 0.5
       end
-    host += '/' if host[-1] != '/'
-    host
-  end
+    end
 
-  def build_submit_params(options)
-    params = options.except(:config_path).merge(_utoken: get_token_from_gconfig)
-    params[:configs] = parse_transport_config(options[:config_path]).to_json if options[:config_path]
-    params
-  end
+    def fetch_job_details(job_id, last_id = 0)
+      HTTParty.get(api_url_for("jobs/#{job_id}.json?last_id=#{last_id}"))
+    end
 
-  def parse_transport_config(filepath)
-    file_ext = File.extname(filepath).downcase
-    if file_ext == '.json'
-      return JSON.parse(File.read(filepath))
-    elsif file_ext == '.yml'
-      return YAML.load(File.read(filepath))
-    else
-      raise StandardError.new 'Invalid config file extension. Please use either JSON or YML'
-    end
-  rescue StandardError => e
-    STDERR.puts "Error parsing transport config file: #{e.message}"
-    exit 1
-  end
+    def submit_transport_job(params)
+      HTTParty.post(server_url + 'transports/submit.json', body: params.to_json, headers: {'Content-Type' => 'application/json'})
+    end
 
-  def authenticated?
-    File.exists?(get_gconfig_filepath)
-  end
+    def server_url
+      host =
+        if ENV['DEV'] || ENV['TEST']
+          'http://localhost:3000'
+        elsif ENV['STAGING']
+          'https://staging.holistics.io'
+        elsif ENV['HOST']
+          ENV['HOST']
+        else
+          SERVER_URL
+        end
+      host += '/' if host[-1] != '/'
+      host
+    end
 
-  def get_token_from_gconfig
-    if authenticated?
-      string = YAML.load_file(get_gconfig_filepath)
-      string['token']
-    else
-      raise StandardError.new 'Holistics config file not found'
+    def build_submit_params(options)
+      params = options.except(:config_path).merge(_utoken: get_token_from_gconfig)
+      params[:configs] = parse_transport_config(options[:config_path]).to_json if options[:config_path]
+      params
     end
-  end
 
-  def get_gconfig_filepath
-    File.expand_path('~/.holistics.yml', __FILE__)
-  end
+    def parse_transport_config(filepath)
+      file_ext = File.extname(filepath).downcase
+      if file_ext == '.json'
+        return JSON.parse(File.read(filepath))
+      elsif file_ext == '.yml'
+        return YAML.load(File.read(filepath))
+      else
+        raise StandardError.new 'Invalid config file extension. Please use either JSON or YML'
+      end
+    rescue StandardError => e
+      STDERR.puts "Error parsing transport config file: #{e.message}"
+      exit 1
+    end
 
-  def api_url_for(path, token = nil)
-    "#{server_url}#{path}?_utoken=#{token || get_token_from_gconfig}"
-  end
+    def authenticated?
+      File.exists?(get_gconfig_filepath)
+    end
 
-  def print_log log
-    puts "#{log['created_at'][0..18]} - #{log['level']} - #{log['message']}"
-  end
+    def get_token_from_gconfig
+      if authenticated?
+        string = YAML.load_file(get_gconfig_filepath)
+        string['token']
+      else
+        raise StandardError.new 'Holistics config file not found'
+      end
+    end
 
-  def err_and_exit(message, response)
-    STDERR.puts message
-    STDERR.puts "Error Response Code: #{response.code}"
-    STDERR.puts response.body
-    exit 1
-  end
+    def get_gconfig_filepath
+      File.expand_path('~/.holistics.yml', __FILE__)
+    end
 
-  def response_has_error?(response)
-    response.code != 200
-  end
+    def api_url_for(path, token = nil)
+      "#{server_url}#{path}?_utoken=#{token || get_token_from_gconfig}"
+    end
 
-  def write_token_to_gconfig(token)
-    file_path = File.join(ENV['HOME'], '.holistics.yml')
-    h = {'token' => token}
-    File.write(file_path, h.to_yaml)
-  end
+    def print_log log
+      ts = Time.parse(log['created_at'])
+      Holistics.logger.log(log['level'], log['message'], timestamp: ts)
+    end
 
-end
+    def err_and_exit(message, response)
+      STDERR.puts message
+      STDERR.puts "Error Response Code: #{response.code}"
+      STDERR.puts response.body
+      exit 1
+    end
+
+    def response_has_error?(response)
+      response.code != 200
+    end
+
+    def write_token_to_gconfig(token)
+      file_path = File.join(ENV['HOME'], '.holistics.yml')
+      h = {'token' => token}
+      File.write(file_path, h.to_yaml)
+    end
+  end
+end

data/lib/holistics/custom_logger.rb

@@ -0,0 +1,31 @@
+# Custom logger class that allows
+module Holistics
+  class CustomLogger
+
+    def initialize out
+      @out = out
+    end
+
+    def log(level, data, options = {})
+      t = options[:timestamp] || Time.now.utc
+      @out.puts "#{t} - #{level.to_s.upcase.ljust(5)} #{data}"
+    end
+
+    def info data, options = {}
+      log('info', data, options)
+    end
+
+    def debug data, options = {}
+      log('debug', data, options)
+    end
+
+    def warn data, options = {}
+      log('warn', data, options)
+    end
+
+    def error data, options = {}
+      log('error', data, options)
+    end
+
+  end
+end

data/lib/holistics/version.rb

@@ -1,3 +1,3 @@
 class Holistics
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/holistics.rb

@@ -1,11 +1,16 @@
 require 'thor'
 require 'holistics/api_client'
-require 'holistics/cucumber/vcr'
+require 'vcr'
 
-class Holistics
+module Holistics
   def self.root
     Pathname.new(__FILE__).parent.parent
   end
+
+  def logger
+    @logger ||= CustomLogger.new(STDOUT)
+  end
+
 end
 
 # Right now we can't do `holistics ds:list`
@@ -13,6 +18,14 @@ end
 # Either we use other libs, or figure out an elegant way to do it without
 
 class HolisticsRunner < Thor
+
+  method_option :verbosity, aliases: '-v', type: :numeric, default: 2, required: false,
+                desc: 'Set the logging verbosity.  Values range from 1 (log everything) to 6 (log nothing)'
+
+  def initialize(args=[], options={}, config={})
+    super(args, options, config)
+  end
+
   desc 'login [auth_token]', 'Perform authentication'
 
   def login token

data/lib/{holistics/tabular_formatter.rb → tabular_formatter.rb}

@@ -1,7 +1,6 @@
 require 'csv'
 require 'active_support/all'
 
-
 class TabularFormatter
 
   def initialize input_data, options = {}
@@ -39,7 +38,7 @@ class TabularFormatter
       str << "-#{'-' * l}-+"
     end.chomp!("+")
     divider = divider[1..-1]
-    output.insert(1,divider)
+    output.insert(1, divider)
     output.join("\n").concat("\n")
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holistics
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Thanh Dinh Khac
@@ -80,9 +80,10 @@ files:
 - holistics.gemspec
 - lib/holistics.rb
 - lib/holistics/api_client.rb
-- lib/holistics/cucumber/vcr.rb
-- lib/holistics/tabular_formatter.rb
+- lib/holistics/custom_logger.rb
 - lib/holistics/version.rb
+- lib/tabular_formatter.rb
+- lib/vcr.rb
 homepage: http://rubygems.org/gems/holistics-cli
 licenses:
 - GPL