idata 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 783eb30b0a6cd789cc9d2fb0da70f4778fde4cc4
-  data.tar.gz: 437a27a9a00e673d428725091f73e7c68629db39
+  metadata.gz: a65ffab6dcd5b46ea706e0234d603432d8dfe967
+  data.tar.gz: 375b06bd1ba205618418c0fd536ea241cf59dc10
 SHA512:
-  metadata.gz: ab81630fc7a8293952e91074275ba447dca0f55e08507a1512237774eed8da58202814f655087f03d6d92ecdfe33a45efc8c6ab82ef30501cf3793ed978352cb
-  data.tar.gz: 95ca71dceb6ac7cd5616f02d708ae3cd071040501e764a7e384c5fb2486dc73861fff0c141b0aca4ac9a61cf372b6d23435f3355bc699d3be73527cd7e5df7db
+  metadata.gz: 1e35c422fa9eae8475d33b750022f236ec74e0f1f95fd4baff680abaec9f7d2ff1c6ef436a183c7c8d9d09cf35c3b0b4b4aed2bf4cb18d674356d16787024130
+  data.tar.gz: 0c8838b2a6483870fec4289d4d8570e24e2da1af095a12d6ccdc274451b1b2ab55413f81e5f8916b80b50a2fb905d035b7a9d19a3fdfc8db53ba56055be06f19

data/bin/iexport

@@ -14,6 +14,7 @@ require 'active_record'
 require 'rubygems'
 require 'digest/sha1'
 require 'fileutils'
+require 'sqlite3'
 
 SUPPORTED_INPUT_FORMATS = ['CSV']
 POSTGRESQL_PORT = 5432
@@ -80,6 +81,10 @@ parser = OptionParser.new("", 24) do |opts|
   opts.on("-o", "--output FILE", "Output file") do |v|
     $options[:output] = v
   end
+  
+  opts.on("--sqlitedb PATH", "Path to SQLite3 database file") do |v|
+    $options[:sqlitedb] = v
+  end
 
   opts.on("-h", "--host HOST", "PostgreSQL host") do |v|
     $options[:host] = v
@@ -157,21 +162,32 @@ if $options[:output].nil?
   exit
 end
 
-if $options[:host].nil?
+if $options[:host].nil? && $options[:sqlitedb].nil?
   puts "\nPlease specify host name: -h\n\n"
   exit
 end
 
-if $options[:database].nil?
+if $options[:database].nil? && $options[:sqlitedb].nil?
   puts "\nPlease specify PostgreSQL database name: -d\n\n"
   exit
 end
 
-if $options[:username].nil?
+if $options[:username].nil? && $options[:sqlitedb].nil?
   puts "\nPlease specify PostgreSQL username: -u\n\n"
   exit
 end
 
+if ($options[:host] || $options[:username] || $options[:listen] || $options[:password]) && $options[:sqlitedb]
+  puts "\nYou cannot specify both PostgreSQL ('host', 'username', 'listen', 'password') and SQLite ('sqlitedb') parameters \n\n"
+  exit
+end
+
+if $options[:sqlitedb] && !File.exists?($options[:sqlitedb])
+  puts "\nFile does not exist '#{$options[:sqlitedb]}'\n\n"
+  exit
+end
+
+
 # Default value
 $options[:listen] ||= POSTGRESQL_PORT
 $options[:delim] ||= CSV_DEFAULT_DELIMITER
@@ -182,7 +198,7 @@ $options[:headers] ||= false
 $options[:quotes] ||= false
 $options[:quote_empty] ||= false
 $options[:select] ||= '*'
-$options[:where] ||= 'true'
+$options[:where] ||= ( $options[:sqlitedb].nil? ) ? 'true' : '1=1'
 $options[:include] ||= ""
 
 # Do not quote the '"' char
@@ -203,16 +219,23 @@ end
 
 $options[:select] = [$options[:select].split(/\s*,\s*/) + $options[:include].split(/\s*,\s*/)].join(", ")
 
-#$options = {host: 'localhost', database: 'db', username: 'postgres', password: 'postgres', table: 'products', listen: 5432}
-ActiveRecord::Base.establish_connection(
-  'adapter' => 'postgresql',
-  'host' => $options[:host],
-  'database' => $options[:database],
-  'username' => $options[:username],
-  'password' => $options[:password],
-  'port' => $options[:listen],
-  'timeout' => 15000
-)
+if $options[:sqlitedb]
+  ActiveRecord::Base.establish_connection(
+    'adapter' => 'sqlite3',
+    'database' => $options[:sqlitedb],
+    'timeout' => 15000
+  )
+else
+  ActiveRecord::Base.establish_connection(
+    'adapter' => 'postgresql',
+    'host' => $options[:host],
+    'database' => $options[:database],
+    'username' => $options[:username],
+    'password' => $options[:password],
+    'port' => $options[:listen],
+    'timeout' => 15000
+  )
+end
 
 class Product < ActiveRecord::Base
   self.table_name = $options[:table]

data/lib/idata/version.rb

@@ -1,3 +1,3 @@
 module Idata
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idata
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Nghi Pham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler