sqlbible 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72978515d6a27e67112ec446a6445914dc71041dfd9cd0cd4e5f9b62c9fbc80f
-  data.tar.gz: ef2db40ffe61d3f87520420034094d633dd14569d1d11e827b3e0ef2e4896a35
+  metadata.gz: d56c3d8c24b77ebd196845f6337befa2be5ba09af57609ae81c970485882162a
+  data.tar.gz: 03f098e9b3df74b206b1a8a7ffd424b25c6cedca2440f63b21569f7983c0ba2c
 SHA512:
-  metadata.gz: 930dc1198d988f112623304f6651601e415860b0e24f3ef7cd4dc26be270605f7e8917a1f103fa14f76570e455863469bca4a49d44e9201f21fbc7eb8e0be38c
-  data.tar.gz: 32b6f1b61a08bb377104e24099a87a4ea69a2df30d3f2216460cc0b8760076ddb768c512b355b08d983774b253d005fab7d0f75c12fb0418347ebb2ac562e761
+  metadata.gz: eb289248fbf37ef0b2220939d20757d590186b8c0338beb76e5630f5d8cbd230ff4d37e472b2732d1082c13b11e0458fcdfd18bf14b63c0ed2a1c2652b8412be
+  data.tar.gz: 7bdc2c73f78526fadd9b568a3f22d421c64bfbacdae5e17e261dea9fdcf0045d48d4d33969d40c768f92afe7a26693daf0a416878ca3c3ce64f718ada47b2f11

data/README.md

@@ -42,6 +42,7 @@ See help of the command-line application:
 
 ```shell
 sqlbible -h
+sqlbible-convert -h
 ```
 
 ## Requirements

data/bin/sqlbible

@@ -2,7 +2,7 @@
 # encoding: utf-8
 # frozen_string_literal: false
 
-require 'optimist_xl'
+require 'optimist'
 require 'scripref'
 require 'sqlbible'
 require 'sqlbible/ansicolor'
@@ -16,37 +16,20 @@ unless $stdout.tty?
   Sqlbible.colorize = false
 end
 
-result = OptimistXL.options do
-  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
-  end
-  subcmd :list, 'Show a list of the names of the bibles in central directory'
-  subcmd :search, 'Search with regular expressions' do
-    opt :bible, 'Name of the bible module filename of an .sqlbible file', type: String, **default_bible_param
-    opt :colorize, 'Colorize output' do |v|
-      Sqlbible.colorize = v
-    end
-    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: Sqlbible.lang.to_s
-    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 :bible, 'Name of the bible module filename of an .sqlbible file', type: String, **default_bible_param
-    opt :colorize, 'Colorize output' do |v|
-      Sqlbible.colorize = v
-    end
-    opt :lang, 'Language for parsing and formatting scripture references', type: String, permitted: %w(de en), default: Sqlbible.lang.to_s
-    opt :output, 'Output filename', type: String
-    opt :reference, 'Reference to show, example: "John 3:16; 10:27-30"', type: String, required: true
-  end
+opts = Optimist.options do
+  synopsis 'Usage: sqlbible [options] [search regexes]*'
+  opt :bible, 'Name of the bible module filename of an .sqlbible file', type: String, **default_bible_param
+  opt :colorize, 'Colorize output', default: Sqlbible.colorize
+  opt :info, 'Show infos for installed bibles'
+  opt :lang, 'Language for parsing and formatting scripture references', type: String, permitted: %w(de en), default: Sqlbible.lang.to_s
+  opt :output, 'Output filename', type: String
+  opt :pager, 'Use pager for terminal output', default: Sqlbible.pager
+  opt :reference, 'Reference to show or search, example: "John 3:16; 10:27-30"', type: String
   version format("sqlbible %s\nschema version %s", Sqlbible::VERSION, Sqlbible.schema_version)
 end
 
-def determine_lang_mod subopts
-  case l = subopts[:lang]
+def determine_lang_mod opts
+  case l = opts[:lang]
   when 'en', nil
     Scripref::English
   when 'de'
@@ -56,26 +39,32 @@ def determine_lang_mod subopts
   end
 end
 
-def determine_out subopts
-  if fn = subopts[:output]
-    out = File.open(fn, 'w')
+def open_out opts
+  if fn = opts[:output]
+    File.open(fn, 'w') do |f|
+      yield f
+    end
+  elsif opts[:pager]
+    IO.popen(Sqlbible.pager_command, 'w') do |p|
+      yield p
+    end
   else
-    out = $stdout
+    yield $stdout
   end
 end
 
-def format_verse_ref f, v
+def format_verse_ref opts, f, v
   ref = f.format(v.scripref_passage)
-  if Sqlbible.colorize
+  if opts[:colorize]
     Ansicolor.apply(ref, Sqlbible.color_reference)
   else
     ref
   end
 end
 
-def format_text v, regexes
+def format_text opts, v, regexes
   text = v.plaintext.gsub("\n", ' ¶')
-  if Sqlbible.colorize
+  if opts[:colorize]
     regexes.each do |re|
       text = text.gsub(re, Ansicolor.apply('\0', Sqlbible.color_emphasize))
     end
@@ -83,60 +72,40 @@ def format_text v, regexes
   text
 end
 
-def format_verse_line f, v, regexes=[]
-  format('%s: %s', format_verse_ref(f, v), format_text(v, regexes))
+def format_verse_line opts, f, v, regexes=[]
+  format('%s: %s', format_verse_ref(opts, f, v), format_text(opts, v, regexes))
 end
 
-subopts = result.subcommand_options
-
 begin
-  case result.subcommand
-  when 'convert'
-    require 'fileutils'
-    require 'sqlbible/convert'
-    unless osis_fn = result.leftovers.first
-      fail 'no filename given'
+  if opts[:info]
+    names = Sqlbible.bible_names
+    max_size = names.map(&:size).max
+    names.each do |n|
+      puts format("%-#{max_size}s (schema version: %s)", n, Sqlbible.new(n).schema_version)
     end
-    sqlbible_fn = Sqlbible.resolve_db_filename(subopts[:bible])
-    if !subopts[:overwrite] && File.exist?(sqlbible_fn)
-      fail format('file %s exist, conversion aborted', sqlbible_fn)
-    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
-  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, abbrev_level: 1)
-    bible.search(regexes, range: range).each do |v|
-      out.puts format_verse_line(f, v, regexes)
+    return
+  end
+  lang_mod = determine_lang_mod(opts)
+  p = Scripref::Parser.new(lang_mod)
+  f = Scripref::Formatter.new(lang_mod, abbrev_level: 1)
+  if r = opts[:reference]
+    ref = p.parse(r)
+  else
+    ref = nil
+  end
+  bible = Sqlbible.new(opts[:bible])
+  if ARGV.size > 0
+    regexes = ARGV.map {|s| Regexp.new(s)}
+    open_out opts do |out|
+      bible.search(regexes, range: ref).each do |v|
+        out.puts format_verse_line(opts, f, v, regexes)
+      end
     end
-  when 'text'
-    lang_mod = determine_lang_mod(subopts)
-    p = Scripref::Parser.new(lang_mod)
-    f = Scripref::Formatter.new(lang_mod, abbrev_level: 1)
-    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_line(f, v)
+  else
+    open_out opts do |out|
+      bible.reference(Array(ref)).flatten.each do |v|
+        out.puts format_verse_line(opts, f, v)
+      end
     end
   end
 rescue Exception => e

data/bin/sqlbible-convert

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# frozen_string_literal: false
+
+require 'optimist'
+require 'sqlbible'
+require 'fileutils'
+require 'sqlbible/convert'
+
+opts = Optimist.options do
+  synopsis 'Usage: sqlbible [options] [filename]'
+  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
+  version format("sqlbible %s\nschema version %s", Sqlbible::VERSION, Sqlbible.schema_version)
+end
+
+begin
+  unless osis_fn = ARGV.first
+    fail 'no filename given'
+  end
+  sqlbible_fn = Sqlbible.resolve_db_filename(opts[:bible])
+  if !opts[:overwrite] && File.exist?(sqlbible_fn)
+    fail format('file %s exist, conversion aborted', sqlbible_fn)
+  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
+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.7.1'
+  VERSION = '1.8.0'
 end

data/lib/sqlbible.rb

@@ -85,11 +85,12 @@ class Sqlbible
   @color_reference = :blue
   @color_emphasize = :underline
   @lang = :en
+  @pager_command = 'less -FRSX'
 
   class << self
 
     attr_reader :bibles_dir
-    attr_accessor :colorize, :color_reference, :color_emphasize, :bible, :lang
+    attr_accessor :colorize, :color_reference, :color_emphasize, :bible, :lang, :pager, :pager_command
 
     # Get the database schema as string
     def db_schema

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlbible
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Jan Friedrich
@@ -38,19 +38,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: optimist_xl
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: scripref
   requirement: !ruby/object:Gem::Requirement
@@ -124,12 +124,14 @@ dependencies:
 email: janfri26@gmail.com
 executables:
 - sqlbible
+- sqlbible-convert
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
 - bin/sqlbible
+- bin/sqlbible-convert
 - lib/sqlbible.rb
 - lib/sqlbible/ansicolor.rb
 - lib/sqlbible/convert.rb