csvql 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8058641699d9c3f61519e20c5c82bf025d63b2bf
-  data.tar.gz: 6ce31e76053b3864bc1f15d34ce93556c9161e6e
+  metadata.gz: 0dde4233623d84d9417709ae86a5cc854ed8a6e5
+  data.tar.gz: 36e69e39b2f9c5a5dce0699942afff427f4ab753
 SHA512:
-  metadata.gz: 73f1c1962c82f3724b310c81ccdf62892f67cd6ad98c4106bab16232d6a62ba7db89dc058319f00b60633bbda794f02979357653642b846beb7339b830502d99
-  data.tar.gz: 47a073fe0eccc876cb515db3b894823a0a7149e5be8e1a6eccb00820b38a0d2783cdd8cc4ba77a17586bfdc8b643c66e1826357dd6c4034bb1296ca83926760a
+  metadata.gz: 2673f91dd259536d838e20d4e1d12e9493d972ce2a0151be669cbb20be983f1481a4d111ade364d5a72aab92719eec00d051b6943f91373ed1667dbac54b4bd6
+  data.tar.gz: 072b5d5f0aae880362953600b288f3c412d771f0313eb213137e21209a269160dd7f3b8f2e7b2ec01eaecc08842b5c9c5f33bb3079f796f0c24064945a6db7f6

data/lib/csvql/csvql.rb

@@ -25,6 +25,7 @@ module Csvql
     end
 
     def create_alias(table, view="tbl")
+      return if table == view
       exec "DROP VIEW IF EXISTS #{view}"
       exec "CREATE VIEW #{view} AS SELECT * FROM #{table}"
     end

data/lib/csvql/version.rb

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

data/lib/csvql.rb

@@ -3,6 +3,7 @@
 require 'csv'
 require 'nkf'
 require 'optparse'
+require 'ostruct'
 
 require "csvql/csvql"
 require "csvql/version"
@@ -10,62 +11,62 @@ require "csvql/version"
 module Csvql
   class << self
     def option_parse(argv)
-      opt = OptionParser.new("Usage: csvql [csvfile] [options]")
-      option = {}
+      opt_parser = OptionParser.new("Usage: csvql [csvfile] [options]")
+      opt = OpenStruct.new
 
       # default
       # option[:header] = true
 
-      opt.on("--console",         "After all commands are run, open sqlite3 console with this data") {|v| option[:console] = v }
-      opt.on("--[no-]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("--append",          "Append mode (not dropping any tables)")              {|v| option[:append] = 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 }
-      opt.on("--sql=SQL",         "SQL Command(s) to run on the data")                  {|v| option[:sql] = v }
-      opt.on("--select=COLUMN",   "Select column (*)")                                  {|v| option[:select] = v }
-      opt.on("--schema=FILE or STRING", "Specify a table schema")                       {|v| option[:schema] = v }
-      opt.on("--strip",           "Strip spaces around columns")                        {|v| option[:strip] = v }
-      opt.on("--where=COND",      "Where clause")                                       {|v| option[:where] = v }
-      opt.on("--table-name=NAME", "Override the default table name (tbl)")              {|v| option[:table_name] = v }
-      opt.on("--verbose",         "Enable verbose logging")                             {|v| option[:verbose] = v }
-      opt.parse!(argv)
+      opt_parser.on("--console",         "After all commands are run, open sqlite3 console with this data") {|v| opt.console = v }
+      opt_parser.on("--[no-]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("--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 }
+      opt_parser.on("--source=FILE",     "Source file to load, or defaults to stdin")          {|v| opt.source = v }
+      opt_parser.on("--sql=SQL",         "SQL Command(s) to run on the data")                  {|v| opt.sql = v }
+      opt_parser.on("--select=COLUMN",   "Select column (*)")                                  {|v| opt.select = v }
+      opt_parser.on("--schema=FILE or STRING", "Specify a table schema")                       {|v| opt.schema = v }
+      opt_parser.on("--strip",           "Strip spaces around columns")                        {|v| opt.strip = v }
+      opt_parser.on("--where=COND",      "Where clause")                                       {|v| opt.where = v }
+      opt_parser.on("--table-name=NAME", "Override the default table name (tbl)")              {|v| opt.table_name = v }
+      opt_parser.on("--verbose",         "Enable verbose logging")                             {|v| opt.verbose = v }
+      opt_parser.parse!(argv)
 
-      option[:source] ||= argv[0]
-      # option[:where] ||= argv[1]
-      option[:table_name] ||= if option[:save_to] && option[:source] != nil
-                                File.basename(option[:source].downcase, ".csv").gsub(/\./, "_")
+      opt.source ||= argv[0]
+      # opt.where] ||= argv[1]
+      opt.table_name ||= if opt.save_to && opt.source != nil
+                                File.basename(opt.source.downcase, ".csv").gsub(/\./, "_")
                               else
                                 "tbl"
                               end
-      if option[:output_dlm] == 'tab'
-        option[:output_dlm] = "\t"
+      if opt.output_dlm == 'tab'
+        opt.output_dlm = "\t"
       end
-      option[:output_dlm] ||= "|"
+      opt.output_dlm ||= "|"
 
-      if option[:completion]
+      if opt.completion
         puts opt.compsys('csvql')
         exit 0
       end
-      option
+      opt
     end
 
     def run(argv)
-      option = option_parse(argv)
-      if option[:console] && option[:source] == nil
+      opt = option_parse(argv)
+      if opt.console && opt.source == nil
         puts "Can not open console with pipe input, read a file instead"
         exit 1
       end
-      if option[:sql] && (option[:select] || option[:where])
+      if opt.sql && (opt.select || opt.where)
         puts "Can not use --sql option and --select|--where option at the same time."
         exit 1
       end
 
-      csvfile = option[:source] ? File.open(option[:source]) : $stdin
+      csvfile = opt.source ? File.open(opt.source) : $stdin
       first_line = csvfile.readline
 
-      schema = option[:schema]
+      schema = opt.schema
       if schema
         file = File.expand_path(schema)
         if File.exist?(file)
@@ -73,43 +74,43 @@ module Csvql
         end
       else
         cols = first_line.parse_csv
-        col_name = if option[:header]
+        col_name = if opt.header
                      cols
                    else
                      cols.size.times.map {|i| "c#{i}" }
                    end
         schema = col_name.map {|c| "#{c} NONE" }.join(",")
       end
-      csvfile.rewind unless option[:header]
+      csvfile.rewind unless opt.header
 
-      tbl = TableHandler.new(option[:save_to], option[:console])
-      tbl.drop_table(option[:table_name]) unless option[:append]
-      tbl.create_table(schema, option[:table_name])
-      tbl.create_alias(option[:table_name]) if option[:save_to] && option[:table_name] != "tbl"
+      tbl = TableHandler.new(opt.save_to, opt.console)
+      tbl.drop_table(opt.table_name) unless opt.append
+      tbl.create_table(schema, opt.table_name)
+      tbl.create_alias(opt.table_name) if opt.save_to
       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?("#")
+        next if opt.skip_comment && line.start_with?("#")
         row = line.parse_csv
-        row.map!(&:strip) if option[:strip]
+        row.map!(&:strip) if opt.strip
         tbl.insert(row, i)
       end
       tbl.exec("COMMIT TRANSACTION")
 
-      if option[:sql]
-        sql = option[:sql]
-      elsif option[:select] || option[:where]
-        option[:select] ||= "*"
-        sql = "select #{option[:select]} from #{option[:table_name]}"
-        if option[:where]
-          sql += " where (#{option[:where]})"
+      if opt.sql
+        sql = opt.sql
+      elsif opt.select || opt.where
+        opt.select ||= "*"
+        sql = "select #{opt.select} from #{opt.table_name}"
+        if opt.where
+          sql += " where (#{opt.where})"
         end
       end
 
-      tbl.exec(sql).each {|row| puts row.join(option[:output_dlm]) } if sql
-      tbl.open_console if option[:console]
+      tbl.exec(sql).each {|row| puts row.join(opt.output_dlm) } if sql
+      tbl.open_console if opt.console
     end
   end
 end

data/spec/csvql_spec.rb

@@ -9,7 +9,7 @@ describe Csvql do
 
   it 'select name' do
     expect(capture {
-             Csvql.run([csvfile, "--select", "name"])
+             Csvql.run([csvfile, "--header", "--select", "name"])
            }).to eq(<<EOL)
 Anne
 Bob
@@ -21,7 +21,7 @@ EOL
 
   it 'where age > 40' do
     expect(capture {
-             Csvql.run([csvfile, "--where", "age > 40"])
+             Csvql.run([csvfile, "--header", "--where", "age > 40"])
            }).to eq(<<EOL)
 3|Charry|48
 5|Edward|52
@@ -30,7 +30,7 @@ EOL
 
   it 'sql option' do
     expect(capture {
-             Csvql.run([csvfile, "--sql", "select name,age from tbl where age between 20 and 40"])
+             Csvql.run([csvfile, "--header", "--sql", "select name,age from tbl where age between 20 and 40"])
            }).to eq(<<EOL)
 Anne|33
 Bob|25
@@ -39,7 +39,7 @@ EOL
 
   it 'change output delimiter' do
     expect(capture {
-             Csvql.run([csvfile, "--where", "id = 3", "--output-dlm", ","])
+             Csvql.run([csvfile, "--header", "--where", "id = 3", "--output-dlm", ","])
            }).to eq(<<EOL)
 3,Charry,48
 EOL
@@ -47,7 +47,7 @@ EOL
 
   it 'change table name' do
     expect(capture {
-             Csvql.run([csvfile, "--sql", "select id,name from users where id >= 4", "--table-name", "users"])
+             Csvql.run([csvfile, "--header", "--sql", "select id,name from users where id >= 4", "--table-name", "users"])
            }).to eq(<<EOL)
 4|Daniel
 5|Edward
@@ -56,7 +56,7 @@ EOL
 
   it 'save-to db file' do
     dbfile = "csvql_test.db"
-    Csvql.run([csvfile, "--save-to", dbfile])
+    Csvql.run([csvfile, "--header", "--save-to", dbfile])
     expect(`sqlite3 #{dbfile} "select * from tbl"`).to eq(<<EOL)
 1|Anne|33
 2|Bob|25
@@ -77,7 +77,7 @@ EOL
 
   it 'source option' do
     expect(capture {
-             Csvql.run(["--source", csvfile, "--select", "count(*)"])
+             Csvql.run(["--source", csvfile, "--header", "--select", "count(*)"])
            }).to eq(<<EOL)
 5
 EOL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csvql
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - YANO Satoru