idata 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a99cb6ea4fb972dec876c88ec37ca7e3d4986e
-  data.tar.gz: 9f17bc2ab0867328c9140496d3acedc00f1a4f95
+  metadata.gz: 45d9ad3aa3448f33bbae663345c40e37f2d93ab6
+  data.tar.gz: 55b2264c03d2554b5d784cb2bc30a1a1fa294555
 SHA512:
-  metadata.gz: 59bdce85d4720ad18bdaec24abef16efbb40674316a30474d878cfd0fd1b6d13d0180ebcec98592b6cd0f95c8e59477655aeaa0cff595010482d064f9b91e693
-  data.tar.gz: c559ab7741fe815b518daffb75a21b24cc86514535e8736c1cb10456ecb0b652904ce1fa7c92dcd215071f88dba62c5dad1165b22435adb0218714d2040454c8
+  metadata.gz: 0f85c264b07d477ae9227f7732e47a2f81d78504fd947dee3615ca25c86d60e1b319452ee42a223ef2bdc8ecbb801b653ba008e19d726dd6924773418e03d4c1
+  data.tar.gz: a354d23e196ea2155f70be07d9239d96a96943e2e8b495c1a430034e689783fd2fcb2f00140c72d0ab2ff0a9ecd8b9772653a3a3dd99d50125d1d308f230bca9

data/bin/iload

@@ -22,7 +22,6 @@ CSV_DEFAULT_DELIMITER = ','
 CSV_DEFAULT_QUOTE = '"'
 CSV_DEFAULT_FORMAT = 'CSV'
 
-
 def error(msg)
   puts "Error: #{msg}"
   exit(-1)
@@ -83,10 +82,6 @@ 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
@@ -125,6 +120,9 @@ $options[:delim] ||= CSV_DEFAULT_DELIMITER
 $options[:quote] ||= CSV_DEFAULT_QUOTE
 $options[:drop] ||= false
 
+# extra options
+$options[:client] = ARGV[0] if ARGV[0]
+
 # validate parameters
 if $options[:input].nil?
   error "please specify input file: -i"
@@ -147,16 +145,20 @@ if $options[:table].nil?
 end
 
 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"
+  error "once client name (#{$options[:client]}) is specified, -h/-u/-d/-p is no longer needed"
+end
+
+if ARGV.count > 1
+  error "too many arguments!"
 end
 
 if $options[:client]
   if ENV['MAINDBNAME'].blank?
-    error "The environment variable MAINDBNAME (used by -c/--client) is not present"
+    error "the environment variable MAINDBNAME is not present"
   end
   
   if ENV['MAINDBHOST'].blank?
-    error "The environment variable MAINDBHOST (used by -c/--client) is not present"
+    error "the environment variable MAINDBHOST is not present"
   end
   
   ActiveRecord::Base.establish_connection(

data/lib/idata/version.rb

@@ -1,3 +1,3 @@
 module Idata
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idata
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Nghi Pham