slyce 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87533fb98af597c5c0db5ee86c5bf43bd036d48c135dcd670308f470abd0d9e6
-  data.tar.gz: 23a914d5c339f06b5713633ab7d51997617957a4188e745effbd2e909fc192ff
+  metadata.gz: 1327a9e50802b5e802b1be542681b0c7d051d13e2fd354f20dd12a28b46c14c0
+  data.tar.gz: cf79a752ce4346d7a0d3a5756ec564e92b512ad454d7e567c89757575c0d334e
 SHA512:
-  metadata.gz: 2cb87eb5c536252a3ea0a393850fac9851738965d3aeb15f70be67a6be24655d8b0168ab1c718c86457293f182ef468a4e286364b71a9a1761968d88aaf567d5
-  data.tar.gz: c7c5e8211890e4c3b9a5606dab94f22a9db2c266d1090e89b07b64f429d15539e790c4431a3d4833ed8f9d6449d26a83d7421e0330e2f97382ed83cc70ccee30
+  metadata.gz: eeaf579fd814d9db6c1120ec2cab9291acad26a14d8c30bbca3585c173b05909e25812c84af2f3524586baba162e0c71429300aff49d5a912444c96a8dbf4fc7
+  data.tar.gz: abfcf38eeac61002eefe660ff95fabfeadf7439aa60beb33908ac95c2bbd1b1375ceeeb954b4bdaa08a4687a5b2f8f4b316757e9fb78e8fd27a79723277124a4

data/bin/slyce

@@ -11,7 +11,7 @@ dbas = nil
 tabl = nil
 
 OptionParser.new.instance_eval do
-  @version = "1.2.5"
+  @version = "1.3.0"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -75,10 +75,29 @@ end
 
 # ==[ Let 'er rip! ]==
 
-conn = Mysql2::Client.new(database: dbas, as: :array)
+if dbas.include?("/")
+  dbas = $' if dbas =~ %r|^mysql://| # drop mysql:// prefix, if present
+  auth, dbas = dbas.split("/", 2)
+  if auth =~ /^(?:(\w+)(?::([^@]+))?@)?(?:([^:]+)?(?::(\d+))?)$/
+    user, pass, host, port = $1, $2, $3, $4 # user:pass@host:port
+    conf = {
+      database: dbas,
+      username: $1,
+      password: $2,
+      host:     $3,
+      port:     $4,
+    }.compact
+  else
+    abort "invalid database value #{dbas.inspect}"
+  end
+else
+  conf = { database: dbas }
+end
+
+conn = Mysql2::Client.new(**conf, as: :array)
 resu = conn.query("select * from `#{tabl}` limit 0")
 cols = resu.fields
-want = want.empty? ? cols : want & cols
+want = want.empty? ? cols : want.select {|e| cols.include?(e) }
 
 if opts[:columns]
   puts cols
@@ -102,7 +121,7 @@ if xprt
 
   seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
 
-  Censive.writer(sep: seps) do |csv|
+  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 }
@@ -112,6 +131,11 @@ if xprt
   exit
 end
 
+# MySQL 5.7 compatible version (still need to find replacement for regexp_instr)
+# -if((`#{name}` rlike '^[-+]?((0|([1-9]\\\\d*)(\\\\.\\\\d*)?)|((0|([1-9]\\\\d*))\\\\.\\\\d+))$'), `#{name}` + 0, null) desc,
+# -if((`#{name}` rlike '^0\\\\d+$'), length(`#{name}`), null) desc,
+# -if((`#{name}` rlike '^\\\\d'), regexp_instr(`#{name}`, '[^\\\\d]'), null) desc,
+
 want.each do |name|
   sort = natu ? "" : "cnt desc,"
   stmt = show ? "limit #{show}" : ""

data/bin/slyced

@@ -11,7 +11,7 @@ dbas = nil
 tabl = nil
 
 OptionParser.new.instance_eval do
-  @version = "1.2.5"
+  @version = "1.3.0"
   @banner  = "usage: #{program_name} [options] <database> <table>"
 
   on       "--csv"                    , "Output comma separated values"
@@ -83,7 +83,7 @@ resu = conn.query(<<~end)
   order  by ordinal_position
 end
 cols = resu.to_a.flatten
-want = want.empty? ? cols : want & cols
+want = want.empty? ? cols : want.select {|e| cols.include?(e) }
 
 if opts[:columns]
   puts cols
@@ -107,7 +107,7 @@ if xprt
 
   seps = xcsv ? "," : xtsv ? "\t" : xpsv ? "|" : abort("unknown separator #{seps.inspect}")
 
-  Censive.writer(sep: seps) do |csv|
+  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 }

data/slyce.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   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 "censive", "~> 1.0.3"
+  s.add_runtime_dependency "censive", "~> 1.1.0"
   s.add_runtime_dependency "duckdb", "~> 0.8.0"
   s.add_runtime_dependency "extralite-bundle", "~> 1.25"
   s.add_runtime_dependency "mysql2", "~> 0.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slyce
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: any_ascii
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: duckdb
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Ruby utility to show data statistics for MySQL databases