csvql 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46964f15635d66a86f53e9eaa9bcfaa317940ac
-  data.tar.gz: e7db55edc02fb2579c0d5f7d30b5a74b620d9696
+  metadata.gz: 13dbfaea6b45323f789361d04dc5ad1889144ee5
+  data.tar.gz: d9767a31cb0260261d446c18c8f8b3320a2649b8
 SHA512:
-  metadata.gz: 9e720c27ed1d0232827e7a14c118b3859c6ef2a595dab6d11371ae0068dc5740103020a1c280964b68f809e2197b388d16997c9b69bb027db3788324d0427c95
-  data.tar.gz: 292372e315213dd80426ccaac005ba9bfd8b2ec5ba501dfede451f852e8e34c0d776b14e921ef30db0bbfd76145937084050c91b0cb85692ac951330baf3e7b7
+  metadata.gz: 75e2cb12c515b7f96f96245a513d18c80b31b974a144f78e69807b895bc247b5441ae27966116e275e17df684725a5f286b36e3e956465008be494271bf3dfe8
+  data.tar.gz: 0b0a405717981ef54ffa4f7b407fcda8f7af71864b043bbc9a5841e0953e5a6968d3d5b658574223e3d6be002edafbaa3ca9bb767b5bf9cb095b7a131e8e8372

data/README.md

@@ -18,7 +18,76 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Usage by examples:
+
+    $ cat sample.csv
+    id,name,age
+    1,Anne,33
+    2,Bob,25
+    3,Charry,48
+    4,Daniel,16
+    5,Edward,52
+
+Simple query:
+
+    $ csvql --source sample.csv --sql "select count(*) from tbl"
+    6
+    $ csvql --source sample.csv --header -sql "select count(*) from tbl"
+    5
+    $ csvql --source sample.csv --header -sql "select * from tbl where age > 40"
+    3|Charry|48
+    5|Edward|52
+
+Open console:
+
+    $ csvql --source sample.csv --header --console
+    SQLite version 3.7.7 2011-06-25 16:35:41
+    Enter ".help" for instructions
+    Enter SQL statements terminated with a ";"
+    sqlite> select * from tbl order by age desc;
+    5|Edward|52
+    3|Charry|48
+    1|Anne|33
+    2|Bob|25
+    4|Daniel|16
+
+From stdin:
+
+    $ cat sample.csv | csvql --header --sql "select max(age) from tbl"
+    52
+
+Save to db-file:
+
+    $ csvql --source sample.csv --header --save-to test.db
+    $ sqlite3 test.db
+    SQLite version 3.7.7 2011-06-25 16:35:41
+    Enter ".help" for instructions
+    Enter SQL statements terminated with a ";"
+    sqlite> select avg(age) from tbl;
+    34.8
+
+Change output delimiter:
+
+    $ csvql --source sample.csv --header -sql "select * from tbl where age > 30" --output-dlm ","
+    2,Bob,25
+    4,Daniel,16
+    $ csvql --source sample.csv --header -sql "select * from tbl where age > 30" --output-dlm=tab
+    2	Bob	25
+    4	Daniel	16
+
+Options:
+
+    $ svql --help
+    Usage: csvql [options]
+        --console                    After all commands are run, open sqlite3 console with this data
+        --header                     Treat file as having the first row as a header row
+        --output-dlm="|"             Output delimiter (|)
+        --save-to=FILE               If set, sqlite3 db is left on disk at this path
+        --skip-comment               Skip comment lines start with '#'
+        --source=FILE                Source file to load, or defaults to stdin
+        --sql=SQL                    SQL Command(s) to run on the data
+        --table-name=NAME            Override the default table name (tbl)
+        --verbose                    Enable verbose logging
 
 ## Contributing
 

data/lib/csvql/csvql.rb

@@ -69,9 +69,12 @@ module Csvql
       @pre.execute(cols)
     end
 
-    def exec(sql)
+    def exec(sql, dlm="|")
+      if dlm.downcase == 'tab'
+        dlm = "\t"
+      end
       @db.execute(sql) do |row|
-        puts row.join("|")
+        puts row.join(dlm)
       end
     end
 
@@ -88,6 +91,7 @@ module Csvql
 
       opt.on("--console",         "After all commands are run, open sqlite3 console with this data") {|v| option[:console] = v }
       opt.on("--header",          "Treat file as having the first row as a header row") {|v| option[:header] = v }
+      opt.on('--output-dlm="|"',  "Output delimiter (|)")                               {|v| option[:output_dlm] = v }
       opt.on("--save-to=FILE",    "If set, sqlite3 db is left on disk at this path")    {|v| option[:save_to] = v }
       opt.on("--skip-comment",    "Skip comment lines start with '#'")                  {|v| option[:skip_comment] = v }
       opt.on("--source=FILE",     "Source file to load, or defaults to stdin")          {|v| option[:source] = v }
@@ -113,8 +117,10 @@ module Csvql
       tbl.exec("PRAGMA synchronous=OFF")
       tbl.exec("BEGIN TRANSACTION")
       csvfile.each.with_index(1) do |line,i|
+        line = NKF.nkf('-w', line).strip
+        next if line.size == 0
         next if option[:skip_comment] && line.start_with?("#")
-        row = NKF.nkf('-w', line).parse_csv
+        row = line.parse_csv
         if i == 1
           tbl.create_table(row, option[:header], option[:table_name]||"tbl")
           next if option[:header]
@@ -123,7 +129,7 @@ module Csvql
       end
       tbl.exec("COMMIT TRANSACTION")
 
-      tbl.exec(option[:sql]) if option[:sql]
+      tbl.exec(option[:sql], option[:output_dlm]||"|") if option[:sql]
       tbl.open_console if option[:console]
     end
   end

data/lib/csvql/version.rb

@@ -1,3 +1,3 @@
 module Csvql
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvql
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - YANO Satoru
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: csvql