dba 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a165d5ff98a815002bea9e1d54744639aba99bb1e678d66afe8743ffcb2fe30
-  data.tar.gz: dadb161b89dde586047a0a8b6aded72be9499db6c48a27c2e9c57c7172a9c1a9
+  metadata.gz: 6d8a51736a883e5fa3608fd0429dbf3a819f2903a2da62d1df26d234952c899d
+  data.tar.gz: bcdb786558aab8e9235324eeb06e073bff126c73abd680213f030d8560cc5306
 SHA512:
-  metadata.gz: 5f8033d0911e384525fb846228840d4ff5c7527df5c5e0d64fedc6fc158e6e809b5d88ab57483592954e8313961cd23696ae030efe97b7f06a342bfbd40c8c7e
-  data.tar.gz: 461b1d4e5eb81151aa5350c2f09362da3d6a31a42c959edb48a5dbd97206a239c3f6b4ad8e166e4185df2e6569f63445443af30a41d1064f9679c8dae7aa2a0f
+  metadata.gz: 5fefa4be5caa1d897e9a3e330b6535351f5f503cc4b351e37cf8a7ef8b30f93555491bf5c09836c8b43f13c503d3783bb7e9173a2a4c2ca696bc8b5b1c903379
+  data.tar.gz: c6aea9949fe0b38718bee070cc3772b57b1ecb060b89c6fd497baa27dc30a0b2ed0edbc9b51157d8373ca057fbd85cb0a858f7f7665b3ba94bb99bcee095cc83

data/CHANGES.md

@@ -1,3 +1,12 @@
+# 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.1.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,16 @@ 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)
+    YAML.load(ERB.new(File.read(database_config_path)).result)
   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/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-2022 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.1.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2022-10-06 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.3.7
 signing_key:
 specification_version: 4
 summary: See description