intar 2.17 → 2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca657e64327a8cda404e8a260ac85366046890fe21a903388d0aabbfda83e499
-  data.tar.gz: ccd323d0095cbd53b704e7a33a3cb40431f7b585be513cb4256fd0954a5b4f3c
+  metadata.gz: 2906a0c6492a351a047ba1b17fd008648b4b696c3d6725f1690cc955c73d4b6c
+  data.tar.gz: 9f97fe2061b9db44f37976c06980c6d998391d5d1f109aa436bb20e015a7433e
 SHA512:
-  metadata.gz: 42ed716101d67d08b4583984a2ebcbdfc1a6ad476c6a6237b05a5753b71ee65e58e33d15f93d48f1c70c328b5716783e59eb27a520b6370ba863312227c0c178
-  data.tar.gz: ea00d84c6b4c0a8f79d40ec5d1495b27d5becaac9859175572d0af13a70efe0a487c7068551f330393db915fddc83b3ac23baacd22aa1ece2ecb9eb383f5548c
+  metadata.gz: 2de63df77c02db472de032a591fd4e6ab8c220660726b9e0769ed56bdb9edfe4934602c255c707ea181ca884adf041e2b051551f1ce731d3fb8d3696a780180b
+  data.tar.gz: 1134b8d8054c279a861ce9f1ad28c62002ebcc6d8ade642723798e1c1e107480a4e4844f01fc0f75613d077e22224f05c27d67770ca127dd92f3935912fa1fe9

data/lib/intar/foreign/supplement/terminal.rb

@@ -0,0 +1,15 @@
+#
+#  intar/foreign/supplement/socket.rb  --  Addition usefull Ruby socket functions
+#
+
+# The purpose of this is simply to reduce dependencies.
+
+begin
+  require "supplement/terminal"
+rescue LoadError
+  require "io/console"
+  class IO
+    def wingeom ; winsize.reverse ; end
+  end
+end
+

data/lib/intar/foreign/supplement.rb

@@ -0,0 +1,64 @@
+#
+#  intar/foreign/supplement.rb  --  Additional useful Ruby functions
+#
+
+# The purpose of this is simply to reduce dependencies.
+
+begin
+  require "supplement"
+rescue LoadError
+  class NilClass ; def nonzero?  ;                      end ; end
+  class NilClass ; def notempty? ;                      end ; end
+  class String   ; def notempty? ; self unless empty? ; end ; end
+  class Array    ; def notempty? ; self unless empty? ; end ; end
+  class Array    ; def first= val ; self[ 0] = val ; end ; end
+  class Array    ; def last=  val ; self[-1] = val ;
+                    rescue IndexError ; a.push val ; end ; end
+  class NilClass   ; def to_bool ; false ; end ; end
+  class FalseClass ; def to_bool ; false ; end ; end
+  class Object     ; def to_bool ; true  ; end ; end
+  class <<Struct ; alias [] new ; end
+  class Module
+    def plain_name
+      sep = "::"
+      n = name.dup
+      i = n.rindex sep
+      n.slice! 0, i+sep.length if i
+      n
+    end
+  end
+  class String
+    ELLIPSE = :"..."
+    def axe n = 80
+      if n < length then
+        l = ELLIPSE.length
+        if n >= l then
+          n -= l
+        else
+          n, l = 0, n
+        end
+        self[ 0, n] << ELLIPSE[0,l]
+      else
+        self
+      end
+    end
+    def axe! n = 80
+      if n < length then
+        l = ELLIPSE.length
+        if n >= l then
+          n -= l
+        else
+          n, l = 0, n
+        end
+        slice! n...nil
+        self << ELLIPSE[0,l]
+      end
+    end
+    def starts_with? oth ; o = oth.to_str ; o.length          if start_with? o ; end
+    def ends_with?   oth ; o = oth.to_str ; length - o.length if end_with?   o ; end
+    alias starts_with starts_with?
+    alias ends_with   ends_with?
+  end
+  class Dir ; def entries! ; entries - %w(. ..) ; end ; end
+end
+

data/lib/intar/prompt.rb

@@ -2,7 +2,7 @@
 #  intar/prompt.rb  --  Prompt for Intar
 #
 
-require "supplement"
+require "intar/foreign/supplement"
 require "reline"
 
 

data/lib/intar/redirect.rb

@@ -2,7 +2,7 @@
 #  intar/redirect.rb  --  Output redirection for Intar
 #
 
-require "supplement"
+require "intar/foreign/supplement"
 
 
 class Intar

data/lib/intar/version.rb

@@ -4,7 +4,7 @@
 
 class Intar
 
-  VERSION = "2.17".freeze
+  VERSION = "2.19".freeze
 
 end
 

data/lib/intar.rb

@@ -2,8 +2,8 @@
 #  intar.rb  --  Interactive Ruby evaluation
 #
 
-require "supplement"
-require "supplement/terminal"
+require "intar/foreign/supplement"
+require "intar/foreign/supplement/terminal"
 require "intar/version"
 require "intar/prompt"
 require "intar/redirect"
@@ -150,6 +150,10 @@ class Intar
           end
           (execute OLD_SET).call r, @n
           @n += 1
+        rescue
+          switchcolor 33
+          puts "Internal error."
+          show_exception
         end
         r
       ensure
@@ -324,7 +328,6 @@ class Intar
 
   # :stopdoc:
   ARROW    = "=> "
-  ELLIPSIS = "..."
   # :startdoc:
 
   def display r
@@ -335,18 +338,12 @@ class Intar
     i = ARROW.dup
     i << r.inspect
     if s > 0 then
-      siz, = $stdout.wingeom
-      siz *= s
-      if i.length > siz then
-        i.cut! siz-ELLIPSIS.length
-        i << ELLIPSIS
-      end
+      width, = $stdout.wingeom
+      i.axe! width*s
     end
     puts i
   end
 
-  PACKAGE_BACKTRACE = %r/#{File.basename __FILE__, ".rb"}.*:\d+:in/
-
   def show_exception
     unless $!.to_s.empty? then
       switchcolor 1, 31
@@ -356,10 +353,8 @@ class Intar
     switchcolor 22, 31
     puts "(#{$!.class})"
     switchcolor 33
-    $@.each { |b|
-      break if b =~ PACKAGE_BACKTRACE
-      puts b
-    }
+    $@.pop until $@.empty? or $@.last.start_with? self.class.name
+    puts $@
     switchcolor
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: intar
 version: !ruby/object:Gem::Version
-  version: '2.17'
+  version: '2.19'
 platform: ruby
 authors:
 - Bertram Scharpf
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appl
@@ -24,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: supplement
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: reline
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +50,8 @@ files:
 - README
 - bin/intar
 - lib/intar.rb
+- lib/intar/foreign/supplement.rb
+- lib/intar/foreign/supplement/terminal.rb
 - lib/intar/prompt.rb
 - lib/intar/redirect.rb
 - lib/intar/version.rb
@@ -72,7 +59,6 @@ homepage: http://www.bertram-scharpf.de
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby and some small Gems; Readline
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Interactive Ruby
 test_files: []