sqlbible 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 435728b125a8af87f99d9e0227de96a537f4525274ebdae22191d9de1f2d04a8
-  data.tar.gz: bba7f1ceb9626222a92a18773491764be9944261a55f42998cf17328d9034e44
+  metadata.gz: 00d0eddffface8289cb8f02462cb0a0c34a39cffbf67af85fd6f9296dbde400e
+  data.tar.gz: 53ca66961559c13d285388d474a7ca25c5212afde1d38c4aa7c9e1fd853f7b1f
 SHA512:
-  metadata.gz: e3deefdfdd74197c1b95cf1db6c2983694f759f4ffd2abd393ff7d69b7949557e5cacd1057f9cf365dfd6dcefe10c240381ecbe64e3c50664f00cfcd97ff737a
-  data.tar.gz: e0eaf3f6270f5feda71c454fe0aa11de540e8081cc180a4027db86ee94ed912426e0ae3a7fd1c860532dae374aa156ab5be7f0d8b90f8da2e6509d788077f9a7
+  metadata.gz: 544453d67a715d6f93ece6ad6d2275a83bc847cfafd1a3af5f35874406378cc6038d2acca2143fc9893096bd378a3492caeba86f25f9ab2dc2ea79409579ddd8
+  data.tar.gz: b529a999009a32d33107153ba6fca72cec02b532cdb183c0dc44e98faa1a2d221bf45e7a6d088c18644161e60ad5baf2db74ea69c1747c11f7514d2174b93022

data/bin/sqlbible

@@ -22,19 +22,74 @@ class Cli
   private
 
   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
+
+  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
+  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
+  end
+
+  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
+
+  def parsed_opts
     default_bible_param = {}
     if b = Sqlbible.bible
       default_bible_param[:default] = b.to_s
     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 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
@@ -42,14 +97,12 @@ class Cli
       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 explizit_opts.include? :color
-      if !$stdout.tty? || @opts[:output]
-        @opts[:color] = false
+    unless opts[:color_given]
+      if !$stdout.tty? || opts[:output]
+        opts[:color] = false
       end
     end
-
-    @regexes = ARGV.map {|s| Regexp.new(s)}
+    opts
   end
 
   def process_by_opts
@@ -179,22 +232,4 @@ class Cli
 
 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.10.0'
+  VERSION = '1.11.0'
 end

data/lib/sqlbible.rb

@@ -84,6 +84,8 @@ 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
@@ -91,7 +93,7 @@ class Sqlbible
   class << self
 
     attr_reader :bibles_dir
-    attr_accessor :color, :color_reference, :color_emphasize, :bible, :lang, :pager, :pager_command, :stat_level
+    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.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Jan Friedrich