csvql 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6154147fd2ece48902d1e4494b7d248cd125f9ab
-  data.tar.gz: 492d8e597c6c1e657b2efdfdadc48f9e4c4e6ad5
+  metadata.gz: 878ed2bcc132c4a7d1eef108770fdf7eaf32a0a0
+  data.tar.gz: 6623dae499cbb326d08d74906722dd37507ac3ce
 SHA512:
-  metadata.gz: 578f5cedc8514c6df4790cfd821b98b075095cce9a6838fc865f8e2d5939864eb1c36151bcd78d6c2ee604ea9263bd56f6552986dde98381f30af8333bd3e624
-  data.tar.gz: 49956fd0295eaf4d7813038ac4f7ab1b5655c2044ce98d193e5143699850eb40798a0a28d11b4d1771b47987351ebea57b86b5fed96c15c7bb923cfe0bd42487
+  metadata.gz: 2bd0cfbe691654236fe9c4c7c29fe258ceddf9909dac8ab94f54a72ff584dafd95da440d0d3e0291d508233869c7a57b3b2f667b1aa1a14c1a30e684bf85fe6b
+  data.tar.gz: 82de714a1dcad79f54c41aeaacb0f19a0980054d875f63688a31c658662a21d68bff7942926fcf46fc08f91964563fc6c72c15ab45f5cb00d79bbe3deb49b5da

data/lib/csvql.rb

@@ -10,13 +10,12 @@ require "csvql/version"
 module Csvql
   class << self
     def option_parse(argv)
-      opt = OptionParser.new
+      opt = OptionParser.new("Usage: csvql [csvfile] [options]")
       option = {}
 
       # default
       option[:header] = true
 
-      opt.banner = "Usage: csvql [csvfile] [options]"
       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 }
@@ -27,6 +26,7 @@ module Csvql
       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 every column data")                            {|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 }
@@ -88,6 +88,7 @@ module Csvql
         next if line.size == 0
         next if option[:skip_comment] && line.start_with?("#")
         row = line.parse_csv
+        row.map!(&:strip) if option[:strip]
         tbl.insert(row, i)
       end
       tbl.exec("COMMIT TRANSACTION")

data/lib/csvql/csvql.rb

@@ -21,13 +21,11 @@ module Csvql
       @col_name = schema.split(",").map {|c| c.split.first.strip }
       @col_size = @col_name.size
       @table_name = table_name
-      sql = "CREATE TABLE IF NOT EXISTS #{@table_name} (#{schema})"
-      @db.execute(sql)
+      exec "CREATE TABLE IF NOT EXISTS #{@table_name} (#{schema})"
     end
 
     def drop_table(table_name="tbl")
-      sql = "DROP TABLE IF EXISTS #{table_name}"
-      @db.execute(sql)
+      exec "DROP TABLE IF EXISTS #{table_name}"
     end
 
     def prepare(cols)

data/lib/csvql/version.rb

@@ -1,3 +1,3 @@
 module Csvql
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/csvql_spec.rb

@@ -47,10 +47,39 @@ EOL
 
   it 'change table name' do
     expect(capture {
-             Csvql.run([csvfile, "--sql", "select id,name from user_info where id >= 4", "--table-name", "user_info"])
+             Csvql.run([csvfile, "--sql", "select id,name from users where id >= 4", "--table-name", "users"])
            }).to eq(<<EOL)
 4|Daniel
 5|Edward
+EOL
+  end
+
+  it 'save-to db file' do
+    dbfile = "csvql_test.db"
+    Csvql.run([csvfile, "--save-to", dbfile])
+    expect(`sqlite3 #{dbfile} "select * from tbl"`).to eq(<<EOL)
+1|Anne|33
+2|Bob|25
+3|Charry|48
+4|Daniel|16
+5|Edward|52
+EOL
+    File.delete dbfile
+  end
+
+  it 'no header' do
+    expect(capture {
+             Csvql.run([csvfile, "--no-header", "--where", "typeof(c0)!='integer'"])
+           }).to eq(<<EOL)
+id|name|age
+EOL
+  end
+
+  it 'source option' do
+    expect(capture {
+             Csvql.run(["--source", csvfile, "--select", "count(*)"])
+           }).to eq(<<EOL)
+5
 EOL
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - YANO Satoru
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -75,3 +75,4 @@ test_files:
 - spec/csvql_spec.rb
 - spec/sample.csv
 - spec/spec_helper.rb
+has_rdoc: