csvql 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bed0a5cc8a2105697059068f974285f7759d6740
-  data.tar.gz: eb9f67e00d7fa495e66898db8ec63a7643db9e1f
+  metadata.gz: 537a7e1f20984f0f7f9d51d6974a8be35001da2d
+  data.tar.gz: 532cac120267e16efc2855d1f06eb27bff6552a3
 SHA512:
-  metadata.gz: da2ed707579ba0a38405396db9844eb39b1a5f60464fdb955940ee8faba65fd35b966d964237321be42bb71802fda8391b990db9e9cb89192b6755de2ca35c6f
-  data.tar.gz: 34361aedb693e113b7e48ca4a5b3d1048d793ba78dd3fcb8919ce0e7884ca550d5e24afa7c815dcf5ee807b71e3e19b6ea3e4dc4ef9df872369383cae0b65797
+  metadata.gz: efcf98bb4591188e64f6d04057d017a3bab2ba39e24717907ab53d6fc09b3739ba9210dc6c81f720ea0bd0fde0eb33c1c19b434ca794857113ab32eff023d4da
+  data.tar.gz: 467445d9fa94b4f7b42e6cce0b3b4fbf87a228f003b4858d9efe6d562f75fe2333450257400cc7479a872ccedb899008367e8cbc771f0caff9a05726ea3c7864

data/lib/csvql.rb

@@ -19,7 +19,8 @@ module Csvql
 
       opt_parser.on("--console",         "After all commands are run, open sqlite3 console with this data") {|v| opt.console = v }
       opt_parser.on("--header",          "Treat file as having the first row as a header row") {|v| opt.header = v }
-      opt_parser.on('--output-dlm="|"',  "Output delimiter (|)")                               {|v| opt.output_dlm = v }
+      opt_parser.on('--ifs=","',         "Input field separator (,)")                          {|v| opt.ifs = v }
+      opt_parser.on('--ofs="|"',         "Output field separator (|)")                         {|v| opt.ofs = v }
       opt_parser.on("--save-to=FILE",    "If set, sqlite3 db is left on disk at this path")    {|v| opt.save_to = v }
       opt_parser.on("--append",          "Append mode (not dropping any tables)")              {|v| opt.append = v }
       opt_parser.on("--skip-comment",    "Skip comment lines start with '#'")                  {|v| opt.skip_comment = v }
@@ -40,10 +41,14 @@ module Csvql
                               else
                                 "tbl"
                               end
-      if opt.output_dlm == 'tab'
-        opt.output_dlm = "\t"
+      if opt.ifs == 'tab'
+        opt.ifs = "\t"
       end
-      opt.output_dlm ||= "|"
+
+      if opt.ofs == 'tab'
+        opt.ofs = "\t"
+      end
+      opt.ofs ||= "|"
 
       if opt.completion
         puts opt.compsys('csvql')
@@ -73,7 +78,7 @@ module Csvql
           schema = File.open(file).read
         end
       else
-        cols = first_line.parse_csv
+        cols = first_line.parse_csv(col_sep: opt.ifs)
         col_name = if opt.header
                      cols
                    else
@@ -93,7 +98,7 @@ module Csvql
         line = NKF.nkf('-w', line).strip
         next if line.size == 0
         next if opt.skip_comment && line.start_with?("#")
-        row = line.parse_csv
+        row = line.parse_csv(col_sep: opt.ifs)
         row.map!(&:strip) if opt.strip
         tbl.insert(row, i)
       end
@@ -109,7 +114,7 @@ module Csvql
         end
       end
 
-      tbl.exec(sql).each {|row| puts row.join(opt.output_dlm) } if sql
+      tbl.exec(sql).each {|row| puts row.join(opt.ofs) } if sql
       tbl.open_console if opt.console
     end
   end

data/lib/csvql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvql
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - YANO Satoru
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: csvql
@@ -75,4 +75,3 @@ test_files:
 - spec/csvql_spec.rb
 - spec/sample.csv
 - spec/spec_helper.rb
-has_rdoc: