idata 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78854c8366bba688c067558f460eaebbc5e8900
-  data.tar.gz: 20c21a061c5366251c7074ebe9288095e8f660cc
+  metadata.gz: aea47287cb8de9e1f47ed792a229bc894134f27c
+  data.tar.gz: f417b2e5b617104aa140f573a5a6cad3c863227d
 SHA512:
-  metadata.gz: a9b1c1006cd1f1e9adc310e234a664e4fb9c73071f6705a96776af1122b0762e4d844d24d41da25aed47ecc036800c3110a9ae0f422bc0e9e2d69d7c4097a754
-  data.tar.gz: feef658f247d2ef71c34d4876490d4746fa17413a017dea7456896c3135ba27cf161f0e15eebec7ff51a87a18f9d23db84efcbabfbb4696588cb2f0f2e15104f
+  metadata.gz: 21fc196f3067f17dade972c9ed3776b9fc04fd3efd505ae9e25f8178c7111bfce36a45f2e5e77258f41839cf0c076887d736c041b5e0522535775c8bcb7832a3
+  data.tar.gz: 6dbd7e130723fdcd2b764612e65da385bcdc9b023417afa3589d5e7b65b4629f4e5dcef026643cfe8d0a0b5c366dec8a6dc3a4ac241417750ab3fee49d3cca7f

data/bin/iload

@@ -17,8 +17,16 @@ require 'fileutils'
 
 SUPPORTED_INPUT_FORMATS = ['CSV', 'FX', 'RPT']
 POSTGRESQL_PORT = 5432
+POSTGRESQL_USERNAME = 'postgres'
 CSV_DEFAULT_DELIMITER = ','
 CSV_DEFAULT_QUOTE = '"'
+CSV_DEFAULT_FORMAT = 'CSV'
+
+
+def error(msg)
+  puts "Error: #{msg}"
+  exit(-1)
+end
 
 $options = {}
 parser = OptionParser.new("", 24) do |opts|
@@ -75,6 +83,10 @@ parser = OptionParser.new("", 24) do |opts|
   opts.on("-l", "--listen PORT", "PostgreSQL listen port (default to 5432)") do |v|
     $options[:listen] = v
   end
+  
+  opts.on("-c", "--client CLIENT", "Client name") do |v|
+    $options[:client] = v
+  end
 
   opts.on_tail('--help', 'Displays this help') do
 		puts opts, "", help
@@ -104,76 +116,105 @@ rescue SystemExit => ex
   exit
 end
 
-# Load parameters from ENVIRONMENT if exist
-$options[:host] ||= ENV['HOST']
-$options[:username] ||= ENV['USERNAME']
-$options[:password] ||= ENV['PASSWORD']
-$options[:listen] ||= ENV['LISTEN']
-$options[:database] ||= ENV['DATABASE']
+# default
+$options[:format].upcase! if $options[:format]
+$options[:format] ||= CSV_DEFAULT_FORMAT
+$options[:listen] ||= POSTGRESQL_PORT unless $options[:client]
+$options[:username] ||= POSTGRESQL_USERNAME unless $options[:client]
+$options[:delim] ||= CSV_DEFAULT_DELIMITER
+$options[:quote] ||= CSV_DEFAULT_QUOTE
+$options[:drop] ||= false
 
 # validate parameters
 if $options[:input].nil?
-  puts "\nPlease specify input file: -i\n\n"
-  exit
+  error "please specify input file: -i"
 end
 
-if $options[:format].nil?
-  puts "\nPlease specify input file format: -f\n\n"
-  exit
+if File.exists?($options[:input]) && File.directory?($options[:input])
+  error "`#{$options[:input]}` is a directory! input must be a file"
 end
 
-# downcase for consistency
-$options[:format].upcase!
+unless File.exists?($options[:input])
+  error "file `#{$options[:input]}` not found!"
+end
 
 if !SUPPORTED_INPUT_FORMATS.include?($options[:format])
-  puts "\nInvalid input file format, supported formats are: #{SUPPORTED_INPUT_FORMATS.join(', ')}\n\n"
-  exit
+  error "invalid input file format, supported formats are: #{SUPPORTED_INPUT_FORMATS.join(', ')}"
 end
 
 if $options[:table].nil?
-  puts "\nPlease specify table name: -t\n\n"
-  exit
+  error "Please specify table name: -t"
 end
 
-unless File.exists?($options[:input])
-  puts "\nFile does not exist"
-  exit
+if $options[:client] and ($options[:host] or $options[:database] or $options[:username] or $options[:password])
+  error "once -c is specified, -h/-u/-d/-p is no longer needed"
 end
 
-if $options[:host].nil?
-  puts "\nPlease specify host name: -h\n\n"
-  exit
-end
+if $options[:client]
+  if ENV['MAINDB'].blank?
+    error "The environment variable MAINDB (used by -c/--client) is not present"
+  end
+  
+  if ENV['MAINDBHOST'].blank?
+    error "The environment variable MAINDBHOST (used by -c/--client) is not present"
+  end
+  
+  ActiveRecord::Base.establish_connection(
+    'adapter' => 'postgresql',
+    'host' => ENV['MAINDBHOST'],
+    'database' => ENV['MAINDB'],
+    'username' => ENV['MAINDBUSER'] || POSTGRESQL_USERNAME,
+    'port' => ENV['MAINDBPORT'] || POSTGRESQL_PORT,
+    'timeout' => 15000
+  )
+  
+  class Organization < ActiveRecord::Base
+  end
+  
+  client = Organization.where("name ilike ? AND name NOT ilike 'MSSS'", $options[:client]).first
+  unless client
+    error "cannot find client with such name: `#{$options[:client]}`"
+  else
+    Organization.establish_connection(
+      'adapter' => 'postgresql',
+      'host' => client.db_ipaddress,
+      'database' => client.db_name,
+      'username' => client.db_username,
+      'port' => client.db_port,
+      'timeout' => 15000
+    )
+    
+    $options[:database] = client.db_name
+    $options[:username] = client.db_username
+    $options[:host] = client.db_ipaddress
+    $options[:listen] = client.db_port
+  end
+else
+  if $options[:host].nil?
+    error "please specify host name: -h"
+  end
 
-if $options[:database].nil?
-  puts "\nPlease specify PostgreSQL database name: -d\n\n"
-  exit
-end
+  if $options[:database].nil?
+    error "please specify database name: -d"
+  end
 
-if $options[:username].nil?
-  puts "\nPlease specify PostgreSQL username: -d\n\n"
-  exit
-end
+  if $options[:username].nil?
+    error "please specify username: -u"
+  end
 
-# Default value
-$options[:listen] ||= POSTGRESQL_PORT
-$options[:delim] ||= CSV_DEFAULT_DELIMITER
-$options[:quote] ||= CSV_DEFAULT_QUOTE
-$options[:drop] ||= false
+  # Database dump
+  ActiveRecord::Base.establish_connection(
+    'adapter' => 'postgresql',
+    'host' => $options[:host],
+    'database' => $options[:database],
+    'username' => $options[:username],
+    'password' => $options[:password],
+    'port' => $options[:listen],
+    'timeout' => 15000
+  )
+end
 
 $tmpfile = "/tmp/#{Digest::SHA1.hexdigest(rand(100000).to_s)}.csv"
-
-# Database dump
-ActiveRecord::Base.establish_connection(
-  'adapter' => 'postgresql',
-  'host' => $options[:host],
-  'database' => $options[:database],
-  'username' => $options[:username],
-  'password' => $options[:password],
-  'port' => $options[:listen],
-  'timeout' => 15000
-)
-
 $csv_converters = [:stripper]
 
 CSV::Converters[:stripper] = lambda{ |s|
@@ -202,10 +243,6 @@ end
 
 class MyParser
   def initialize
-    # remote server always requires password
-    if !local? and $options[:password].nil?
-      raise "You are connecting to a remote server\nPlease make sure you specify SQL password: --password "
-    end
   end
 
   def run  
@@ -263,7 +300,7 @@ class MyParser
 
   def create_table_from_csv(csv_path)
     # Get headers
-    csv = CSV.open(csv_path, :headers => true, :col_sep => CSV_DEFAULT_DELIMITER, :quote_char => CSV_DEFAULT_QUOTE)
+    csv = CSV.open(csv_path, :headers => true, :col_sep => $options[:delim], :quote_char => CSV_DEFAULT_QUOTE)
     
     first = csv.first
     unless first
@@ -281,7 +318,7 @@ class MyParser
     
     # check if every field name is unique
     if headers.count != headers.uniq.count
-      raise "Field name must be UNIQUE: \nPlease check your input headers: [#{headers.sort.join(', ')}]"
+      error "duplicate field name: [#{headers.sort.join(', ')}]"
     end
 
     # Create table
@@ -297,34 +334,27 @@ class MyParser
     
     insert_data_sql = headers.map{|e| "\"#{e}\""}.join(",")
     insert_data_sql = "COPY #{$options[:table]}( #{insert_data_sql} ) FROM '#{csv_path}' DELIMITER ',' CSV HEADER"
+    insert_data_sql = "PGPASSWORD=#{$options[:password]} psql -U #{$options[:username]} -h #{$options[:host]} -p #{$options[:listen]} #{$options[:database]} -c \"\\#{insert_data_sql}\""
     
     # Change output file permission so that postgres user can read it
     begin
       FileUtils.chmod 0755, csv_path
     rescue Exception => ex
-      puts "Error while changing file permission"
-    end
-
-    if local?
-      query(insert_data_sql)
-    else
-      puts "\nWARNING: pushing data to remote server [#{$options[:host]}].\nBe sure you have the correct version of `psql` command installed\n\n"
-      insert_data_sql = "PGPASSWORD=#{$options[:username]} psql -U #{$options[:username]} -h #{$options[:host]} -p #{$options[:listen]} #{$options[:database]} -c \"\\#{insert_data_sql}\""
-
-      `#{insert_data_sql}`
-      `PGPASSWORD=""`
+      error "cannot change file permission"
     end
     
-    puts "\nTable `#{$options[:table]}` loaded \n\n"
+    # Execute    
+    `#{insert_data_sql}`
+    
+    # Clean up
+    File.delete(csv_path) if File.exists?(csv_path)
+    
+    puts "Table `#{$options[:table]}` loaded\n"
   end
 
   private
   def query(*query_str)
-    ActiveRecord::Base.connection.execute(query_str.join("; "))
-  end
-
-  def local?
-    return ['localhost', '127.0.0.1'].include?($options[:host])
+    Organization.connection.execute(query_str.join("; "))
   end
 end
 

data/idata.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "rails", ">= 4.0"
+  #spec.add_dependency "rails", ">= 4.0"
   spec.add_dependency "pg", "~> 0.16"
 end

data/lib/idata/version.rb

@@ -1,3 +1,3 @@
 module Idata
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idata
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Nghi Pham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement