slyce 0.9.7 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 380c2147a52bd30761850468c1a06b6f041523d66ed513912a0756a51d80d7d5
-  data.tar.gz: 1f306e010169260bc76a5bfb7200d2c9c0ca87ca76fc27b143b9e61e6310ef14
+  metadata.gz: 3e12e5c9ffea5f786419c30b2cca3fc8a7dacf2f3a389e28f30b23595a813574
+  data.tar.gz: 8f25aeac74b908508787b68ad352948e6aed14cbd35d3efa67e9a34aed4fb350
 SHA512:
-  metadata.gz: 33369805c3929785f1709b567484d35ceaeb2d0502c5db8db8c1a26ea50e31f43dd39d48f6ac605e4cf294e8ea727fa3f9c5977091c3c48e25c68a4080c6e444
-  data.tar.gz: ef9ca1f35c4f6c172f231b9609fc72968e393ffbf45005973a4918e293af59ca53d82dbd8d7788f829a783213c70a020b88640939c64fbc1db5395659272507e
+  metadata.gz: 7182a32b9b2734f8813e6741ea562333f78809607c708b4bd08e08ed16df29a737f1966cbbec0e26b50ae12c818a0bfef5651757d0b08ec3d2890e90d10c1149
+  data.tar.gz: 7563b2004ca166a364de70fa42a20739c4f9f1e26f39ccc22cf0cf7d2ae81111c67adbec2c59f1afeb379549ee50689f2f21527ce5327b0e2dd32b6fa743fcbb

data/bin/slyce

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-VERSION="0.9.7"
+VERSION="0.9.9"
 
 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(",")
 
@@ -57,7 +57,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 +78,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 +95,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.7"
+VERSION="0.9.9"
 
 STDOUT.sync = true
 
@@ -24,20 +24,20 @@ 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}"
+natu = opts[:natural]
 regx = opts[:regexp] || Dir["{,sqlean}/regexp.{dll,dylib,so}"].first
 show = opts[:show]
 want = opts[:extract].to_s.downcase.split(",")
@@ -70,7 +70,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 +91,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 +109,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,5 +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 "mysql2", "~> 0.5"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.9
 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
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement