holistics 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f4151e165215a9fb3c9b3a6317cd9b9ef829f5e
-  data.tar.gz: 0f0078f67112c8176971d6cfbce5a8094e901f07
+  metadata.gz: a84dcb9a88918717b220f217e544a804ee83ac8d
+  data.tar.gz: cedcd80882d85ae412fe1e810ef13afc3e1e7e16
 SHA512:
-  metadata.gz: 654ee243f6fb1415300f32f1004563574aef12b3cbdca659dbbe186a34c6f11b98e2792d75847bf8814af6d516eeaacbf661410b1e1d319c8d78e51605c81d60
-  data.tar.gz: 7a892fa848ef8b5b5ac65b9c5cb55c8166a09d5bc61dfe8a1395fe3a201504fa6a7849afe6a1f87efdef7f85032a9f165db366689102f68047e3ded7346ef297
+  metadata.gz: 36a8b5e6de2e778028f8b919b8667439269f41650d874b3177bb05e826d13a407c54238885ff41b5e458fa92daac93d6e9134bbd8ef5b9d70f6c9ae926b7d8a0
+  data.tar.gz: 85075130ff88b1fd518a3ab1c5f91eae3403e1e0bb7e37fc8f76e6c3304edbf1a38f8ce304f9e9112152c4f93f430530b2045f67f6ac74f12bc0bd9f4658b1c4

data/holistics.gemspec

@@ -14,11 +14,14 @@ Gem::Specification.new do |spec|
   spec.homepage = 'http://rubygems.org/gems/holistics-cli'
   spec.license = 'GPL'
 
-  spec.files = %w[.document holistics.gemspec] + Dir['*.md', 'bin/*', 'lib/**/*.rb']
-  spec.require_paths = ['lib']
-
+  spec.files = %w[.document holistics.gemspec] + Dir['*.md', 'bin/*', 'lib/*', 'lib/**/*.rb']
+  spec.require_paths <<  'lib'
   spec.executables = ['holistics']
 
+  spec.required_ruby_version = '>= 2.0'
+
+  spec.add_development_dependency "bundler", "~> 1.0"
+
   spec.add_dependency 'activesupport', '~> 4.2'
   spec.add_dependency 'httparty', '~> 0.13'
   spec.add_dependency 'thor', '~> 0.19'

data/lib/holistics/api_client.rb

@@ -1,27 +1,30 @@
 require 'httparty'
 require 'holistics/tabular_formatter'
+require 'yaml'
+require 'json'
 
 class ApiClient
   SERVER_URL = 'https://secure.holistics.io/'
 
   def login token
-    puts 'Authenticating token...'
-    url = api_url_for('users/info.json', token)
-    response = HTTParty.get(url)
+    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']}"
 
-    if response.code != 200
-      puts 'Error authenticating. Please check your token again.'
-      exit 1
+      write_token_to_gconfig(token)
+    else
+      puts 'Error logging in. Please check your token again.'
     end
+  end
 
-    parsed = JSON.parse(response.body)
-    puts 'Authentication successful. Info:'
-    puts "- ID: #{parsed['id']}"
-    puts "- Email: #{parsed['email']}"
-
-    file_path = File.join(ENV['HOME'], '.holistics.yml')
-
-    File.write(file_path, token)
+  def holistics_authenticate(token)
+    url = api_url_for('users/info.json', token)
+    response = HTTParty.get(url)
+    return response, (response.code == 200)
   end
 
   def job_show options
@@ -32,12 +35,7 @@ class ApiClient
   def ds_list
     url = api_url_for('data_sources.json')
     response = HTTParty.get(url)
-
-    if response.code != 200
-      puts "Error retrieving list of data sources. Code: #{response.code}"
-      puts response.body
-      exit 1
-    end
+    err_and_exit("Error retrieving list of data sources", response) if response_has_error?(response)
 
     parsed = JSON.parse(response.body)
 
@@ -53,16 +51,12 @@ class ApiClient
     params = build_submit_params(dest_ds_type, from_ds_type, options)
     response = submit_transport_job(params)
 
-    if response.code != 200
-      puts "Error submitting transport job. Code: #{response.code}"
-      puts response.body
-      exit 1
-    end
+    err_and_exit("Error submitting transport job", response) if response_has_error?(response)
 
     parsed = JSON.parse(response.body)
     job_id = parsed['job_id']
-    puts "Job submitted. Job ID: #{job_id}."
 
+    puts "Job submitted. Job ID: #{job_id}."
     tail_job(job_id)
   end
 
@@ -102,39 +96,75 @@ class ApiClient
   end
 
   def build_submit_params(dest_ds_type, from_ds_type, options)
-    params = options.merge(from_ds_type: from_ds_type, dest_ds_type: dest_ds_type, _utoken: get_key)
+    params = options.except(:config_path).merge(from_ds_type: from_ds_type, dest_ds_type: dest_ds_type, _utoken: get_token_from_gconfig)
 
     configs = {}
     if options[:config_path]
-      config_content = File.read(File.join(ENV['ROOT_PATH'], options[:config_path]))
-      configs = JSON.parse(config_content)
+      config_filepath = File.join(ENV['ROOT_PATH'], options[:config_path])
+      configs = parse_transport_config(config_filepath)
     end
 
-    configs[:from_table_name] = options[:table_name] if options[:table_name]
-    configs[:dest_table_name] = options[:rename] if options[:rename]
+    configs['from_table_name'] = options[:table_name] if options[:table_name]
+    configs['dest_table_name'] = options[:rename] if options[:rename]
 
-    params[:config] = configs.to_json # should be a string
+    params[:configs] = configs.to_json # should be a string
     params
   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 authenticated?
-    File.exists?(config_filepath)
+    File.exists?(get_gconfig_filepath)
   end
 
-  def get_key
-    File.read(config_filepath).strip
+  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 config_filepath
+  def get_gconfig_filepath
     File.expand_path('~/.holistics.yml', __FILE__)
   end
 
   def api_url_for(path, token = nil)
-    "#{server_url}#{path}?_utoken=#{token || get_key}"
+    "#{server_url}#{path}?_utoken=#{token || get_token_from_gconfig}"
   end
 
   def print_log log
     puts "#{log['created_at'][0..18]} - #{log['level']} - #{log['message']}"
   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

data/lib/holistics/version.rb

@@ -1,3 +1,3 @@
 class Holistics
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/lib/holistics.rb

@@ -13,7 +13,7 @@ end
 # Either we use other libs, or figure out an elegant way to do it without
 
 class HolisticsRunner < Thor
-  desc 'login', 'Perform authentication'
+  desc 'login [auth_token]', 'Perform authentication'
 
   def login token
     client = ApiClient.new
@@ -26,42 +26,55 @@ class HolisticsRunner < Thor
     ApiClient.new.ds_list
   end
 
-  method_option :from_ds, aliases: '-s', type: :string, required: true, desc: 'From data source (ID)'
-  method_option :dest_ds, aliases: '-d', type: :string, required: true, desc: 'To data source (ID)'
-  method_option :table_name, aliases: '-t', type: :string, required: true, desc: 'Table name'
-  desc 'rs_to_pg', 'Transport data from Amazon Redshift data source to PostgreSQL'
+  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, aliases: '-t', type: :string, required: false, desc: 'Table names'
+  method_option :dest_table, aliases: '-n', type: :string, required: false, desc: 'Rename destination table to. Please specify fully qualified name'
+  method_option :config_path, aliases: '-c', type: :string, required: false, desc: 'Path to transport config (JSON/YML)̄ file'
+  desc 'redshift_to_postgres', 'Transport data from Amazon Redshift data source to PostgreSQL'
 
-  def rs_to_pg
+  def redshift_to_postgres
     ApiClient.new.send_transport(:redshift, :postgresql, 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 :table_name, aliases: '-t', type: :string, required: true, desc: 'Table names'
-  desc 'pg_to_rs', 'Transport data from PostgreSQL to Amazon Redshift'
+  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, aliases: '-t', type: :string, required: false, desc: 'Table names'
+  method_option :dest_table, aliases: '-n', type: :string, required: false, desc: 'Rename destination table to. Please specify fully qualified name'
+  method_option :config_path, aliases: '-c', type: :string, required: false, desc: 'Path to transport config (JSON/YML)̄ file'
+  desc 'postgres_to_redshift', 'Transport data from PostgreSQL to Amazon Redshift'
 
-  def pg_to_rs
+  def postgres_to_redshift
     ApiClient.new.send_transport(:postgresql, :redshift, 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 :table_name, aliases: '-t', type: :string, required: true, desc: 'Table names'
-  method_option :rename, aliases: '-n', type: :string, required: false, desc: 'Rename destination table to. Please specify fully qualified name'
-  desc 'pg_to_pg', 'Transport data from PostgreSQL to PostgreSQL'
+  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, aliases: '-t', type: :string, required: false, desc: 'Table names'
+  method_option :dest_table, aliases: '-n', type: :string, required: false, desc: 'Rename destination table to. Please specify fully qualified name'
+  method_option :config_path, aliases: '-c', type: :string, required: false, desc: 'Path to transport config (JSON/YML)̄ file'
+  desc 'postgres_to_postgres', 'Transport data from PostgreSQL to PostgreSQL'
 
-  def pg_to_pg
+  def postgres_to_postgres
     ApiClient.new.send_transport(:postgresql, :postgresql, options.dup)
   end
 
-  method_option :config_path, aliases: '-c', type: :string, required: true, desc: 'Path to transport config (JSON) file'
+  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, aliases: '-t', type: :string, required: false, desc: 'Table names'
+  method_option :dest_table, aliases: '-n', type: :string, required: false, desc: 'Rename destination table to. Please specify fully qualified name'
+  method_option :config_path, aliases: '-c', type: :string, required: false, desc: 'Path to transport config (JSON/YML)̄ file'
   desc 'mysql_to_postgres', 'Transport data from MySQL to Postgres'
 
   def mysql_to_postgres
     ApiClient.new.send_transport(:mysql, :postgresql, options.dup)
   end
 
-  method_option :config_path, aliases: '-c', type: :string, required: true, desc: 'Path to transport config (JSON) file'
+  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, aliases: '-t', type: :string, required: false, desc: 'Table names'
+  method_option :dest_table, aliases: '-n', type: :string, required: false, desc: 'Rename destination table to. Please specify fully qualified name'
+  method_option :config_path, aliases: '-c', type: :string, required: false, desc: 'Path to transport config (JSON/YML)̄ file'
   desc 'mysql_to_redshift', 'Transport data from MySQL to Redshift'
 
   def mysql_to_redshift

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holistics
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Thanh Dinh Khac
@@ -11,6 +11,20 @@ bindir: bin
 cert_chain: []
 date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -77,11 +91,12 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="