dba 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a165d5ff98a815002bea9e1d54744639aba99bb1e678d66afe8743ffcb2fe30
-  data.tar.gz: dadb161b89dde586047a0a8b6aded72be9499db6c48a27c2e9c57c7172a9c1a9
+  metadata.gz: ff91c96a26c84120b2294eaceafbc9cd97d50ae7b8138ed08657efe355fe905b
+  data.tar.gz: 1e25615aea3aab8f5820f790d038363ea2854488e950d3925e48953d1055006c
 SHA512:
-  metadata.gz: 5f8033d0911e384525fb846228840d4ff5c7527df5c5e0d64fedc6fc158e6e809b5d88ab57483592954e8313961cd23696ae030efe97b7f06a342bfbd40c8c7e
-  data.tar.gz: 461b1d4e5eb81151aa5350c2f09362da3d6a31a42c959edb48a5dbd97206a239c3f6b4ad8e166e4185df2e6569f63445443af30a41d1064f9679c8dae7aa2a0f
+  metadata.gz: b77b8fe626319fe20ac77cb31bb5bd2ed349438ea76ef6472b7367e22a804d1027a99744bde3ad2e32e7104f88a52b125a49f32c40223095281f648f150c8f64
+  data.tar.gz: 21d2f2a661aacc27375c7e9031c1057471ca627f0fb1bcb2c47dc051096e9d15d507d186854bb2fbac2b9851ba63ef2c807d7f91814ecd9490c564c6e073bdf1

data/CHANGES.md

@@ -1,3 +1,19 @@
+# 2.2.0
+
+* Fixed compatibility with psych 4+
+
+* The sample command now excludes nil/null values
+
+
+# 2.1.0
+
+* Fixed arity check for commands with optional arguments
+
+* Added support for .jsonl extension to dump and load commands
+
+* Added support for .ndjson extension to dump and load commands
+
+
 # 2.0.0
 
 * **Required ruby version is now 2.5.0**

data/dba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'dba'
-  s.version = '2.0.0'
+  s.version = '2.2.0'
   s.license = 'GPL-3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']

data/lib/dba/command.rb

@@ -1,4 +1,16 @@
 class DBA::Command
+  def self.arity_check(args)
+    parameters = instance_method(:call).parameters
+
+    required, optional = parameters.partition { |(type, name)| type == :req }
+
+    expected = optional.empty? ? required.size : (required.size .. required.size + optional.size)
+
+    unless expected === args.size
+      raise DBA::Error, "incorrect number of arguments (given #{args.size}, expected #{expected})"
+    end
+  end
+
   def initialize(database)
     self.database = database
   end

data/lib/dba/database.rb

@@ -64,12 +64,22 @@ module DBA::Database
     File.exist?('.env')
   end
 
+  def database_config_path
+    File.join('config', 'database.yml')
+  end
+
   def database_config?
-    File.exist?('config/database.yml')
+    File.exist?(database_config_path)
   end
 
   def database_config
-    YAML.load(ERB.new(File.read('config/database.yml')).result)
+    source = ERB.new(File.read(database_config_path)).result
+
+    if YAML.respond_to?(:unsafe_load)
+      YAML.unsafe_load(source)
+    else
+      YAML.load(source)
+    end
   end
 
   def development_database_args

data/lib/dba/dump.rb

@@ -3,7 +3,9 @@
 class DBA::Dump < DBA::Command
   ADAPTERS = {
     'csv' => :CSV,
+    'jsonl' => :LDJSON,
     'ldjson' => :LDJSON,
+    'ndjson' => :LDJSON,
     'yml' => :YAML,
     'yaml' => :YAML
   }

data/lib/dba/load.rb

@@ -3,7 +3,9 @@
 class DBA::Load < DBA::Command
   ADAPTERS = {
     '.csv' => :CSV,
+    '.jsonl' => :LDJSON,
     '.ldjson' => :LDJSON,
+    '.ndjson' => :LDJSON,
     '.yml' => :YAML,
     '.yaml' => :YAML
   }
@@ -26,7 +28,7 @@ class DBA::Load < DBA::Command
 
   def file_list(path)
     if File.directory?(path)
-      Dir.glob(File.join(path, '*.{csv,ldjson,yml,yaml}'))
+      Dir.glob(File.join(path, '*.{csv,jsonl,ldjson,ndjson,yml,yaml}'))
     else
       [path]
     end

data/lib/dba/sample.rb

@@ -5,7 +5,7 @@ class DBA::Sample < DBA::Command
     column_name = column.to_sym if column
 
     if column_name
-      dataset = database[table_name].distinct.select(column_name)
+      dataset = database[table_name].exclude(column_name => nil).distinct.select(column_name)
       dataset.from_self.order(random_function).limit(20).each do |row|
         puts row[column_name]
       end

data/lib/dba/shell.rb

@@ -16,11 +16,7 @@ module DBA::Shell
 
     command = DBA.const_get(command)
 
-    arity = command.instance_method(:call).arity
-
-    if arity >= 0 && args.size != arity
-      raise DBA::Error, "incorrect number of args (given #{args.size}, expected #{arity})"
-    end
+    command.arity_check(args)
 
     database = DBA::Database.connect
 

data/lib/dba.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021 TIMCRAFT
+# Copyright (c) 2019-2024 TIMCRAFT
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dba
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: See description