sqlbible 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9144e85f267eec314b61068b039076e589025526127b82b1b1c02c25609a60f3
-  data.tar.gz: 567c83c7648b8fe2ee9a155adf65d26c983136aff3df9baf517824c0236747e4
+  metadata.gz: 0c3587cce5d8ce1c25b56573857ab5dd2646424caf7619bef4a2b19cf0a4b6f3
+  data.tar.gz: 1ec12d901611d25a4b77adcbef952f1a182a452b15ad319c2e84a19eed76a2fb
 SHA512:
-  metadata.gz: a5d0ec2cb0912d1f8d4f8dc89b0f8fce44ecff9891bb7221642846ae643be69a759763f1fa4a64056daac17cd2608019be8da05d86745ac44d9594bce08a7041
-  data.tar.gz: e4c1bc126b71e3e99bad390c74b1bda20e932b8360235e651c86d3cdd9ec5cd9768f56e165cd339c473976f2188dffca0f5caedad7972b35949f3276cb744fd7
+  metadata.gz: 625757471d933f660113a01e930cab73545bcd28bc51a39db5b811a77ca2e49101aa214695f31b469b93fe3477168aa527673842e630a9dfcfc459a40b4180e3
+  data.tar.gz: 156977de3c8c7da1ab0b02fc60f7b497f46ef1f3b3d1f9251904863318e354875541bf3d827c2cec22089aa784b5196f099efb8628792bdfb2486affa12b635b

data/bin/sqlbible

@@ -5,12 +5,17 @@
 require 'optimist_xl'
 require 'scripref'
 require 'sqlbible'
+require 'sqlbible/ansicolor'
 
 default_bible_param = {}
 if b = Sqlbible.bible
   default_bible_param[:default] = b.to_s
 end
 
+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
@@ -20,6 +25,9 @@ result = OptimistXL.options do
   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
@@ -27,6 +35,9 @@ result = OptimistXL.options do
   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
@@ -53,8 +64,27 @@ def determine_out subopts
   end
 end
 
-def format_verse f, v
-  format('%s: %s', f.format(v.scripref_passage), v.plaintext)
+def format_verse_ref f, v
+  ref = f.format(v.scripref_passage)
+  if Sqlbible.colorize
+    Ansicolor.apply(ref, Sqlbible.color_reference)
+  else
+    ref
+  end
+end
+
+def format_text v, regexes
+  text = v.plaintext.gsub("\n", ' ¶')
+  if Sqlbible.colorize
+    regexes.each do |re|
+      text = text.gsub(re, Ansicolor.apply('\0', Sqlbible.color_emphasize))
+    end
+  end
+  text
+end
+
+def format_verse_line f, v, regexes=[]
+  format('%s: %s', format_verse_ref(f, v), format_text(v, regexes))
 end
 
 subopts = result.subcommand_options
@@ -65,13 +95,11 @@ begin
     require 'fileutils'
     require 'sqlbible/convert'
     unless osis_fn = result.leftovers.first
-      $stderr.puts 'no filename given'
-      exit 1
+      fail 'no filename given'
     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
+      fail format('file %s exist, conversion aborted', sqlbible_fn)
     end
     unless File.exist?(dir = Sqlbible.bibles_dir)
       puts format('create directory %s', dir)
@@ -81,7 +109,6 @@ begin
       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")
@@ -99,7 +126,7 @@ begin
     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)
+      out.puts format_verse_line(f, v, regexes)
     end
   when 'text'
     lang_mod = determine_lang_mod(subopts)
@@ -109,7 +136,7 @@ begin
     bible = Sqlbible.new(subopts[:bible])
     out = determine_out subopts
     bible.reference(ref).flatten.each do |v|
-      out.puts format_verse(f, v)
+      out.puts format_verse_line(f, v)
     end
   end
 rescue Exception => e

data/lib/sqlbible/ansicolor.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+# Copyright (c) 2019 by Jan Friedrich <janfri26@gmail.com>
+# License: Public Domain
+
+module Ansicolor
+
+  @codes = {}
+
+  %i(bold faint italic underline).each_with_index do |mode, i|
+    @codes[mode] = 1 + i
+  end
+
+  %i(black red green yellow blue magenta cyan white).each_with_index do |color, i|
+    @codes[color] = 30 + i
+    @codes[format('@%s', color).to_sym] = 40 + i
+    @codes[format('light%s', color).to_sym] = 90 + i
+    @codes[format('@light%s', color).to_sym] = 100 + i
+  end
+
+  class << self
+    def apply str, *codes
+      codes.flatten.each do |c|
+        num = @codes[c.to_sym]
+        fail format('Code %s not supported.', c) unless num
+        str = format("\e[%dm%s", num, str)
+      end
+      format("%s\e[0m", str)
+    end
+
+    def codes
+      @codes.keys
+    end
+  end
+
+end

data/lib/sqlbible/version.rb

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

data/lib/sqlbible.rb

@@ -78,12 +78,14 @@ class Sqlbible
   end
 
   @bibles_dir = File.join(Dir.home, '.sqlbible/bibles')
+  @color_reference = :blue
+  @color_emphasize = :underline
   @lang = :en
 
   class << self
 
     attr_reader :bibles_dir
-    attr_accessor :bible, :lang
+    attr_accessor :colorize, :color_reference, :color_emphasize, :bible, :lang
 
     # 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.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jan Friedrich
@@ -93,6 +93,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: regtest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.0
 email: janfri26@gmail.com
 executables:
 - sqlbible
@@ -103,6 +131,7 @@ files:
 - README.md
 - bin/sqlbible
 - lib/sqlbible.rb
+- lib/sqlbible/ansicolor.rb
 - lib/sqlbible/convert.rb
 - lib/sqlbible/version.rb
 - schema.sql
@@ -124,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.8.0.dev
 specification_version: 4
 summary: Library for bibles as SQLite databases
 test_files: []