sqlbible 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683a8988da2881cbfa8ab92eaad608d55f0c616c6ea77969fa018f41efb1adb7
-  data.tar.gz: 3b1db7c4d26616d9a1096f9086cc17379e489fa21fa96ad5c2f7c9e8d1c170c7
+  metadata.gz: 9766fb43d793d07864c2de0ddbc6df73883f6d606498776e0f4c323e75440618
+  data.tar.gz: 906e690a19110464e8e2a42511eadc1e29eefc7b0fcd216e8fc7d999f2fa1706
 SHA512:
-  metadata.gz: e58320e7522c21546bdc46fc11dd1313aafab31b88bcf3a82d23dcfec73e8c77ddc7863963795737769813f4bfad94c388c574c1db69c16645d77c5c76b4d6d6
-  data.tar.gz: 021e848f7a346d6c06ba2abe14409479ca2ed6006c846ada3b7dc34d3e82d78c60d3feff73a5edaaf403165a8f328b2770f94e6248fd4060c244e6224c2e5e22
+  metadata.gz: ace4dd9751b380f6b61f95ad16b9929f6a0f88e141ebd6c3c19e35a2b8e0b4d8720383a79048c70c2de6b4a8f2fe9c109e090ba5d9c4fccaebe3afc101d3c9e4
+  data.tar.gz: 4fed2ba4ad46cd2bc47a017c2a1b8c6c13b086cf77c8467f16cbcbd0551a652f21b0e68252913d647a6a1e943de34d6cef0c96df47b0e6f268b950d3839bd19e

data/bin/sqlbible

@@ -7,7 +7,7 @@ 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 :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
@@ -54,55 +54,60 @@ end
 
 subopts = result.subcommand_options
 
-case result.subcommand
-when 'convert'
-  require 'fileutils'
-  require 'sqlbible/convert'
-  unless osis_fn = result.leftovers.first
-    $stderr.puts 'no filename given'
-    exit 1
-  end
-  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
-  end
-  unless File.exist?(dir = Sqlbible.bibles_dir)
-    puts format('create directory %s', dir)
-    FileUtils.mkdir_p dir
-  end
-  if $stdout.tty?
-    puts "convert #{osis_fn} to #{sqlbible_fn} ..."
-  end
-  Sqlbible.convert osis_fn, sqlbible_fn
-  exit
-when 'list'
-  puts 'Available bible names:'
-  puts Sqlbible.bible_names.join("\n")
-when 'search'
-  searches = subopts[:search]
-  lang_mod = determine_lang_mod(subopts)
-  if r = subopts[:range]
+begin
+  case result.subcommand
+  when 'convert'
+    require 'fileutils'
+    require 'sqlbible/convert'
+    unless osis_fn = result.leftovers.first
+      $stderr.puts 'no filename given'
+      exit 1
+    end
+    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
+    end
+    unless File.exist?(dir = Sqlbible.bibles_dir)
+      puts format('create directory %s', dir)
+      FileUtils.mkdir_p dir
+    end
+    if $stdout.tty?
+      puts "convert #{osis_fn} to #{sqlbible_fn} ..."
+    end
+    Sqlbible.convert osis_fn, sqlbible_fn
+    exit
+  when 'list'
+    puts 'Available bible names:'
+    puts Sqlbible.bible_names.join("\n")
+  when 'search'
+    searches = subopts[:search]
+    lang_mod = determine_lang_mod(subopts)
+    if r = subopts[:range]
+      p = Scripref::Parser.new(lang_mod)
+      range = p.parse(r)
+    else
+      range = nil
+    end
+    out = determine_out(subopts)
+    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|
+      out.puts format_verse(f, v)
+    end
+  when 'text'
+    lang_mod = determine_lang_mod(subopts)
     p = Scripref::Parser.new(lang_mod)
-    range = p.parse(r)
-  else
-    range = nil
-  end
-  out = determine_out(subopts)
-  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|
-    out.puts format_verse(f, v)
-  end
-when 'text'
-  lang_mod = determine_lang_mod(subopts)
-  p = Scripref::Parser.new(lang_mod)
-  f = Scripref::Formatter.new(lang_mod, bookformat: :abbrev)
-  ref = p.parse(subopts[:reference])
-  bible = Sqlbible.new(subopts[:bible])
-  out = determine_out subopts
-  bible.reference(ref).flatten.each do |v|
-    out.puts format_verse(f, v)
+    f = Scripref::Formatter.new(lang_mod, bookformat: :abbrev)
+    ref = p.parse(subopts[:reference])
+    bible = Sqlbible.new(subopts[:bible])
+    out = determine_out subopts
+    bible.reference(ref).flatten.each do |v|
+      out.puts format_verse(f, v)
+    end
   end
+rescue Exception => e
+  $stderr.puts e.message
+  exit 1
 end

data/lib/sqlbible/version.rb

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

data/lib/sqlbible.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
+require 'did_you_mean'
 require 'scripref'
 require 'sqlite3'
 
@@ -85,9 +86,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
@@ -114,11 +113,21 @@ class Sqlbible
     end
 
     def resolve_db_filename db_name
-      fn = db_name.to_s
-      if File.basename(fn) == fn
-        File.join(bibles_dir, format('%s.sqlbible', fn.sub(/\.sqlbible$/, '')))
-      else
+      db_name = db_name.to_s
+      if File.basename(db_name, '.sqlbible') == db_name
+        fn = File.join(bibles_dir, format('%s.sqlbible', db_name))
+        unless bible_names.include?(db_name)
+          msg = format('database %s not found, file %s does not exist', db_name, fn)
+          sc = DidYouMean::SpellChecker.new(dictionary: bible_names)
+          res = sc.correct(db_name)
+          unless res.empty?
+            msg = format("%s\ndid you mean %s", msg, res.join(', '))
+          end
+          fail ArgumentError, msg
+        end
         fn
+      else
+        db_name
       end
     end
 

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: sqlbible
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
-original_platform: ''
 authors:
 - Jan Friedrich
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: did_you_mean
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.0.dev
+rubygems_version: 3.6.1
 specification_version: 4
 summary: Library for bibles as SQLite databases
 test_files: []