holistics 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c81e8796c16cc74f0ed2900d63215c026a11c2be
-  data.tar.gz: ca181f8265ba61134ab5f84ff8d7d182d68b1b96
+  metadata.gz: cdc4e0f5e9b4d1d66a0a9d911a102169c6ecaeb8
+  data.tar.gz: 8b5ea3eaafe961fc7b31bbdb81b4f9bebdd114a3
 SHA512:
-  metadata.gz: 2317a24e974bf4c5231257900965fc840e8723337941eef1e091be7b14023248d0d134c9f24d175fbbbe196a9094816d02e7d4c26a72c9d36be81b4363a577c1
-  data.tar.gz: dde3e996e31f1ae05e91ac8323cd266e2ae5a2347c8efdd169b16bc6daeb87828a9140ac6ab1c57c23081598e8031fc6493a2b2c1e624f7139b488a89ce6b99e
+  metadata.gz: b5eecacd26f55c6e34ab9f3ae2a6360a36c33c8f3f8e8dac8185d890e028535b749349bec7c4febf76319841d9b99df244a00839ff3c5ec68b69dcdfaa1d348f
+  data.tar.gz: 8735748beb6f7163711d97b3cae2c6e38926fb9eb040475c406760a59995567928a8e8b9595ccfd184f662ee351bd05ae45f4bac0ceac2b89dc74616f31c7ed8

data/README.md

@@ -5,6 +5,10 @@ Command-line interface to Holistics API
 
 ## Build and Publish
 
+First, open `version.rb` and increase the version number. Please also update the changelog too.
+
+Then run the following:
+
     $ gem build holistics.gemspec
     WARNING:  description and summary are identical
     WARNING:  See http://guides.rubygems.org/specification-reference/ for help
@@ -32,14 +36,14 @@ Then perform authentication:
 
 ### To change remote server for testing purpose
 
-    $ HOLISTICS_DEV=1 holistics ...
+    $ HOLISTICS_DEV=1 holistics login [token]
     # Will point to http://localhost:3000
 
-    $ HOLISTICS_STAGING=1 holistics ...
+    $ HOLISTICS_STAGING=1 holistics login [token]
     # Will point to https://staging.holistics.io
 
     # or custom host
-    $ HOLISTICS_HOST=https://blah.com holistics ...
+    $ HOLISTICS_HOST=https://blah.com holistics login [token]
 
 
 ## Data Transport commands

data/lib/holistics/api_client.rb

@@ -26,8 +26,7 @@ module Holistics
 
       params = {
         dest_fqname: dest_fqname,
-        dest_ds_id: dest_ds_id,
-        _utoken: auth_info.get_token_from_gconfig
+        dest_ds_id: dest_ds_id
       }
 
       json = http_request.post_csv 'data_imports/import_csv.json', params, file, 'Error uploading CSV file'
@@ -42,7 +41,7 @@ module Holistics
       result = http_request.get 'data_sources.json', 'Error retrieving list of data sources'
 
       table = [%w(ID Type Name)]
-      rows = result.map { |record| [record['id'], record['dbtype'], record['name']] }
+      rows = result.map {|record| [record['id'], record['dbtype'], record['name']]}
       table.concat(rows)
 
       puts TabularFormatter.new(table).to_pretty_table
@@ -52,11 +51,9 @@ module Holistics
       puts 'Submitting transport job ...'
 
       params = build_submit_params(options)
-
-      result = http_request.post_json 'transports/submit.json', params, 'Error submitting transport job'
+      result = http_request.post_json('transports/submit.json', params, 'Error submitting transport job')
 
       job_id = result['job_id']
-
       puts "Job submitted. Job ID: #{job_id}."
       job_manager.tail_logs job_id
     end
@@ -64,8 +61,7 @@ module Holistics
     def invoke_email_schedule(es_id, options)
       puts "Invoking email schedule ID #{es_id}"
 
-      params = options.merge(_utoken: auth_info.get_token_from_gconfig)
-      result = http_request.post_json "email_schedules/#{es_id}/execute.json", params, 'Error submitting email schedule job'
+      result = http_request.post_json "email_schedules/#{es_id}/execute.json", options, 'Error submitting email schedule job'
 
       job_id = result['job_id']
 
@@ -76,8 +72,7 @@ module Holistics
     def send_transform(options)
       puts 'Invoking transform job...'
 
-      params = options.merge(_utoken: auth_info.get_token_from_gconfig)
-      result = http_request.post_json "data_transforms/#{params[:transform_id]}/execute.json", params, 'Error submitting transform job'
+      result = http_request.post_json "data_transforms/#{options[:transform_id]}/execute.json", options, 'Error submitting transform job'
 
       job_id = result['job_id']
 
@@ -85,6 +80,22 @@ module Holistics
       job_manager.tail_logs job_id
     end
 
+    def send_import(options)
+      puts 'Invoking import job...'
+
+      result = http_request.post_json "data_imports/#{options[:import_id]}/execute.json", options, 'Error submitting import job'
+
+      job_id = result['job_id']
+
+      puts "Job submitted. Job ID: #{job_id}."
+      job_manager.tail_logs job_id
+    end
+
+    def job_show(options)
+      puts 'Getting job log...'
+      job_manager.tail_logs options[:job_id]
+    end
+
     def generate_configs(options)
       unless Dir.exist?(options['output'])
         raise 'Output location is invalid.'
@@ -92,11 +103,10 @@ module Holistics
 
       puts "Generating transport JSON config files to #{options['output']} directory..."
 
-      params = options.merge(_utoken: auth_info.get_token_from_gconfig)
-      result = http_request.post_json 'transports/generate_configs.json', params, 'Error generating transport configs'
-      
+      result = http_request.post_json 'transports/generate_configs.json', options, 'Error generating transport configs'
+
       result.each do |table_data|
-        File.open("#{options['output']}/#{table_data['filename']}","w") do |f|
+        File.open("#{options['output']}/#{table_data['filename']}", "w") do |f|
           f.write(JSON.pretty_generate(table_data['json_content']))
         end
 
@@ -108,7 +118,7 @@ module Holistics
     end
 
     def build_submit_params(options)
-      params = options.except(:config_path).merge(_utoken: auth_info.get_token_from_gconfig)
+      params = options.except(:config_path)
       params[:configs] = parse_transport_config(options[:config_path]).to_json if options[:config_path]
       params
     end

data/lib/holistics/auth_api_client.rb

@@ -20,12 +20,13 @@ module Holistics
         write_token_to_gconfig(token)
       else
         puts 'Error logging in. Please check your token again.'
+        puts response
       end
     end
 
     def authenticate(token)
-      url = auth_info.api_url_for('users/info.json', {}, token)
-      response = HTTParty.get(url)
+      url = auth_info.api_url_for('users/info.json', {})
+      response = Helpers::HttpRequest.new.simple_get url, token
       return response, (response.code == 200)
     end
 

data/lib/holistics/helpers/auth_info.rb

@@ -12,8 +12,7 @@ module Holistics
         File.exists?(get_gconfig_filepath)
       end
 
-      def api_url_for(path, params = {}, token = nil)
-        params[:_utoken] = token || get_token_from_gconfig
+      def api_url_for(path, params = {})
         "#{http_request.server_url}#{path}?#{URI.encode_www_form(params)}"
       end
 

data/lib/holistics/helpers/http_request.rb

@@ -7,6 +7,7 @@ module Holistics
 
       DEFAULT_ERROR_MSG = 'Error occurred!'
       SERVER_URL = 'https://api.holistics.io/'
+      API_KEY_HEADER = 'X-Holistics-Key' # must match Holistics::API_KEY_HEADER in main repo
 
       def auth_helper
         @auth_info ||= Helpers::AuthInfo.new
@@ -14,7 +15,7 @@ module Holistics
 
       def server_url
         host =
-            if %w(development test).include?(ENV['HOLISTICS_ENV'])
+            if ENV['HOLISTICS_DEV'] || %w(development test).include?(ENV['HOLISTICS_ENV'])
               'http://localhost:3000'
             elsif ENV['HOLISTICS_STAGING'] || ENV['HOLISTICS_ENV'] == 'staging'
               'https://staging.holistics.io'
@@ -29,18 +30,23 @@ module Holistics
 
       def get url, msg_if_error = DEFAULT_ERROR_MSG
         url = auth_helper.api_url_for url
-
-        response = HTTParty.get url
-
+        response = simple_get url
         exit_if_error(msg_if_error, response)
-
         JSON.parse response.body
       end
+      
+      def simple_get(url, token = nil)
+        HTTParty
+          .get url, headers: { API_KEY_HEADER => token || auth_helper.get_token_from_gconfig }
+      end
 
       def post_json url, params, msg_if_error = DEFAULT_ERROR_MSG
         options = {
           body: params.to_json,
-          headers: {'Content-Type' => 'application/json'}
+          headers: {
+            'Content-Type' => 'application/json',
+            API_KEY_HEADER => auth_helper.get_token_from_gconfig
+          }
         }
 
         response = HTTParty.post("#{server_url}#{url}", options)
@@ -59,7 +65,9 @@ module Holistics
         uri = URI.parse(endpoint_for(url))
         csv = UploadIO.new file, "text/csv", File.basename(file.path)
         params = params.merge file: csv
+        
         post_data = Net::HTTP::Post::Multipart.new uri.path, params
+        post_data.add_field(API_KEY_HEADER, auth_helper.get_token_from_gconfig)
 
         https_request = Net::HTTP.new uri.host, uri.port
         https_request.use_ssl = true if uri.scheme == 'https'

data/lib/holistics/helpers/job_manager.rb

@@ -9,7 +9,10 @@ module Holistics
 
       def fetch_job_details(job_id, last_id = 0)
         tries ||= MAX_RETRIES
-        response = HTTParty.get(auth_helper.api_url_for("jobs/#{job_id}/logs.json", last_id: last_id))
+        
+        url = auth_helper.api_url_for("jobs/#{job_id}/logs.json", last_id: last_id)
+        response = HttpRequest.new.simple_get url
+        
         JSON.parse(response.body)
       rescue JSON::ParserError => err
         sleep 2 ** (MAX_RETRIES - tries) unless Holistics.test?

data/lib/holistics/version.rb

@@ -1,4 +1,4 @@
 module Holistics
-  VERSION = '0.2.7'
-  DATE = '2017-06-08'
+  VERSION = '0.2.8'
+  DATE = '2017-10-20'
 end

data/lib/holistics.rb

@@ -69,22 +69,6 @@ module Holistics
       api_client.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'
-    method_option :full, type: :boolean, default: false, required: false, desc: 'Full table transport'
-    method_option :incremental, type: :boolean, default: false, required: false, desc: 'Incremental table transport'
-    desc 'transport_old', '[DEPRECATED] Submit a data transport job'
-
-    def transport_old
-      p 'DEPRECATED. This command will be removed in the next version. Please consider using `holistics transport submit` instead.'
-      api_client.send_transport(options.dup)
-    end
-
-
     method_option :transform_id, aliases: '-j', type: :string, required: true, desc: 'ID of transform job to be executed'
     desc 'transform', 'Invoke a transform'
 
@@ -92,19 +76,6 @@ module Holistics
       api_client.send_transform(options.dup)
     end
 
-
-    method_option :from_ds_id, aliases: '-s', type: :string, required: true, desc: 'From data source'
-    method_option :dest_ds_id, aliases: '-d', type: :string, required: true, desc: 'To data source'
-    method_option :tables, aliases: '-t', type: :array, required: true, desc: 'List of tables to generate configs from. Wildcards are allowed'
-    method_option :output, aliases: '-o', type: :string, required: false, default: './', desc: 'Location where files will be generated to'
-    desc 'generate_configs', '[DEPRECATED] Generate transport JSON configuration files'
-
-    def generate_configs
-      p 'DEPRECATED. This command will be removed in the next version. Please consider using `holistics transport generate` instead.'
-      api_client.generate_configs(options.dup)
-    end
-
-
     method_option :job_id, aliases: '-j', type: :string, required: true, desc: 'Job ID'
     desc 'job_show', 'Show job log'
 

data/lib/import.rb

@@ -3,6 +3,7 @@ require 'thor'
 module Holistics
   class Import < Thor
 
+    # import from csv file
     method_option :filepath, aliases: '-f', type: :string, required: true, desc: 'Path to CSV file'
     method_option :dest_ds_id, aliases: '-d', type: :string, required: true, desc: 'Destination data source'
     method_option :dest_table_name, aliases: '-t', type: :string, required: true, desc: 'Specify destination table to write to'
@@ -12,6 +13,14 @@ module Holistics
       api_client.import_csv(options.dup)
     end
 
+    # execute import job
+    method_option :import_id, aliases: '-j', type: :string, required: true, desc: 'ID of import job to be executed'
+    desc 'execute', 'Invoke an import job'
+
+    def execute
+      api_client.send_import(options.dup)
+    end
+
     no_commands do
       def api_client
         @api_client ||= ApiClient.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holistics
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Thanh Dinh Khac
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler