holistics 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61601d17f426d38122402a767f5b4534e6671b50
-  data.tar.gz: 0c533d1dcb1f12c193ebc79fb168db3524a2fde6
+  metadata.gz: 66b023c2e0d7da99e00b5577457ce8a2c3ba5f1d
+  data.tar.gz: 317efca7f9469d5ab87054dee66cf00b6aa21a5d
 SHA512:
-  metadata.gz: 9b77f45439562d748fd22fb498e5dc9f130f9d36e18cd67b2bdf05c5a1230e528d6bdba20e4cabd6135d3fe2364f0ac6a9012b8d824ac985ebd8a5827cd0aa6e
-  data.tar.gz: 9ae95aa35c514d7860963d07180d091d3f3b67a75a59e16bff113817e4e231865687accec89143688e7e6f33105a57750eec562d9cb09c5f7eb036735881f97a
+  metadata.gz: bef183d58afbd0431b11b0bf9d3156b04ae53260124da046b03b857db5d6eebe15ac27e814f14e5caf75788cd70ce015e0b0689c267c319add604a666d20a783
+  data.tar.gz: 40b222ae0c41ba15087469e3d1aeea911dde0dc880a505e8b5a105c5561cfc55f708760ed9a716d25e8d3e0a0fa6f76df2dd0c1afb2b231dc2a353c1c7793e45

data/bin/holistics

@@ -2,4 +2,4 @@
 ENV['GEM_ROOT_PATH'] = File.expand_path('../../', __FILE__)
 
 require 'holistics'
-HolisticsRunner.start
+Holistics::HolisticsRunner.start

data/lib/holistics/api_client.rb

@@ -27,14 +27,14 @@ module Holistics
     end
 
     def holistics_authenticate(token)
-      url = api_url_for('users/info.json', token)
+      url = api_url_for('users/info.json', {}, token)
       response = HTTParty.get(url)
       return response, (response.code == 200)
     end
 
     def job_show options
       job_id = options[:job_id]
-      tail_job(job_id)
+      tail_logs(job_id)
     end
 
     def ds_list
@@ -62,20 +62,17 @@ module Holistics
       job_id = parsed['job_id']
 
       puts "Job submitted. Job ID: #{job_id}."
-      tail_job(job_id)
+      tail_logs(job_id)
     end
 
-    def tail_job(job_id)
+    def tail_logs(job_id)
       last_id = 0
       while true
-        response = fetch_job_details(job_id, last_id)
-        parsed = JSON.parse(response.body)
-
+        parsed = fetch_job_details(job_id, last_id)
         logs = parsed['logs']
-
         logs.each { |log| print_log(log) }
-
         last_id = logs.last['id'] if logs.size > 0
+
         break unless parsed['has_more']
 
         sleep 0.5
@@ -83,7 +80,8 @@ module Holistics
     end
 
     def fetch_job_details(job_id, last_id = 0)
-      HTTParty.get(api_url_for("jobs/#{job_id}.json?last_id=#{last_id}"))
+      response = HTTParty.get(api_url_for("jobs/#{job_id}/logs.json", last_id: last_id))
+      JSON.parse(response.body)
     end
 
     def submit_transport_job(params)
@@ -142,12 +140,13 @@ module Holistics
       File.expand_path('~/.holistics.yml', __FILE__)
     end
 
-    def api_url_for(path, token = nil)
-      "#{server_url}#{path}?_utoken=#{token || get_token_from_gconfig}"
+    def api_url_for(path, params = {}, token = nil)
+      params[:_utoken] = token || get_token_from_gconfig
+      "#{server_url}#{path}?#{URI.encode_www_form(params)}"
     end
 
     def print_log log
-      ts = Time.parse(log['created_at'])
+      ts = Time.parse(log['timestamp'])
       Holistics.logger.log(log['level'], log['message'], timestamp: ts)
     end
 

data/lib/holistics/version.rb

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

data/lib/holistics.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require 'holistics/api_client'
+require 'holistics/custom_logger'
 require 'vcr'
 
 module Holistics
@@ -7,57 +8,57 @@ module Holistics
     Pathname.new(__FILE__).parent.parent
   end
 
-  def logger
+  def self.logger
     @logger ||= CustomLogger.new(STDOUT)
   end
 
-end
-
 # Right now we can't do `holistics ds:list`
 # Known issue: https://github.com/erikhuda/thor/issues/249
 # 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)'
+  class HolisticsRunner < Thor
 
-  def initialize(args=[], options={}, config={})
-    super(args, options, config)
-  end
+    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)'
 
-  desc 'login [auth_token]', 'Perform authentication'
+    def initialize(args=[], options={}, config={})
+      super(args, options, config)
+    end
 
-  def login token
-    client = ApiClient.new
-    client.login(token)
-  end
+    desc 'login [auth_token]', 'Perform authentication'
 
+    def login token
+      client = ApiClient.new
+      client.login(token)
+    end
 
-  desc 'ds_list', 'List all data sources'
 
-  def ds_list
-    ApiClient.new.ds_list
-  end
+    desc 'ds_list', 'List all data sources'
 
+    def ds_list
+      ApiClient.new.ds_list
+    end
 
-  method_option :from_ds_id, aliases: '-s', type: :string, required: false, desc: 'From data source'
-  method_option :dest_ds_id, aliases: '-d', type: :string, required: false, desc: 'To data source'
-  method_option :from_table_name, aliases: '-t', type: :string, required: false, desc: 'The table to copy over'
-  method_option :dest_table_name, aliases: '-n', type: :string, required: false, desc: '(optional) Rename destination table. Please specify fully qualified name'
-  method_option :config_path, aliases: '-c', type: :string, required: false, desc: 'Path to transport config (JSON/YML)̄ file'
-  desc 'transport', 'Submit a data transport job'
 
-  def transport
-    ApiClient.new.send_transport(options.dup)
-  end
+    method_option :from_ds_id, aliases: '-s', type: :string, required: false, desc: 'From data source'
+    method_option :dest_ds_id, aliases: '-d', type: :string, required: false, desc: 'To data source'
+    method_option :from_table_name, aliases: '-t', type: :string, required: false, desc: 'The table to copy over'
+    method_option :dest_table_name, aliases: '-n', type: :string, required: false, desc: '(optional) Rename destination table. Please specify fully qualified name'
+    method_option :config_path, aliases: '-c', type: :string, required: false, desc: 'Path to transport config (JSON/YML)̄ file'
+    desc 'transport', 'Submit a data transport job'
 
+    def transport
+      ApiClient.new.send_transport(options.dup)
+    end
 
-  method_option :job_id, aliases: '-j', type: :string, required: true, desc: 'Job ID'
-  desc 'job_show', 'Show job log'
 
-  def job_show
-    ApiClient.new.job_show(options.dup)
-  end
+    method_option :job_id, aliases: '-j', type: :string, required: true, desc: 'Job ID'
+    desc 'job_show', 'Show job log'
 
-end
+    def job_show
+      ApiClient.new.job_show(options.dup)
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holistics
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Thanh Dinh Khac