sqlbible 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b56764d9e3209aadc3d033fdb8870ebf7b32aeed2c036527ad0211f637890db4
-  data.tar.gz: 61562839dd855f990b6eebcafd375453e1e70e66d38574c3755cbcbb4a0c9c86
+  metadata.gz: 00d0eddffface8289cb8f02462cb0a0c34a39cffbf67af85fd6f9296dbde400e
+  data.tar.gz: 53ca66961559c13d285388d474a7ca25c5212afde1d38c4aa7c9e1fd853f7b1f
 SHA512:
-  metadata.gz: b3b396178ca096c2d153ffb241099c0d2bfdc7981d5b4bd8a0e033fd125e1a13231c4cf1f8c85309725fcd2067e37f63f31529149b5829aadf4744d534221c6c
-  data.tar.gz: 2e5d47096a3023c4510f44359db1683ac3e4d08ba597c2178c9d04365d14f30a7158c0f292cf965b7bb73d8ccf50a32a5bf6924e473a29ccb0a437a3edcc8318
+  metadata.gz: 544453d67a715d6f93ece6ad6d2275a83bc847cfafd1a3af5f35874406378cc6038d2acca2143fc9893096bd378a3492caeba86f25f9ab2dc2ea79409579ddd8
+  data.tar.gz: b529a999009a32d33107153ba6fca72cec02b532cdb183c0dc44e98faa1a2d221bf45e7a6d088c18644161e60ad5baf2db74ea69c1747c11f7514d2174b93022

data/bin/sqlbible

@@ -3,118 +3,233 @@
 # 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
-
-$explizit_opts = Set.new
+class Cli
 
-$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 :color, 'Colorize output', default: Sqlbible.color do |v|
-    $explizit_opts << :color
+  def run
+    parse_args
+    process_by_opts
+  rescue SystemExit
+  rescue Exception => e
+    $stderr.puts e.message
+    exit 1
   end
-  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
 
-unless $explizit_opts.include? :color
-  if !$stdout.tty? || $opts[:output]
-    $opts[:color] = false
-  end
-end
+  private
 
-def determine_lang_mod
-  case l = $opts[:lang]
-  when 'en', nil
-    Scripref::English
-  when 'de'
-    Scripref::German
-  else
-    fail format('lang option %s is not supported', l)
+  def parse_args
+    if ARGV.empty?
+      reline_args
+      @opts = parsed_opts
+    else
+      @opts = parsed_opts
+      if @opts[:interactive]
+        reline_args
+        opts = parsed_opts
+        opts.each_pair do |k, v|
+          if k.to_s =~ /^(.+)_given$/
+            new_k = $1.to_sym
+            @opts[new_k] = opts[new_k]
+          end
+        end
+      end
+    end
+    @regexes = ARGV.map {|s| Regexp.new(s)}
   end
-end
 
-def open_out
-  if fn = $opts[:output]
-    File.open(fn, 'w') do |f|
-      yield f
+  def reline_args
+    load_history
+    loop do
+      l = Reline.readline('> ', false)&.chomp
+      break if l.nil? || l =~ /^$/
+      if l =~ /^-/
+        l.split(/\s+/, 2).each do |s|
+          ARGV << s
+        end
+      else
+        ARGV << l
+      end
+      if Sqlbible.history && !Reline::HISTORY.include?(l)
+        Reline::HISTORY << l
+      end
     end
-  elsif $opts[:pager]
-    IO.popen(Sqlbible.pager_command, 'w') do |p|
-      yield p
+  rescue Interrupt
+    exit
+  ensure
+    write_history
+  end
+
+  def load_history
+    if Sqlbible.history && File.exist?(Sqlbible.history_file)
+      File.readlines(Sqlbible.history_file, chomp: true).each do |line|
+        Reline::HISTORY << line unless line.empty?
+      end
     end
-  else
-    yield $stdout
   end
-end
 
-def format_verse_ref f, v
-  ref = f.format(v.scripref_passage)
-  if $opts[:color]
-    Ansicolor.apply(ref, Sqlbible.color_reference)
-  else
-    ref
+  def write_history
+    max_history = Reline::HISTORY.to_a.last(100)
+    return if max_history.empty?
+    File.write(Sqlbible.history_file, max_history.join("\n") + "\n")
   end
-end
 
-def format_text v, regexes
-  text = v.plaintext.gsub("\n", ' ¶')
-  if $opts[:color]
-    regexes.each do |re|
-      text = text.gsub(re, Ansicolor.apply('\0', Sqlbible.color_emphasize))
+  def parsed_opts
+    default_bible_param = {}
+    if b = Sqlbible.bible
+      default_bible_param[:default] = b.to_s
+    end
+    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 :interactive, 'Interactive mode'
+      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
+    unless opts[:color_given]
+      if !$stdout.tty? || opts[:output]
+        opts[:color] = false
+      end
+    end
+    opts
   end
-  text
-end
 
-def format_verse_line f, v, regexes=[]
-  format('%s: %s', format_verse_ref(f, v), format_text(v, regexes))
-end
+  def process_by_opts
+    if @opts[:env]
+      show_env
+    else
+      init_processing
+      do_processing
+    end
+  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
-  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)}
+
+  def do_processing
     open_out do |out|
-      bible.search(regexes, range: ref).each do |v|
-        out.puts format_verse_line(f, v, regexes)
+      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 do |out|
-      bible.reference(Array(ref)).flatten.each do |v|
-        out.puts format_verse_line(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
+
+  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
-rescue Exception => e
-  $stderr.puts e.message
-  exit 1
+
+  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
+
+Cli.new.run

data/lib/sqlbible/version.rb

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

data/lib/sqlbible.rb

@@ -84,13 +84,16 @@ class Sqlbible
   @bibles_dir = File.join(Dir.home, '.sqlbible/bibles')
   @color_reference = :blue
   @color_emphasize = :underline
+  @history = true
+  @history_file = File.join(Dir.home, '.sqlbible/history')
   @lang = :en
   @pager_command = 'less -FRSX'
+  @stat_level = 1
 
   class << self
 
     attr_reader :bibles_dir
-    attr_accessor :color, :color_reference, :color_emphasize, :bible, :lang, :pager, :pager_command
+    attr_accessor :bible, :color, :color_emphasize, :color_reference, :history, :history_file, :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.9.0
+  version: 1.11.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