sqlbible 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8eddf93d395b8029d0de33f4f87e68c719612675e808aa135d583e7d5448f95
-  data.tar.gz: 5ecefd2dff29958e4dd5714a1f07385508478c05381bbed70d12317d3392cae5
+  metadata.gz: 21260f096b6235ac423d8406a10afe1b83f39765585bb3788489877da458c7d5
+  data.tar.gz: 747c638f0ed836cf25995b7b58659c79501bacb0b5d1e8198e5ef29d6b1aeab1
 SHA512:
-  metadata.gz: 9ad3995f53208bab47b42b75007661f849664855665e066a154cc271891dc195b6aca2057d529839e86309e8da9df39300e3519eecbebe2cad50fb374d1772d6
-  data.tar.gz: e5b669d1610f13f753106e2dba8f530e8b715f4456eafcca974475109fe99ce80a696d6fe0fd948064dcf5e70399f04bd5b6d9ea0a85aae752635cad9b2ddc74
+  metadata.gz: a6ff9efb6a3d602bfde16a4824ef8b92fa4e19d6f71d7fac7c8e7d06365b66540f23026d4bd945c879563910734eb860b595ffc4e19faa0b9d7ed38f5e0658d7
+  data.tar.gz: f46ccb07c1abad4264d31fdf5189a1e0ec60f95a3649bf7b8234733662a59a45ca6e77b743622b89a217af54e5230e95bfba32b9984ce9c2a832df2b1326c52d

data/bin/sqlbible

@@ -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.2'
+  VERSION = '1.3.4'
 end

data/lib/sqlbible.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
+require 'did_you_mean'
 require 'scripref'
 require 'sqlite3'
 
@@ -11,10 +12,7 @@ class Sqlbible
   attr_reader :db_filename
 
   def initialize db_name
-    @db_filename = Sqlbible.resolve_db_filename(db_name)
-    unless File.exist? @db_filename
-      fail ArgumentError, format('database %s not found, file %s does not exist', db_name, @db_filename)
-    end
+    @db_filename = Sqlbible.resolve_db_filename(db_name, check_existence: true)
     @db = SQLite3::Database.new(@db_filename)
     @db.enable_load_extension(true)
     pcre_extension_file = ENV['SQLITE_PCRE_EXTENSION']
@@ -111,13 +109,26 @@ class Sqlbible
       select_schema_major_minor(db).join('.')
     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$/, '')))
+    def resolve_db_filename db_name, check_existence: false
+      db_name = db_name.to_s
+      if File.basename(db_name, '.sqlbible') == db_name
+        fn = File.join(bibles_dir, format('%s.sqlbible', db_name))
+        if check_existence && !File.exist?(fn)
+          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
       else
-        fn
+        fn = db_name
+        if check_existence && !File.exist?(fn)
+          fail ArgumentError, format('file %s does not exist', fn)
+        end
       end
+      fn
     end
 
   end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: sqlbible
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
-original_platform: ''
 authors:
 - Jan Friedrich
 bindir: bin
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2024-12-28 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.7.0.dev
 specification_version: 4
 summary: Library for bibles as SQLite databases
 test_files: []