sqlbible 1.8.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d56c3d8c24b77ebd196845f6337befa2be5ba09af57609ae81c970485882162a
-  data.tar.gz: 03f098e9b3df74b206b1a8a7ffd424b25c6cedca2440f63b21569f7983c0ba2c
+  metadata.gz: 435728b125a8af87f99d9e0227de96a537f4525274ebdae22191d9de1f2d04a8
+  data.tar.gz: bba7f1ceb9626222a92a18773491764be9944261a55f42998cf17328d9034e44
 SHA512:
-  metadata.gz: eb289248fbf37ef0b2220939d20757d590186b8c0338beb76e5630f5d8cbd230ff4d37e472b2732d1082c13b11e0458fcdfd18bf14b63c0ed2a1c2652b8412be
-  data.tar.gz: 7bdc2c73f78526fadd9b568a3f22d421c64bfbacdae5e17e261dea9fdcf0045d48d4d33969d40c768f92afe7a26693daf0a416878ca3c3ce64f718ada47b2f11
+  metadata.gz: e3deefdfdd74197c1b95cf1db6c2983694f759f4ffd2abd393ff7d69b7949557e5cacd1057f9cf365dfd6dcefe10c240381ecbe64e3c50664f00cfcd97ff737a
+  data.tar.gz: e0eaf3f6270f5feda71c454fe0aa11de540e8081cc180a4027db86ee94ed912426e0ae3a7fd1c860532dae374aa156ab5be7f0d8b90f8da2e6509d788077f9a7

data/bin/sqlbible

@@ -3,112 +3,198 @@
 # frozen_string_literal: false
 
 require 'optimist'
+require 'reline'
 require 'scripref'
 require 'sqlbible'
 require 'sqlbible/ansicolor'
 
-default_bible_param = {}
-if b = Sqlbible.bible
-  default_bible_param[:default] = b.to_s
-end
+class Cli
 
-unless $stdout.tty?
-  Sqlbible.colorize = false
-end
+  def run
+    parse_args
+    process_by_opts
+  rescue SystemExit
+  rescue Exception => e
+    $stderr.puts e.message
+    exit 1
+  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
+  private
 
-def determine_lang_mod opts
-  case l = opts[:lang]
-  when 'en', nil
-    Scripref::English
-  when 'de'
-    Scripref::German
-  else
-    fail format('lang option %s is not supported', l)
-  end
-end
+  def parse_args
+    default_bible_param = {}
+    if b = Sqlbible.bible
+      default_bible_param[:default] = b.to_s
+    end
+    explizit_opts = Set.new
 
-def open_out opts
-  if fn = opts[:output]
-    File.open(fn, 'w') do |f|
-      yield f
+    @opts = Optimist.options do
+      synopsis 'Usage: sqlbible [options] [search regexes]*'
+      opt :bible, 'Name of the bible module or filename of an .sqlbible file', type: String, **default_bible_param
+      opt :color, 'Colorize output', default: Sqlbible.color do |v|
+        explizit_opts << :color
+      end
+      opt :env, 'Show infos of the sqlbible environment: installed bibles with schema versions'
+      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
+      opt :stat, 'Statistics level', type: Integer, permitted: (0..2), default: Sqlbible.stat_level
+      version format("sqlbible %s\nschema version %s", Sqlbible::VERSION, Sqlbible.schema_version)
     end
-  elsif opts[:pager]
-    IO.popen(Sqlbible.pager_command, 'w') do |p|
-      yield p
+
+    unless explizit_opts.include? :color
+      if !$stdout.tty? || @opts[:output]
+        @opts[:color] = false
+      end
     end
-  else
-    yield $stdout
-  end
-end
 
-def format_verse_ref opts, f, v
-  ref = f.format(v.scripref_passage)
-  if opts[:colorize]
-    Ansicolor.apply(ref, Sqlbible.color_reference)
-  else
-    ref
+    @regexes = ARGV.map {|s| Regexp.new(s)}
   end
-end
 
-def format_text opts, v, regexes
-  text = v.plaintext.gsub("\n", ' ¶')
-  if opts[:colorize]
-    regexes.each do |re|
-      text = text.gsub(re, Ansicolor.apply('\0', Sqlbible.color_emphasize))
+  def process_by_opts
+    if @opts[:env]
+      show_env
+    else
+      init_processing
+      do_processing
     end
   end
-  text
-end
-
-def format_verse_line opts, f, v, regexes=[]
-  format('%s: %s', format_verse_ref(opts, f, v), format_text(opts, v, regexes))
-end
 
-begin
-  if opts[:info]
+  def show_env
     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
-    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
+
+  def init_processing
+    m = case l = @opts[:lang]
+        when 'en', nil
+          Scripref::English
+        when 'de'
+          Scripref::German
+        else
+          fail format('lang option %s is not supported', l)
+        end
+    @parser = Scripref::Parser.new(m)
+    @formatter = Scripref::Formatter.new(m, abbrev_level: 1)
+    if r = @opts[:reference]
+      @reference = @parser.parse(r)
+    else
+      @reference = nil
+    end
+    @bible = Sqlbible.new(@opts[:bible])
+    @verse_count = 0
+    @matches = []
   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)
+
+  def do_processing
+    open_out do |out|
+      if @regexes.size > 0
+        @bible.search(@regexes, range: @reference).each do |v|
+          process_verse out, v
+        end
+      else
+        @bible.reference(Array(@reference)).flatten.each do |v|
+          process_verse out, v
+        end
       end
+      show_stats out
     end
-  else
-    open_out opts do |out|
-      bible.reference(Array(ref)).flatten.each do |v|
-        out.puts format_verse_line(opts, f, v)
+  end
+
+  def open_out
+    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
+      yield $stdout
+    end
+  end
+
+  def process_verse out, v
+    show_verse out, v
+    @verse_count += 1
+    @regexes.each do |re|
+      @matches += v.plaintext.scan(re)
     end
   end
-rescue Exception => e
-  $stderr.puts e.message
-  exit 1
+
+  def show_verse out, v
+    out.puts format_verse_line(v)
+  end
+
+  def format_verse_line v
+    format('%s: %s', format_verse_ref(v), format_text(v))
+  end
+
+  def format_verse_ref v
+    ref = @formatter.format(v.scripref_passage)
+    if @opts[:color]
+      Ansicolor.apply(ref, Sqlbible.color_reference)
+    else
+      ref
+    end
+  end
+
+  def format_text v
+    text = v.plaintext.gsub("\n", ' ¶')
+    if @opts[:color]
+      @regexes.each do |re|
+        text = text.gsub(re, Ansicolor.apply('\0', Sqlbible.color_emphasize))
+      end
+    end
+    text
+  end
+
+  def show_stats out
+    l = @opts[:stat]
+    if l < 1
+      return
+    end
+    if l >= 2 and !@matches.empty?
+      h = @matches.tally
+      arr = h.to_a.sort_by(&:last).reverse
+      unless arr.empty?
+        out.puts
+      end
+      arr.each do |e|
+        out.puts format('%s: %d', e[0], e[1])
+      end
+      if arr.size  > 1
+        out.puts nil, format('%d total', arr.map(&:last).sum)
+      end
+    end
+    if @verse_count > 0
+      out.puts nil, format('%d verses', @verse_count)
+    end
+  end
+
 end
+
+# interactive mode
+if ARGV.empty?
+  begin
+    while (l = Reline.readline('> ', false))
+      break if l.empty?
+      if l =~ /^-/
+        l.split(/\s+/, 2).each do |s|
+          ARGV << s
+        end
+      else
+        ARGV << l
+      end
+    end
+  rescue Interrupt
+    exit
+  end
+end
+
+Cli.new.run

data/lib/sqlbible/version.rb

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

data/lib/sqlbible.rb

@@ -86,11 +86,12 @@ class Sqlbible
   @color_emphasize = :underline
   @lang = :en
   @pager_command = 'less -FRSX'
+  @stat_level = 1
 
   class << self
 
     attr_reader :bibles_dir
-    attr_accessor :colorize, :color_reference, :color_emphasize, :bible, :lang, :pager, :pager_command
+    attr_accessor :color, :color_reference, :color_emphasize, :bible, :lang, :pager, :pager_command, :stat_level
 
     # 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.8.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Jan Friedrich
@@ -99,28 +99,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.7'
 email: janfri26@gmail.com
 executables:
 - sqlbible
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.1.0.dev
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Library for bibles as SQLite databases
 test_files: []