sqlbible 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d56c3d8c24b77ebd196845f6337befa2be5ba09af57609ae81c970485882162a
-  data.tar.gz: 03f098e9b3df74b206b1a8a7ffd424b25c6cedca2440f63b21569f7983c0ba2c
+  metadata.gz: b56764d9e3209aadc3d033fdb8870ebf7b32aeed2c036527ad0211f637890db4
+  data.tar.gz: 61562839dd855f990b6eebcafd375453e1e70e66d38574c3755cbcbb4a0c9c86
 SHA512:
-  metadata.gz: eb289248fbf37ef0b2220939d20757d590186b8c0338beb76e5630f5d8cbd230ff4d37e472b2732d1082c13b11e0458fcdfd18bf14b63c0ed2a1c2652b8412be
-  data.tar.gz: 7bdc2c73f78526fadd9b568a3f22d421c64bfbacdae5e17e261dea9fdcf0045d48d4d33969d40c768f92afe7a26693daf0a416878ca3c3ce64f718ada47b2f11
+  metadata.gz: b3b396178ca096c2d153ffb241099c0d2bfdc7981d5b4bd8a0e033fd125e1a13231c4cf1f8c85309725fcd2067e37f63f31529149b5829aadf4744d534221c6c
+  data.tar.gz: 2e5d47096a3023c4510f44359db1683ac3e4d08ba597c2178c9d04365d14f30a7158c0f292cf965b7bb73d8ccf50a32a5bf6924e473a29ccb0a437a3edcc8318

data/bin/sqlbible

@@ -12,14 +12,14 @@ if b = Sqlbible.bible
   default_bible_param[:default] = b.to_s
 end
 
-unless $stdout.tty?
-  Sqlbible.colorize = false
-end
+$explizit_opts = Set.new
 
-opts = Optimist.options do
+$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 :color, 'Colorize output', default: Sqlbible.color do |v|
+    $explizit_opts << :color
+  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
@@ -28,8 +28,14 @@ opts = Optimist.options do
   version format("sqlbible %s\nschema version %s", Sqlbible::VERSION, Sqlbible.schema_version)
 end
 
-def determine_lang_mod opts
-  case l = opts[:lang]
+unless $explizit_opts.include? :color
+  if !$stdout.tty? || $opts[:output]
+    $opts[:color] = false
+  end
+end
+
+def determine_lang_mod
+  case l = $opts[:lang]
   when 'en', nil
     Scripref::English
   when 'de'
@@ -39,12 +45,12 @@ def determine_lang_mod opts
   end
 end
 
-def open_out opts
-  if fn = opts[:output]
+def open_out
+  if fn = $opts[:output]
     File.open(fn, 'w') do |f|
       yield f
     end
-  elsif opts[:pager]
+  elsif $opts[:pager]
     IO.popen(Sqlbible.pager_command, 'w') do |p|
       yield p
     end
@@ -53,18 +59,18 @@ def open_out opts
   end
 end
 
-def format_verse_ref opts, f, v
+def format_verse_ref f, v
   ref = f.format(v.scripref_passage)
-  if opts[:colorize]
+  if $opts[:color]
     Ansicolor.apply(ref, Sqlbible.color_reference)
   else
     ref
   end
 end
 
-def format_text opts, v, regexes
+def format_text v, regexes
   text = v.plaintext.gsub("\n", ' ¶')
-  if opts[:colorize]
+  if $opts[:color]
     regexes.each do |re|
       text = text.gsub(re, Ansicolor.apply('\0', Sqlbible.color_emphasize))
     end
@@ -72,12 +78,12 @@ def format_text opts, v, regexes
   text
 end
 
-def format_verse_line opts, f, v, regexes=[]
-  format('%s: %s', format_verse_ref(opts, f, v), format_text(opts, v, regexes))
+def format_verse_line f, v, regexes=[]
+  format('%s: %s', format_verse_ref(f, v), format_text(v, regexes))
 end
 
 begin
-  if opts[:info]
+  if $opts[:info]
     names = Sqlbible.bible_names
     max_size = names.map(&:size).max
     names.each do |n|
@@ -85,26 +91,26 @@ begin
     end
     return
   end
-  lang_mod = determine_lang_mod(opts)
+  lang_mod = determine_lang_mod
   p = Scripref::Parser.new(lang_mod)
   f = Scripref::Formatter.new(lang_mod, abbrev_level: 1)
-  if r = opts[:reference]
+  if r = $opts[:reference]
     ref = p.parse(r)
   else
     ref = nil
   end
-  bible = Sqlbible.new(opts[:bible])
+  bible = Sqlbible.new($opts[:bible])
   if ARGV.size > 0
     regexes = ARGV.map {|s| Regexp.new(s)}
-    open_out opts do |out|
+    open_out do |out|
       bible.search(regexes, range: ref).each do |v|
-        out.puts format_verse_line(opts, f, v, regexes)
+        out.puts format_verse_line(f, v, regexes)
       end
     end
   else
-    open_out opts do |out|
+    open_out do |out|
       bible.reference(Array(ref)).flatten.each do |v|
-        out.puts format_verse_line(opts, f, v)
+        out.puts format_verse_line(f, v)
       end
     end
   end

data/lib/sqlbible/version.rb

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

data/lib/sqlbible.rb

@@ -90,7 +90,7 @@ class Sqlbible
   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
 
     # 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.9.0
 platform: ruby
 authors:
 - Jan Friedrich
@@ -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: []