csvql 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 810630ed534c79a2a4fa99ccf6757950352ae6eb
-  data.tar.gz: e11f9a88105893d4aea8eef4b1c47d949fd83ca4
+  metadata.gz: 6154147fd2ece48902d1e4494b7d248cd125f9ab
+  data.tar.gz: 492d8e597c6c1e657b2efdfdadc48f9e4c4e6ad5
 SHA512:
-  metadata.gz: 1419f89fb4e2a4d484169348ffa1ff26ae8d6e2f465680c2651ea1f38810d13fa78dce29f63ee3a4e69974f70f1dc6e8e912050e3aa5e3cda07dabb61e69492a
-  data.tar.gz: da76917a1a2e45ebd1b11cce12a02e0da70dfded8c52fcb239a769a6b4e13004652e96b8520a9199d806828566c70a0349eebc922874b4e0435ddfd885d35056
+  metadata.gz: 578f5cedc8514c6df4790cfd821b98b075095cce9a6838fc865f8e2d5939864eb1c36151bcd78d6c2ee604ea9263bd56f6552986dde98381f30af8333bd3e624
+  data.tar.gz: 49956fd0295eaf4d7813038ac4f7ab1b5655c2044ce98d193e5143699850eb40798a0a28d11b4d1771b47987351ebea57b86b5fed96c15c7bb923cfe0bd42487

data/lib/csvql/csvql.rb

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
-require 'csv'
-require 'nkf'
 require 'tempfile'
-require 'optparse'
 require 'sqlite3'
 
 module Csvql
   class TableHandler
     def initialize(path, console)
-      @db_file = if path && path.size > 0
+      @db_file = if path && path.strip.size > 0
                    path
                  elsif console
                    @tmp_file = Tempfile.new("csvql").path
@@ -20,26 +17,11 @@ module Csvql
       @db = SQLite3::Database.new(@db_file)
     end
 
-    def create_table(cols, header, table_name="tbl", schema=nil)
-      @col_size = cols.size
+    def create_table(schema, table_name="tbl")
+      @col_name = schema.split(",").map {|c| c.split.first.strip }
+      @col_size = @col_name.size
       @table_name = table_name
-      if schema
-        file = File.expand_path(schema)
-        col = if File.exist?(file)
-                File.open(file).read
-              else
-                schema
-              end
-        @col_name = col.split(",").map {|c| c.split.first.strip }
-      else
-        @col_name = if header
-                      cols
-                    else
-                      @col_size.times.map {|i| "c#{i}" }
-                    end
-        col = @col_name.map {|c| "#{c} NONE" }.join(",")
-      end
-      sql = "CREATE TABLE IF NOT EXISTS #{@table_name} (#{col})"
+      sql = "CREATE TABLE IF NOT EXISTS #{@table_name} (#{schema})"
       @db.execute(sql)
     end
 
@@ -62,13 +44,8 @@ module Csvql
       @pre.execute(cols)
     end
 
-    def exec(sql, dlm="|")
-      if dlm.downcase == 'tab'
-        dlm = "\t"
-      end
-      @db.execute(sql) do |row|
-        puts row.join(dlm)
-      end
+    def exec(sql)
+      @db.execute(sql)
     end
 
     def open_console
@@ -76,80 +53,4 @@ module Csvql
       File.delete(@tmp_file) if @tmp_file
     end
   end
-
-  class << self
-    def option_parse(argv)
-      opt = OptionParser.new
-      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 }
-      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("--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)
-
-      option[:source] ||= argv[0]
-      # option[:where] ||= argv[1]
-      option[:table_name] ||= "tbl"
-      option[:output_dlm] ||= "|"
-      option
-    end
-
-    def run(argv)
-      option = option_parse(argv)
-      if option[:console] && option[:source] == nil
-        puts "Can not open console with pipe input, read a file instead"
-        exit 1
-      end
-      if option[:sql] && (option[:select] || option[: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
-
-      tbl = TableHandler.new(option[:save_to], option[:console])
-      tbl.drop_table(option[:table_name]) unless option[:append]
-      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 = line.parse_csv
-        if i == 1
-          tbl.create_table(row, option[:header], option[:table_name], option[:schema])
-          next if option[:header]
-        end
-        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]})"
-        end
-      end
-
-      tbl.exec(sql, option[:output_dlm]) if sql
-      tbl.open_console if option[:console]
-    end
-  end
 end

data/lib/csvql/version.rb

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

data/lib/csvql.rb

@@ -1,6 +1,109 @@
+# -*- coding: utf-8 -*-
+
+require 'csv'
+require 'nkf'
+require 'optparse'
+
 require "csvql/csvql"
 require "csvql/version"
 
 module Csvql
-  # Your code goes here...
+  class << self
+    def option_parse(argv)
+      opt = OptionParser.new
+      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 }
+      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("--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)
+
+      option[:source] ||= argv[0]
+      # option[:where] ||= argv[1]
+      option[:table_name] ||= "tbl"
+      if option[:output_dlm] == 'tab'
+        option[:output_dlm] = "\t"
+      end
+      option[:output_dlm] ||= "|"
+
+      if option[:completion]
+        puts opt.compsys('csvql')
+        exit 0
+      end
+      option
+    end
+
+    def run(argv)
+      option = option_parse(argv)
+      if option[:console] && option[:source] == nil
+        puts "Can not open console with pipe input, read a file instead"
+        exit 1
+      end
+      if option[:sql] && (option[:select] || option[: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
+      first_line = csvfile.readline
+
+      schema = option[:schema]
+      if schema
+        file = File.expand_path(schema)
+        if File.exist?(file)
+          schema = File.open(file).read
+        end
+      else
+        cols = first_line.parse_csv
+        col_name = if option[: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]
+
+      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.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 = line.parse_csv
+        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]})"
+        end
+      end
+
+      tbl.exec(sql).each {|row| puts row.join(option[:output_dlm]) } if sql
+      tbl.open_console if option[:console]
+    end
+  end
 end

data/spec/csvql_spec.rb

@@ -1,11 +1,56 @@
 require 'spec_helper'
 
+csvfile = File.join(File.expand_path(File.dirname("__FILE__")), "spec/sample.csv")
+
 describe Csvql do
   it 'has a version number' do
     expect(Csvql::VERSION).not_to be nil
   end
 
-  it 'does something useful' do
-    expect(false).to eq(true)
+  it 'select name' do
+    expect(capture {
+             Csvql.run([csvfile, "--select", "name"])
+           }).to eq(<<EOL)
+Anne
+Bob
+Charry
+Daniel
+Edward
+EOL
+  end
+
+  it 'where age > 40' do
+    expect(capture {
+             Csvql.run([csvfile, "--where", "age > 40"])
+           }).to eq(<<EOL)
+3|Charry|48
+5|Edward|52
+EOL
+  end
+
+  it 'sql option' do
+    expect(capture {
+             Csvql.run([csvfile, "--sql", "select name,age from tbl where age between 20 and 40"])
+           }).to eq(<<EOL)
+Anne|33
+Bob|25
+EOL
+  end
+
+  it 'change output delimiter' do
+    expect(capture {
+             Csvql.run([csvfile, "--where", "id = 3", "--output-dlm", ","])
+           }).to eq(<<EOL)
+3,Charry,48
+EOL
+  end
+
+  it 'change table name' do
+    expect(capture {
+             Csvql.run([csvfile, "--sql", "select id,name from user_info where id >= 4", "--table-name", "user_info"])
+           }).to eq(<<EOL)
+4|Daniel
+5|Edward
+EOL
   end
 end

data/spec/sample.csv

@@ -0,0 +1,6 @@
+id,name,age
+1,Anne,33
+2,Bob,25
+3,Charry,48
+4,Daniel,16
+5,Edward,52

data/spec/spec_helper.rb

@@ -1,2 +1,13 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'csvql'
+
+def capture
+  begin
+    $stdout = StringIO.new
+    yield
+    result = $stdout.string
+  ensure
+    $stdout = STDOUT
+  end
+  result
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csvql
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - YANO Satoru
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -45,6 +45,7 @@ files:
 - lib/csvql/csvql.rb
 - lib/csvql/version.rb
 - spec/csvql_spec.rb
+- spec/sample.csv
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -66,10 +67,11 @@ 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
 test_files:
 - spec/csvql_spec.rb
+- spec/sample.csv
 - spec/spec_helper.rb