slyce 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8350b63046aa4e84fd9f04bd73ed92140ec3b569ac6c997f53f74e2235ec685
-  data.tar.gz: 34ee0a6665542b55df24b55d22150017610f1fdb891860e95b33b8ab30b03eaa
+  metadata.gz: 6e6b0abe59bae61e2f6883c497a4aea1496cfb34bc6aaa3e98de9736c8571562
+  data.tar.gz: 52e62601f71421927d88fddfa1aaab680c292a0bd6ff62c419d52dbd7db5fd2e
 SHA512:
-  metadata.gz: c405dc17703ea8c99617183ef95185deb3703c98ab029106ac87a6e5ea2e3af833c3a6534e99960892de2cd6c6e69ebd2a3653e3c38d93c9c7fc60839df353bd
-  data.tar.gz: 25273ba52a3fec83f83da1e867255bbf98d238925d50a18a10f77f1587889e7123e423ac6e27eb14a3cad8a5f7d609b52661285e6a7621365c15d8e98228c23f
+  metadata.gz: 15d3b6b2c9924c7d12e5b5665d699c717253b4cd85fcbb717694d86bf16d824b6a7de2f16d5990d06a3bc1e4b6fffde75019d13eacc3ab612a0eeb74a2fbf6aa
+  data.tar.gz: cb60a335ea7143ac375eb9e9c61a3477b88976127e9af90c6f544e9dbbaecc3efdd609dfd8b22be084a049829110af6b8c2b4a9173b0495a275f5bbe5e8ab7e8

data/bin/slyce

@@ -36,7 +36,7 @@ end
 # ==[ Options ]==
 
 OptionParser.new.instance_eval do
-  @version = "1.5.0"
+  @version = "1.5.1"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -46,7 +46,7 @@ OptionParser.new.instance_eval do
   on "-c", "--columns"                , "Display column names and quit"
   on "-d", "--dump"                   , "Dump database schema and quit"
   on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
-  on "-H", "--no-headers"             , "Do not show headers when exporting delimited files"
+  on "-H", "--headerless"             , "Do not show headers when exporting delimited files"
   on "-n", "--natural"                , "Sort naturally, not numerically"
   on "-s", "--show <count>"           , "Show this many values", Integer
   on "-t", "--tables"                 , "Display table names and quit"
@@ -65,13 +65,13 @@ xpsv = opts[:psv]
 xtsv = opts[:tsv]
 xprt = xcsv || xpsv || xtsv and require "censive"
 
-asky = opts[:ascii       ] and require "any_ascii"
-dump = opts[:dump        ]
-want = opts[:extract     ].to_s.downcase.split(",")
-natu = opts[:natural     ]
-show = opts[:show        ]
-hide = opts[:"no-headers"]
-filt = opts[:where       ] and filt = "\nwhere\n  #{filt}"
+asky = opts[:ascii     ] and require "any_ascii"
+dump = opts[:dump      ]
+want = opts[:extract   ].to_s.downcase.split(",")
+natu = opts[:natural   ]
+show = opts[:show      ]
+hide = opts[:headerless]
+filt = opts[:where     ] and filt = "\nwhere\n  #{filt}"
 
 dbas ||= ARGV.shift or abort "no database given"
 tabl ||= ARGV.shift or opts[:tables] or !want.empty? or abort "no table given"

data/bin/slyce3

@@ -49,13 +49,17 @@ end
 # ==[ Options ]==
 
 OptionParser.new.instance_eval do
-  @version = "1.5.0"
+  @version = "1.5.1"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
+  on       "--csv"                    , "Output comma separated values"
+  on       "--psv"                    , "Output pipe separated values"
+  on       "--tsv"                    , "Output tab separated values"
+  on "-a", "--ascii"                  , "Convert data to ASCII using AnyAscii"
   on "-c", "--columns"                , "Display column names and quit"
   on "-d", "--delete"                 , "Delete the .slyce database first"
   on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
-  on "-k", "--keep"                   , "For CSV files, keep the .slyce database for reuse"
+  on "-H", "--headerless"             , "Do not show headers when exporting delimited files"
   on "-n", "--natural"                , "Sort naturally, not numerically"
   on "-r", "--regexp <path>"          , "Path to the sqlean/regexp extension"
   on "-s", "--show <count>"           , "Show this many values", Integer
@@ -69,13 +73,20 @@ end.parse!(into: opts={}) rescue abort($!.message)
 dbas = nil
 tabl = nil
 
-nuke = opts[:delete  ]
-want = opts[:extract ].to_s.downcase.split(",")
-keep = opts[:keep    ]
-natu = opts[:natural ]
-regx = opts[:regexp  ] || Dir["{.,sqlean,#{ENV['HOME']}}/regexp.{dll,dylib,so}"].first
-show = opts[:show    ]
-filt = opts[:where   ] and filt = "\nwhere\n  #{filt}"
+xcsv = opts[:csv]
+xpsv = opts[:psv]
+xtsv = opts[:tsv]
+xprt = xcsv || xpsv || xtsv and require "censive"
+
+asky = opts[:ascii     ] and require "any_ascii"
+nuke = opts[:delete    ]
+want = opts[:extract   ].to_s.downcase.split(",")
+keep = opts[:keep      ]
+natu = opts[:natural   ]
+regx = opts[:regexp    ] || Dir["{.,sqlean,#{ENV['HOME']}}/regexp.{dll,dylib,so}"].first
+show = opts[:show      ]
+hide = opts[:headerless]
+filt = opts[:where     ] and filt = "\nwhere\n  #{filt}"
 
 # ensure regexp extension is available
 regx && File.exist?(regx) or abort "no regexp extension found#{regx ? " at '#{regx}'" : ''}"
@@ -90,8 +101,9 @@ when /(\.csv)$/, "/dev/stdin", "-"
   file = $1 ? dbas : "-"
   dbas = ".slyce"
   tabl = "csv"
+  head = " |head -1" if opts[:columns]
   `rm -f "#{dbas}"` if File.exist?(dbas) && !keep
-  `sqlite3 -csv '#{dbas}' ".import '|cat #{file}' '#{tabl}'"`
+  `sqlite3 -csv '#{dbas}' ".import '|cat #{file}#{head}' '#{tabl}'"`
 else
   tabl ||= ARGV.shift or abort "no table given"
 end
@@ -112,6 +124,30 @@ if want.empty?
   abort "no columns are selected"
 end
 
+# handle exports
+if xprt
+  list = want.map {|item| %{"#{item}"} }.join(", ")
+  limt = show ? "limit #{show}" : ""
+  data = conn.sql(<<~"".rstrip).to_a
+    select
+      #{list}
+    from
+      "#{tabl}"
+    #{filt}
+    #{limt}
+
+  seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
+
+  Censive.write(sep: seps) do |csv|
+    csv << want unless hide
+    data.each do |row|
+      csv << row.map {|e| asky ? AnyAscii.transliterate(e.to_s) : e.to_s }
+    end
+  end
+
+  exit
+end
+
 want.each do |name|
   sort = natu ? "" : "cnt desc,"
   limt = show ? "limit #{show}" : ""

data/bin/slyced

@@ -38,7 +38,7 @@ end
 # ==[ Options ]==
 
 OptionParser.new.instance_eval do
-  @version = "1.5.0"
+  @version = "1.5.1"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -47,7 +47,7 @@ OptionParser.new.instance_eval do
   on "-a", "--ascii"                  , "Convert data to ASCII using AnyAscii"
   on "-c", "--columns"                , "Display column names and quit"
   on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
-  on "-H", "--no-headers"             , "Do not show headers when exporting delimited files"
+  on "-H", "--headerless"             , "Do not show headers when exporting delimited files"
   on "-n", "--natural"                , "Sort naturally, not numerically"
   on "-s", "--show <count>"           , "Show this many values", Integer
   on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{@version}"; end
@@ -65,12 +65,12 @@ xpsv = opts[:psv]
 xtsv = opts[:tsv]
 xprt = xcsv || xpsv || xtsv and require "censive"
 
-asky = opts[:ascii       ] and require "any_ascii"
-want = opts[:extract]    .to_s.downcase.split(",")
-natu = opts[:natural     ]
-show = opts[:show        ]
-hide = opts[:"no-headers"]
-filt = opts[:where       ] and filt = "\nwhere\n  #{filt}"
+asky = opts[:ascii     ] and require "any_ascii"
+want = opts[:extract   ].to_s.downcase.split(",")
+natu = opts[:natural   ]
+show = opts[:show      ]
+hide = opts[:headerless]
+filt = opts[:where     ] and filt = "\nwhere\n  #{filt}"
 
 dbas ||= ARGV.shift or abort "no database given"
 tabl ||= ARGV.shift or abort "no table given"
@@ -80,7 +80,7 @@ tabl ||= ARGV.shift or abort "no table given"
 # ==[ Let 'er rip! ]==
 
 conn = DuckDB::Database.open(dbas).connect
-resu = conn.query(<<~end)
+resu = conn.sql(<<~end)
   select column_name
   from   information_schema.columns
   where  table_name='#{tabl}'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-17 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: any_ascii