sqlbible 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '095b3bc9b6735cd1df572c88d96117b96a60ebfc2bd928c01d8ef1bf5b2c5881'
-  data.tar.gz: 2c9cd72e62e96e81bb210e1416c660e974a24fc17018edc8165b383c74e73083
+  metadata.gz: b8eddf93d395b8029d0de33f4f87e68c719612675e808aa135d583e7d5448f95
+  data.tar.gz: 5ecefd2dff29958e4dd5714a1f07385508478c05381bbed70d12317d3392cae5
 SHA512:
-  metadata.gz: c7abadece71c1c11a3fddf7d5949e78c507ca6b74d309030d15cdd840329b08fb40af572440e3fa36430604e66ad95e952e2e46b4f3305495c5031384a869ddc
-  data.tar.gz: 7c568ebde272045cba9b9f8b2a23a06d2d1b8ee381ca3abeb853e7b123beaeb1598ab6323ac485e8b59d5330545e9350189975f3c11d5092a97271c480f005eb
+  metadata.gz: 9ad3995f53208bab47b42b75007661f849664855665e066a154cc271891dc195b6aca2057d529839e86309e8da9df39300e3519eecbebe2cad50fb374d1772d6
+  data.tar.gz: e5b669d1610f13f753106e2dba8f530e8b715f4456eafcca974475109fe99ce80a696d6fe0fd948064dcf5e70399f04bd5b6d9ea0a85aae752635cad9b2ddc74

data/bin/sqlbible

@@ -7,21 +7,21 @@ require 'scripref'
 require 'sqlbible'
 
 result = OptimistXL.options do
-  synopsis 'Usage: sqlbible [options] [<command> [suboptions] <filename>]'
+  synopsis 'Usage: sqlbible <command> [options] [filename]?'
   subcmd :convert, 'Convert a bible from OSIS-XML to Sqlbible format' do
-    opt :name, 'Name of the converted bible module or output filename of the generated .sqlbible file', type: String, required: true
+    opt :bible, 'Name of the converted bible module or output filename of the generated .sqlbible file', type: String, required: true
     opt :overwrite, 'Overwrite existing module or output file if exist', type: :Boolean, default: false
   end
   subcmd :list, 'Show a list of the names of the bibles in central directory'
   subcmd :search, 'Search with regular expressions' do
-    opt :name, 'Name of the bible module filename of an .sqlbible file', type: String
+    opt :bible, 'Name of the bible module filename of an .sqlbible file', type: String
     opt :search, 'Regular expression to search (multiple allowed)', type: String, multi: true, required: true
     opt :lang, 'Language for parsing and formatting scripture references', type: String, permitted: %w(de en), default: 'en'
     opt :output, 'Output filename', type: String
     opt :range, 'Search range, example: "John 1-10"', type: String
   end
   subcmd :text, 'Show text of references' do
-    opt :name, 'Name of the bible module filename of an .sqlbible file', type: String
+    opt :bible, 'Name of the bible module filename of an .sqlbible file', type: String
     opt :lang, 'Language for parsing and formatting scripture references', type: String, permitted: %w(de en), default: 'en'
     opt :output, 'Output filename', type: String
     opt :reference, 'Reference to show, example: "John 3:16; 10:27-30"', type: String, required: true
@@ -42,7 +42,7 @@ end
 
 def determine_out subopts
   if fn = subopts[:output]
-    out = File.open(opts[:output], 'w')
+    out = File.open(fn, 'w')
   else
     out = $stdout
   end
@@ -62,7 +62,7 @@ when 'convert'
     $stderr.puts 'no filename given'
     exit 1
   end
-  sqlbible_fn = Sqlbible.resolve_db_filename(subopts[:name])
+  sqlbible_fn = Sqlbible.resolve_db_filename(subopts[:bible])
   if !subopts[:overwrite] && File.exist?(sqlbible_fn)
     $stderr.puts format('file %s exist, conversion aborted', sqlbible_fn)
     exit 1
@@ -89,7 +89,7 @@ when 'search'
     range = nil
   end
   out = determine_out(subopts)
-  bible = Sqlbible.new(subopts[:name])
+  bible = Sqlbible.new(subopts[:bible])
   regexes = searches.map {|s| Regexp.new(s)}
   f = Scripref::Formatter.new(lang_mod, bookformat: :abbrev)
   bible.search(regexes, range: range).each do |v|
@@ -100,7 +100,7 @@ when 'text'
   p = Scripref::Parser.new(lang_mod)
   f = Scripref::Formatter.new(lang_mod, bookformat: :abbrev)
   ref = p.parse(subopts[:reference])
-  bible = Sqlbible.new(subopts[:name])
+  bible = Sqlbible.new(subopts[:bible])
   out = determine_out subopts
   bible.reference(ref).flatten.each do |v|
     out.puts format_verse(f, v)

data/lib/sqlbible/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 class Sqlbible
-  VERSION = '1.3.0'
+  VERSION = '1.3.2'
 end

data/lib/sqlbible.rb

@@ -85,9 +85,7 @@ class Sqlbible
 
     # Get a list of the names of the bibles in bibles_dir
     def bible_names
-      Dir.chdir bibles_dir do
-        Dir['*.sqlbible'].map {|fn| fn.sub(/\.sqlbible$/, '')}.sort
-      end
+      Dir[File.join(bibles_dir, '*.sqlbible')].map {|fn| File.basename(fn, '.sqlbible')}.sort
     end
 
     # Get an array of the major and minor version of the database schema of the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlbible
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 original_platform: ''
 authors:
 - Jan Friedrich
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri