slyce 0.9.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4b3343260618e644b563f9b03b2817796a8439727c753dacf59a93e11bd04af
-  data.tar.gz: 5b9d02e5e596ccf9b32d54f54bd35cb79b86242c9ab1924a46f79cfdd4efb12f
+  metadata.gz: 36daa71deee82e19314bc1df0caedb1bc6b4a2b8f0bf524a471f48fcf28c1fb7
+  data.tar.gz: 71c450033ed16659bcb206e6023dc92f9cf448736355385101d051f9c7cfebc4
 SHA512:
-  metadata.gz: a942b4899789d36ee3a65afbdd4f38308e3438d46a1bdab18a99af94ed2cae00de3ffb282e2ec22eaaf14d341909c623085fa7bf0273753b4bcd915613812235
-  data.tar.gz: 59397e8e24245ea8a42030721911c3dc20011d54d67f0b680b96db16154d95d98897705a166339bdf8fc495828b9f25da5a8a0fc8c51caa101b674cd0633eadc
+  metadata.gz: a621fa8b4369fe27d5edc33573b0fe1f59312c7e97564a2c146517bebb3481b1633ffb9444cd494a97890efb0d8fa57f3885281e4c6d281821c6219376f1ee86
+  data.tar.gz: aa98ed93dfc2e762b4e39fbe1d70d5f09c00d47ed5021511dc5811fbb826c97d121f7719a196677b60351f0fc5152f1efcc7a1984140b0be758dab6253cab38d

data/bin/slyce

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-VERSION="0.9.8"
+VERSION="1.0.0"
 
 STDOUT.sync = true
 
@@ -15,19 +15,19 @@ tabl = nil
 OptionParser.new.instance_eval do
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
-  on "-a", "--alpha"                  , "Sort alphabetically, not numerically"
   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 "-w", "--where <cond>"           , "Filter rows (eg - 'age=33,Name=/[BW]ill/i,color=\"\"'"
+  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)
 
-abcd = opts[:alpha]
 filt = opts[:where] and filt = "where\n  #{filt}"
+natu = opts[:natural]
 show = opts[:show]
 want = opts[:extract].to_s.downcase.split(",")
 
@@ -37,9 +37,7 @@ tabl ||= ARGV.shift or abort "no table given"
 # ==[ Helpers ]==
 
 class Mysql2::Client
-  def sql(...)
-    query(...)
-  end
+  alias_method :sql, :query
 
   def sql!(stmt, *args, **, &)
     puts "\n==[ SQL statement ]==\n\n", stmt.strip, ";"
@@ -57,7 +55,7 @@ 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, rows, rows] if show
+  puts "%*d shown (top %d)" % [wide, seen, rows] if show
   puts "%*d total (all %d)" % [wide, tots, uniq]
 end
 
@@ -78,7 +76,7 @@ if want.empty?
 end
 
 want.each do |name|
-  sort = abcd ? "" : "cnt desc,"
+  sort = natu ? "" : "cnt desc,"
   stmt = show ? "limit #{show}" : ""
   data = conn.sql(<<~"" + stmt).to_a
     select
@@ -95,15 +93,9 @@ want.each do |name|
       -if(regexp_like(`#{name}`, '^\\\\d'), regexp_instr(`#{name}`, '[^\\\\d]'), null) desc,
       `#{name}` is null, `#{name}`
 
-  uniq = conn.sql(<<~"").to_a[0][0]
-    select
-      count(distinct(ifnull(`#{name}`,0)))
-    from
-      `#{tabl}`
-    #{filt}
-
-  tots = conn.sql(<<~"").to_a[0][0]
+  uniq, tots = conn.sql(<<~"").to_a[0]
     select
+      count(distinct(ifnull(`#{name}`,0))),
       count(ifnull(`#{name}`,0))
     from
       `#{tabl}`

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="0.9.8"
+VERSION="1.0.0"
 
 STDOUT.sync = true
 
@@ -24,21 +24,21 @@ tabl = nil
 OptionParser.new.instance_eval do
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
-  on "-a", "--alpha"                  , "Sort alphabetically, not numerically"
   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 "-r", "--regexp <path>"          , "Path to the sqlean/regexp extension"
   on "-s", "--show <count>"           , "Show this many values", Integer
   on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{VERSION}"; end
-  on "-w", "--where <cond>"           , "Filter rows (eg - 'age=33,Name=/[BW]ill/i,color=\"\"'"
+  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)
 
-abcd = opts[:alpha]
 filt = opts[:where] and filt = "where\n  #{filt}"
-regx = opts[:regexp] || Dir["{,sqlean}/regexp.{dll,dylib,so}"].first
+natu = opts[:natural]
+regx = opts[:regexp] || Dir["{.,sqlean}/regexp.{dll,dylib,so}"].first
 show = opts[:show]
 want = opts[:extract].to_s.downcase.split(",")
 
@@ -50,9 +50,7 @@ regx &&  File.exist?(regx) or abort "no regexp extension found#{regx ? " at '#{r
 # ==[ Helpers ]==
 
 class Extralite::Database
-  def sql(...)
-    query_ary(...)
-  end
+  alias_method :sql, :query_ary
 
   def sql!(stmt, *args, **, &)
     puts "\n==[ SQL statement ]==\n\n", stmt.strip, ";"
@@ -70,7 +68,7 @@ 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, rows, rows] if show
+  puts "%*d shown (top %d)" % [wide, seen, rows] if show
   puts "%*d total (all %d)" % [wide, tots, uniq]
 end
 
@@ -91,7 +89,7 @@ if want.empty?
 end
 
 want.each do |name|
-  sort = abcd ? "" : "cnt desc,"
+  sort = natu ? "" : "cnt desc,"
   stmt = show ? "limit #{show}" : ""
   data = conn.sql(<<~"" + stmt).to_a
     select
@@ -109,15 +107,9 @@ want.each do |name|
       `#{name}` is null, `#{name}`
     collate nocase
 
-  uniq = conn.sql(<<~"").to_a[0][0]
-    select
-      count(distinct(ifnull(`#{name}`,0)))
-    from
-      `#{tabl}`
-    #{filt}
-
-  tots = conn.sql(<<~"").to_a[0][0]
+  uniq, tots = conn.sql(<<~"").to_a[0]
     select
+      count(distinct(ifnull(`#{name}`,0))),
       count(ifnull(`#{name}`,0))
     from
       `#{tabl}`

data/slyce.gemspec

@@ -11,6 +11,6 @@ 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 "extralite-bundle", "~> 1.2.5"
+  s.add_runtime_dependency "extralite-bundle", "~> 1.25"
   s.add_runtime_dependency "mysql2", "~> 0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: extralite-bundle
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement