intar 2.3 → 2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f69cab2073de237de8c934b10e796b5a424fde33d92ab2bc41ab1aa612da14b7
-  data.tar.gz: 8095bb85ab4571c089859e0274c5e6df02e971f2d79334b20fceb93699857870
+  metadata.gz: cad6272b3ab1559bdebde9d6c9979fe065d4bf7bc57c49c85a0d6abf10071b0b
+  data.tar.gz: 3babbed5bbeab2e9f1b7da52ff16aec85f16f13da414f20fe3fdfac995ec0776
 SHA512:
-  metadata.gz: ecc99bcf076cd30fa4463e229f5ce6fcc02d4952d360ab683b10693de718da6de06bb6155a09446b40f3b4d671a4755888c3752472aa6482fed3b542f260ef9f
-  data.tar.gz: e0a1b9c484c4062a098b4881020aca84392a87bf99a6ff4f1a53826cf7841e90d13c2659e699ed066181295f537b11f36e349e0b4b4ccc55991ec25ef1e61f8e
+  metadata.gz: a3757b39f033d37efb3b0c36b547e788da344f084160b3f4cea112c6d23b9249db7bc0a766df605cf546f592810f1da2290e1bcf949f9179a0ed573f425b52ba
+  data.tar.gz: 8309a03d4e9a40a604829eaa70d18ed54db2d09d698a5d13474526e5a7cdf6a64bb1109c6fb8ab2c62443d5f97ec06225097408f206e8a3b527102f77e1558b2

data/README

@@ -18,6 +18,21 @@ Yet, Intar is more robust. Try this in Irb and in Intar:
 
 
 
+== Usage
+
+=== Subcommands
+
+  obj.method &      enter a sub-Intar
+  obj.each &        enter multiple sub-Intars
+
+  \q                exit from the innermost sub-Intar
+  \q!               exit from the innermost sub-Intar loop
+  \q!!              exit from all levels
+
+  \h                get a list of all subcommands
+
+
+
 == Author
 
 Bertram Scharpf <software@bertram-scharpf.de>

data/lib/intar/prompt.rb

@@ -16,8 +16,20 @@ class Intar
       @new = 0
     end
 
+    def push text
+      Readline.pre_input_hook = proc {
+        Readline.insert_text text
+        Readline.redisplay
+      }
+      nil
+    end
+
     def ask prompt
-      l = Readline.readline prompt
+      begin
+        Readline.readline prompt
+      ensure
+        Readline.pre_input_hook = nil
+      end
     rescue Interrupt
       puts
       retry
@@ -34,12 +46,11 @@ class Intar
       i = Readline::HISTORY.length
       while i > 0 do
         i -= 1
-        l = Readline::HISTORY[i]
-        yield l
+        yield Readline::HISTORY[i]
       end
     end
 
-    def push item
+    def push_history item
       item.empty? and return
       last != item or return
       Readline::HISTORY.push item

data/lib/intar/redirect.rb

@@ -16,22 +16,24 @@ class Intar
   class Redirect
     def redirect_output
       out = outfile
-      stdin, stdout = $stdin.dup, $stdout.dup
-      $stdin .reopen "/dev/null"
-      $stdout.reopen out
-      yield
-    ensure
-      $stdin .reopen stdin
-      $stdout.reopen stdout
-      out.close
+      begin
+        stdin, stdout = $stdin.dup, $stdout.dup
+        $stdin .reopen "/dev/null"
+        $stdout.reopen out
+        yield
+      ensure
+        $stdin .reopen stdin
+        $stdout.reopen stdout
+        out.close
+      end
     end
   end
 
   class RedirectPipe < Redirect
     class <<self
       def detect line, pager
-        if line.slice! /\s+\|\z/ then
-          new pager
+        if line.slice! /\s+\|(\b[^|&;{}()\[\]]*)?\z/ then
+          new $1||pager
         end
       end
     end
@@ -39,7 +41,9 @@ class Intar
       @pager = pager||ENV[ "PAGER"]||"more"
     end
     def outfile
-      IO.popen @pager.to_s, "w" rescue raise Failed, "Pipe error: #$!"
+      IO.popen @pager.to_s, "w"
+    rescue Errno::ENOENT
+      raise Failed, "Pipe error: #$!"
     end
   end
 

data/lib/intar/version.rb

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

data/lib/intar.rb

@@ -63,7 +63,7 @@ class Intar
 
 
   DEFAULTS = {
-    prompt:     "%(32)c%i%c:%1c%03n%c%> ",
+    prompt:     "%(32)c%16i%c:%1c%d:%3n%c%> ",
     color:      true,
     show:       1,
     shownil:    false,
@@ -74,56 +74,66 @@ class Intar
     histmax:    500,
   }
 
+  @@current = nil
+
+  attr_reader :params, :prompt, :depth, :n
   def initialize obj = nil, **params
     @obj = obj.nil? ? (eval "self", TOPLEVEL_BINDING) : obj
-    @params = DEFAULTS.dup.update params
-    @binding = @obj.intar_binding
+    if @@current then
+      @params = @@current.params
+      @prompt = @@current.prompt
+      @depth  = @@current.depth + 1
+    else
+      @params = DEFAULTS.dup.update params
+      @prompt = Prompt.new
+      @depth = 0
+    end
     @n = 1
-    @prompt = Prompt.new
+
+    @binding = @obj.intar_binding
   end
 
 
   class Quit   < Exception ; end
-  class Failed < Exception ; end
+  class Bye    < Quit      ; end
+  class Break  < Bye       ; end
+  class Failed < StandardError ; end
 
   def run
-    prompt_load_history
-    oldset = eval OLDSET, @binding
-    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
-          send m.method, (eval_param $2)
-        else
-          begin
-            @redir.redirect_output do eval l, @binding, @file end
+    handle_history do
+      set_current do
+        oldset = eval OLDSET, @binding
+        loop do
+          l = readline
+          l or break
+          @redir = find_redirect l
+          r = begin
+            if l =~ /\A\\(\w+|.)\s*(.*?)\s*\Z/ then
+              send (get_metacommand $1).method, (eval_param $2)
+            else
+              l.sub! %r/\s*&\s*\z/, SUB
+              @redir.redirect_output do eval l, @binding, @file end
+            end
+          rescue Bye
+            raise if @depth.nonzero?
+            break
+          rescue Quit
+            break
           rescue SyntaxError
             raise if l.end_with? $/
             @previous = l
             next
+          rescue Exception
+            break if SystemExit === $! and not @params[ :catch_exit]
+            show_exception
+            $!
           end
+          display r
+          oldset.call r, @n
+          @n += 1
         end
-      rescue Quit
-        break
-      rescue Failed
-        switchcolor 31, 1
-        puts $!
-        switchcolor
-        r = $!
-      rescue Exception
-        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
 
   def execute code
@@ -133,6 +143,26 @@ class Intar
 
   private
 
+  def handle_history
+    unless @depth.nonzero? then
+      begin
+        prompt_load_history
+        yield
+      ensure
+        prompt_save_history
+      end
+    else
+      yield
+    end
+  end
+
+  def set_current
+    old, @@current = @@current, self
+    yield
+  ensure
+    @@current = old
+  end
+
   def find_redirect line
     RedirectPipe.detect line, @params[ :pager]  or
     RedirectFile.detect line, @params[ :output] or
@@ -140,6 +170,14 @@ class Intar
   end
 
 
+  SUB = <<~EOT
+    \ do |obj|
+      Intar.run obj
+    rescue Intar::Break
+      break
+    end
+  EOT
+
   OLDSET = <<~EOT
     _, __, ___ = nil, nil, nil
     proc { |r,n|
@@ -158,44 +196,56 @@ class Intar
 
   def cur_prompt prev
     p = @params[ :prompt].to_s
-    p.gsub /%(?:
-               \(([^\)]+)?\)
-             |
-               ([+-]?[0-9]+(?:\.[0-9]+)?)
-             )?(.)/nx do
-      case $3
-        when "s" then @obj.to_s
-        when "i" then $1 ? (@obj.send $1) : @obj.inspect
-        when "n" then "%#$2d" % @n
-        when "t" then Time.now.strftime $1||"%X"
-        when "u" then Etc.getpwuid.name
-        when "h" then Socket.gethostname
-        when "w" then cwd_short
-        when "W" then File.basename cwd_short
-        when "c" then color *($1 || $2 || "").split.map { |x| x.to_i }
+    p.gsub /%
+            (\d+)?
+            (?:\(([^)]*)\)|\{([^}]*)\})?
+            (.)/nx do
+      sub = $2||$3
+      case $4
+        when "s" then str_axe $1, @obj.to_s
+        when "i" then str_axe $1, (sub ? (@obj.send sub) : @obj.inspect)
+        when "C" then str_axe $1, @obj.class.name
+        when "n" then "%0#$1d" % @n
+        when "d" then "%0#$1d" % @depth
+        when "t" then str_axe $1, (Time.now.strftime sub||"%X")
+        when "u" then str_axe $1, Etc.getpwuid.name
+        when "h" then str_axe $1, Socket.gethostname
+        when "w" then str_axe $1, cwd_short
+        when "W" then str_axe $1, (File.basename cwd_short)
+        when "c" then color [$1,sub].compact.map { |c| c.scan %r/\d+/ }.flatten
         when ">" then prev ? "." : Process.uid == 0 ? "#" : ">"
-        when "%" then $3
+        when "%" then $4
         else          $&
       end
     end
   end
 
-  def color *c
+  def str_axe len, str
+    if len then
+      str.axe len.to_i
+    else
+      str
+    end
+  end
+
+  def color codes
     if @params[ :color] then
-      s = c.map { |i| "%d" % i }.join ";"
-      "\e[#{s}m"
+      "\e[#{codes.join ';'}m"
     end
   end
 
   def switchcolor *c
-    s = color *c
+    s = color c
     print s
   end
 
   def cwd_short
     r = Dir.pwd
     h = Etc.getpwuid.dir
-    r[ 0, h.length] == h and r[ 0, h.length] = "~"
+    if r[ 0, h.length] == h then
+      n = r[ h.length]
+      r[ 0, h.length] = "~" if !n || n == "/"
+    end
     r
   end
 
@@ -205,7 +255,7 @@ class Intar
       cp = cur_prompt r
       l = @prompt.ask cp
       return if l.nil?
-      @prompt.push l unless !r and @params[ :histhid] and l =~ /\A[ \t]+/
+      @prompt.push_history l unless !r and @params[ :histhid] and l =~ /\A[ \t]+/
       if r then
         r << $/ << l
       else
@@ -246,11 +296,11 @@ class Intar
 
   def show_exception
     unless $!.to_s.empty? then
-      switchcolor 31, 1
+      switchcolor 1, 31
       print $!
       print " " unless $!.to_s =~ /\s\z/
     end
-    switchcolor 31, 22
+    switchcolor 22, 31
     puts "(#{$!.class})"
     switchcolor 33
     $@.each { |b|
@@ -351,36 +401,36 @@ class Intar
     Leave Intar.
   EOT
   def cmd_quit x
-    raise Quit
+    lx = $&.length.nonzero? if x =~ /!*/
+    raise lx ? (lx > 1 ? Bye : Break) : Quit
   end
 
   metacmd %w(cd), "Change directory", <<~EOT
     Switch to a different working directory.
-    Former directories will be kept in a stack.
+    Former directories will be pushed to a stack.
 
-      %[N]    exchange with stack item #N
-      =[N]    drop and set to stack item #N
-      -[N]    drop stack item #N
+      N|PATH|%     change directory and push
+      -N|PATH|%    drop stack item
+      =N|PATH|%    change directory but do not push
 
-    Default N is 1.
+    Default N or % is 1.
   EOT
   def cmd_cd x
     @wds ||= []
     y = Dir.getwd
-    if x =~ /\A([%=-])?(\d+)?\z/ then
-      x = $2 ? (@wds.delete_at -$2.to_i) : @wds.pop
-      x or raise Failed, ($2 ? "No directory ##$2." : "No last directory.")
-      case $1
-        when "-" then x = nil
-        when "=" then y = nil
-      end
-    end
     if x then
-      x = File.expand_path x
-      Dir.chdir x rescue raise Failed, $!.to_s
-      @wds.push y if y
-      y = Dir.getwd
-      @wds.delete y
+      cmd = x.slice! /\A[=-]/
+      x = case x
+        when /\A\d+\z/ then @wds[ -x.to_i] or raise Failed, "No directory ##{x}."
+        when /\A%?\z/  then @wds.last      or raise Failed, "No last directory."
+        else                File.expand_path x
+      end
+      @wds.delete x
+      if cmd != "-" then
+        Dir.chdir x
+        @wds.push y if cmd != "="
+        y = x
+      end
     end
     @redir.redirect_output do
       i = @wds.length
@@ -467,7 +517,7 @@ class Intar
   EOT
   def cmd_input x
     x or raise Failed, "No input file given."
-    l = File.read x rescue raise Failed, $!.to_s
+    l = File.read x
     @redir.redirect_output do
       eval l, @binding, x
     end
@@ -478,7 +528,7 @@ class Intar
   EOT
   def cmd_output x
     if x then
-      File.open x, "w" do end rescue raise Failed, "File error: #$!"
+      File.open x, "w" do end
     end
     @params[ :output] = x
   end
@@ -498,7 +548,6 @@ class Intar
       p = File.read fn
       p.strip!
       @prompt.push p
-      @redir.redirect_output do eval p, @binding, @file end
     ensure
       File.unlink fn
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intar
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '2.5'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appl