intar 2.7 → 2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ba7f7b2c3052c0627cd7126fedc64e45e443b2652670a6f15b3a408f729d5dd
-  data.tar.gz: efd64593e9f9e6d4fda22a426f9b5a7c3be1860594a3d31e66d383e033b55110
+  metadata.gz: 84d165f1b9d58c19bbd9080263260ccb87c5f583bd05e9ad6045d7dab9a12c70
+  data.tar.gz: 5efa92e7ae496464fb5344cdc1c35d94eb5ab1b4812a4b650996738bc16f5659
 SHA512:
-  metadata.gz: 1cf5dedde06257a25c4a0080c98f11f8a1735194c32cc279ce871a4d98d56685ee240d1316494c4f825af0f8a5886cbbdaba868912c376df2cb30f604e91911c
-  data.tar.gz: 831ce595c01ec5fe97832a2699d2a866d0af6bfec61598cf45b217652f0135cec5867fe510a15b50e506f9b475a4ad0a5ffdb8404e2f031098c377b669b9bc8d
+  metadata.gz: 6081809067ded417b3231e89810a4a2ae84bfd0146d9e9298f7f5b93e768639a48a9403e817ee78b0f89516fe21565a3b019d422c2466df94ff013c9d0ae7f05
+  data.tar.gz: cfe779bd9c642e2703315f12b219f73b5101f3095797968aa03e5fd5fb9657765a1cacbcbb499bb4d1c3bcdaa3d99c58b46d05bd11677b147be66f300890099f

data/lib/intar/version.rb

@@ -4,7 +4,7 @@
 
 class Intar
 
-  VERSION = "2.7".freeze
+  VERSION = "2.9".freeze
 
 end
 

data/lib/intar.rb

@@ -94,6 +94,7 @@ class Intar
   end
 
 
+  class Clear  < Exception ; end
   class Quit   < Exception ; end
   class Bye    < Quit      ; end
   class Break  < Bye       ; end
@@ -107,19 +108,23 @@ class Intar
           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)
+          begin
+            if l.slice! /^\\(\w+|.)\s*(.*?)\s*$\n?/ then
+              r = send (get_metacommand $1).method, (eval_param $2)
+              l.empty? or @previous = l
             else
-              l.sub! %r/\s*&\s*\z/, SUB
               begin
-                @redir.redirect_output do eval l, @binding, @file end
+                r = eval_line l
               rescue SyntaxError
                 raise if l.end_with? $/
                 @previous = l
-                next
               end
             end
+            next if @previous
+            display r
+          rescue Clear
+            @previous = nil
+            next
           rescue Bye
             raise if @depth.nonzero?
             break
@@ -127,10 +132,9 @@ class Intar
             break
           rescue Exception
             break if SystemExit === $! and not @params[ :catch_exit]
+            r = $!
             show_exception
-            $!
           end
-          display r
           oldset.call r, @n
           @n += 1
         end
@@ -145,6 +149,11 @@ class Intar
 
   private
 
+  def eval_line l
+    ls = l.sub %r/\s*&\s*\z/, SUB
+    @redir.redirect_output do eval ls, @binding, @file end
+  end
+
   def handle_history
     unless @depth.nonzero? then
       begin
@@ -370,7 +379,7 @@ class Intar
         puts "Metacommand: #{names.join ' '}"
         puts "Summary:     #{mc.summary}"
         puts "Description:"
-        puts mc.description
+        mc.description.each_line { |l| print "  " ; puts l }
       else
         l = cmds_list.map { |k,v| [v,k] }
         puts "Metacommands:"
@@ -401,12 +410,24 @@ class Intar
 
   metacmd %w(q x quit exit), "Quit Intar", <<~EOT
     Leave Intar.
+
+      plain     quit current Intar level
+      !         quit current loop
+      !!        quit all levels
   EOT
   def cmd_quit x
     lx = $&.length.nonzero? if x =~ /!*/
     raise lx ? (lx > 1 ? Bye : Break) : Quit
   end
 
+  metacmd %w(c clear), "Clear command line", <<~EOT
+    Use this if a statement cannot be successfully ended,
+    i. e. when there is no other way to leave the dot prompt.
+  EOT
+  def cmd_clear x
+    raise Clear
+  end
+
   metacmd %w(cd), "Change directory", <<~EOT
     Switch to a different working directory.
     Former directories will be pushed to a stack.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intar
 version: !ruby/object:Gem::Version
-  version: '2.7'
+  version: '2.9'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appl
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby and some small Gems; Readline
-rubygems_version: 3.0.8
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Interactive Ruby