slyce 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5dcf804e2deb0adaff36f965561a0946e20ba4b0740d3a83ea064f09409f73a
-  data.tar.gz: 8975517f3e9ac589fac7117b37c652af7b8ec463e3abbc002cc7a2e0523494c9
+  metadata.gz: 6a2d1af8d0c1835beb4e57d013704dc791ac769a71ed1c507b1f1a39be4b2ace
+  data.tar.gz: 0eb2255e8effcb0a12a72cb3dc020ebe35943f73b181f511ec865e168604b699
 SHA512:
-  metadata.gz: 59a99719c5a7c7193753bdf34075d67db43906da64e984e629104be5d9d4906b42bb7c6bc21d62f835af56c053480c861699a589398759d4b6d0ff621a406171
-  data.tar.gz: 89bf5f7e16919e60e836c56da62460b1ff0760e7397fe579fdc61144d1492f3b0adb15423ae000c8a0a959a0fd0012ed8fd64fd9b0f4e82301d319b25bacaa8f
+  metadata.gz: 3c8c2e3ae1862d9a549a38f01fc2f438d736a85ff08f6a072e18894b93a8081317fa50293f382bbadd4b64ba21f8a37cbd3b0c383f8c2e0dfdb2cf16c966c49a
+  data.tar.gz: d3895d08a1c90e110906f29d74fd0623e715b933c1b5de7a369a8f47d149bc955e22e79ee17ebee0209dc429db6683535baed77dc59f874a91438309b1e17922

data/bin/slyce

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-VERSION="1.0.1"
-
 STDOUT.sync = true
 
 require "mysql2"
@@ -13,27 +11,42 @@ dbas = nil
 tabl = nil
 
 OptionParser.new.instance_eval do
+  @version = "1.1.0"
   @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 "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
   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
+  on "-r", "--rows <count>"           , "Rows of data to select", Integer
+  on "-s", "--suppress"               , "Suppress header when exporting delimited files"
+  on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{@version}"; end
   on "-w", "--where <cond>"           , "Where clause (eg - 'age>50 and state='AZ')"
   on "-x", "--extract <col1,col2,...>", "Comma separated list of columns to extract"
 
   self
 end.parse!(into: opts={}) rescue abort($!.message)
 
-filt = opts[:where] and filt = "where\n  #{filt}"
-natu = opts[:natural]
-show = opts[:show]
+xcsv = opts[:csv]
+xpsv = opts[:psv]
+xtsv = opts[:tsv]
+xprt = xcsv || xpsv || xtsv and require "censive"
+
+asky = opts[:ascii   ] and require "any_ascii"
+filt = opts[:where   ] and filt = "where\n  #{filt}"
+hide = opts[:suppress]
+natu = opts[:natural ]
+show = opts[:rows    ]
 want = opts[:extract].to_s.downcase.split(",")
 
 dbas ||= ARGV.shift or abort "no database given"
 tabl ||= ARGV.shift or abort "no table given"
 
+[xcsv, xpsv, xtsv].compact.size > 1 and abort "only one of csv, psv, or tsv allowed"
+
 # ==[ Helpers ]==
 
 class Mysql2::Client
@@ -55,8 +68,9 @@ def display(name, data, show, uniq, tots)
   puts "\n#{fill} #{name}\n#{fill} #{line}\n"
   data.each {|cnt, val| puts "%*d %s" % [wide, cnt, val || "NULL"] }
   puts "#{fill} -----\n"
-  puts "%*d shown (top %d)" % [wide, seen, rows] if show && rows > 1
-  puts "%*d total (all %d)" % [wide, tots, uniq]
+  puts "%*d shown (top %d)" % [wide, seen, rows] if     show && rows > 1
+  puts "%*d total (all %d)" % [wide, tots, uniq] if     uniq > 1
+  puts "%*d total"          % [wide, tots      ] unless uniq > 1
 end
 
 # ==[ Let 'er rip! ]==
@@ -75,6 +89,29 @@ if want.empty?
   abort "no columns are selected"
 end
 
+# handle exports
+if xprt
+  list = want.map {|item| "`#{item}`" }.join(", ")
+  stmt = show ? "limit #{show}" : ""
+  data = conn.sql(<<~"" + stmt).to_a
+    select
+      #{list}
+    from
+      `#{tabl}`
+    #{filt}
+
+  seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
+
+  Censive.writer(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,"
   stmt = show ? "limit #{show}" : ""

data/bin/slyce3

@@ -9,7 +9,7 @@
 #   wget https://github.com/nalgeon/sqlean/releases/download/0.19.3/sqlean-macos-arm64.zip
 #   unzip sqlean-macos-arm64.zip regexp.dylib
 
-VERSION="1.0.1"
+VERSION="1.0.2"
 
 STDOUT.sync = true
 
@@ -69,7 +69,8 @@ def display(name, data, show, uniq, tots)
   data.each {|cnt, val| puts "%*d %s" % [wide, cnt, val || "NULL"] }
   puts "#{fill} -----\n"
   puts "%*d shown (top %d)" % [wide, seen, rows] if show and rows > 1
-  puts "%*d total (all %d)" % [wide, tots, uniq]
+  puts "%*d total (all %d)" % [wide, tots, uniq] if     uniq > 1
+  puts "%*d total"          % [wide, tots      ] unless uniq > 1
 end
 
 # ==[ Let 'er rip! ]==

data/slyce.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "slyce"
-  s.version     = `grep '^VERSION' bin/slyce | cut -f 2 -d '"'`
+  s.version     = `grep -m 1 '^\s*@version' bin/slyce | cut -f 2 -d '"'`
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     =
@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.files       = `git ls-files`.split("\n") - %w[.gitignore]
   s.executables = `cd bin && git ls-files .`.split("\n")
+  s.add_runtime_dependency "any_ascii", "~> 0.3.2"
   s.add_runtime_dependency "extralite-bundle", "~> 1.25"
   s.add_runtime_dependency "mysql2", "~> 0.5"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-03-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: any_ascii
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: extralite-bundle
   requirement: !ruby/object:Gem::Requirement