intar 2.0 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb1f8448fc1b1975a50bbc99cac9e601dfc5c8c949fc9c6bb3e2e9ccec5d556
-  data.tar.gz: ac7e7ac5915357dd60db8e958a4c58fc15050c3b04d52746a0d3e3d05d971d98
+  metadata.gz: f69cab2073de237de8c934b10e796b5a424fde33d92ab2bc41ab1aa612da14b7
+  data.tar.gz: 8095bb85ab4571c089859e0274c5e6df02e971f2d79334b20fceb93699857870
 SHA512:
-  metadata.gz: 5e983cbc3b2773a4f3fc8297407f59aa56fd5156adaa5af2c2e7657e5e3523f8b16bfa193e5f088e1a5d4b259838f63444b7dea35a564c8133e85969ec055205
-  data.tar.gz: bfeb03f9854a50f9f5c7d1ef7c658bd871a4f0896448009236c27f1125e2c6517e563c84b1c6a294c5289a7588e5f180e348af04b89e2949bcacc721be7fddcc
+  metadata.gz: ecc99bcf076cd30fa4463e229f5ce6fcc02d4952d360ab683b10693de718da6de06bb6155a09446b40f3b4d671a4755888c3752472aa6482fed3b542f260ef9f
+  data.tar.gz: e0a1b9c484c4062a098b4881020aca84392a87bf99a6ff4f1a53826cf7841e90d13c2659e699ed066181295f537b11f36e349e0b4b4ccc55991ec25ef1e61f8e

data/LICENSE

@@ -0,0 +1,29 @@
+= ruby-intar
+
+Copyright (c) 2020, Bertram Scharpf <software@bertram-scharpf.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

data/README

@@ -0,0 +1,30 @@
+= ruby-intar  --  Interactive Ruby
+
+A simple Irb replacement
+
+
+
+== About
+
+The Intar project was started in times when Irb was a rather
+unconvenient tool, without colors, difficult to call from
+inside an application and so on.
+
+Today, Intar is a tool far less complex than Irb.
+
+Yet, Intar is more robust. Try this in Irb and in Intar:
+
+  prompt> Thread.new { sleep 3 ; Thread.main.raise "stop" }
+
+
+
+== Author
+
+Bertram Scharpf <software@bertram-scharpf.de>
+
+
+
+== TODO
+
+Write some more documentation.
+

data/bin/intar

@@ -28,9 +28,7 @@ class Intar::Appl < Application
 
   EOT
 
-  attr_writer :show, :prompt, :histmax
-  def histfile=   f ; @histfile   = nil_if_none f ; end
-  def configfile= f ; @configfile = nil_if_none f ; end
+  attr_writer :show, :prompt, :histmax, :histfile, :configfile
   attr_bang :quiet, :bw, :catch_exit, :histall
 
   define_option "p", :prompt=, "STR", "prompt - see source code for % escapes"
@@ -51,7 +49,7 @@ class Intar::Appl < Application
                                                 "config file, NONE means none"
   alias_option  "c", "configfile"
 
-  define_option "H", :histfile=, "FILE", ".intar_history",
+  define_option "H", :histfile=, "FILE",
                                                "history file, NONE means none"
   alias_option  "H", "histfile"
 
@@ -75,7 +73,11 @@ class Intar::Appl < Application
   define_option "V", :version,                                  "show version"
   alias_option  "V", "version"
 
-  @params = {}
+  @params = {
+    show:     5,
+    shownil:  false,
+    histfile: ".intar_history",
+  }
   class <<self
     attr_reader :params
     def set **kwargs
@@ -101,12 +103,12 @@ class Intar::Appl < Application
     elsif @show then
       p[ :show] = Integer @show
     end
-    p[ :prompt    ] = @prompt          if @prompt
-    p[ :color     ] = false            if @bw
-    p[ :catch_exit] = true             if @catch_exit
-    p[ :histhid   ] = false            if @histall
-    p[ :histfile  ] = @histfile        if @histfile
-    p[ :histmax   ] = Integer @histmax if @histmax
+    p[ :prompt    ] = @prompt               if @prompt
+    p[ :color     ] = false                 if @bw
+    p[ :catch_exit] = true                  if @catch_exit
+    p[ :histhid   ] = false                 if @histall
+    p[ :histfile  ] = nil_if_none @histfile if @histfile
+    p[ :histmax   ] = Integer @histmax      if @histmax
     p
   end
 
@@ -120,8 +122,9 @@ class Intar::Appl < Application
   end
 
   def read_cfg
-    return unless @configfile
-    c = File.expand_path @configfile, "~"
+    cf = nil_if_none @configfile
+    return unless cf
+    c = File.expand_path cf, "~"
     return unless File.exists? c
     load c
   rescue Exception

data/lib/intar/prompt.rb

@@ -19,8 +19,11 @@ class Intar
     def ask prompt
       l = Readline.readline prompt
     rescue Interrupt
-      puts "^C  --  #{$!.inspect}"
+      puts
       retry
+    rescue Exception
+      puts
+      raise
     end
 
     def last

data/lib/intar/version.rb

@@ -4,7 +4,7 @@
 
 class Intar
 
-  VERSION = "2.0".freeze
+  VERSION = "2.3".freeze
 
 end
 

data/lib/intar.rb

@@ -78,7 +78,7 @@ class Intar
     @obj = obj.nil? ? (eval "self", TOPLEVEL_BINDING) : obj
     @params = DEFAULTS.dup.update params
     @binding = @obj.intar_binding
-    @n = 0
+    @n = 1
     @prompt = Prompt.new
   end
 
@@ -89,8 +89,10 @@ class Intar
   def run
     prompt_load_history
     oldset = eval OLDSET, @binding
-    while l = readline do
+    loop do
       begin
+        l = readline
+        l or break
         @redir = find_redirect l
         r = if l =~ /\A\\(\w+|.)\s*(.*?)\s*\Z/ then
           m = get_metacommand $1
@@ -112,13 +114,14 @@ class Intar
         switchcolor
         r = $!
       rescue Exception
-        raise if SystemExit === $! and not @params[ :catch_exit]
+        break if SystemExit === $! and not @params[ :catch_exit]
         show_exception
         r = $!
       else
         display r
       end
       oldset.call r, @n
+      @n += 1
     end
     prompt_save_history
   end
@@ -198,7 +201,6 @@ class Intar
 
   def readline
     r, @previous = @previous, nil
-    r or @n += 1
     begin
       cp = cur_prompt r
       l = @prompt.ask cp
@@ -240,6 +242,8 @@ class Intar
     puts i
   end
 
+  PACKAGE_BACKTRACE = %r/#{File.basename __FILE__, ".rb"}.*:\d+:in/
+
   def show_exception
     unless $!.to_s.empty? then
       switchcolor 31, 1
@@ -250,8 +254,7 @@ class Intar
     puts "(#{$!.class})"
     switchcolor 33
     $@.each { |b|
-      r = b.starts_with? __FILE__
-      break if r and (b.rest r) =~ /\A:\d+:/
+      break if b =~ PACKAGE_BACKTRACE
       puts b
     }
     switchcolor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intar
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.3'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appl
@@ -47,6 +47,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README
 - bin/intar
 - lib/intar.rb
 - lib/intar/prompt.rb