appl 1.2 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c17ebbb3f574a1d27df9610144f9881c3b8ef910
-  data.tar.gz: 6e68ffdb0dd1e1c227dc371f29e9d93fb7a1abef
+SHA256:
+  metadata.gz: 3670591a91a6270557abff4db7e629db25edcced3372b809dfcd045118ecf427
+  data.tar.gz: fecd11d08475460397ec407536bea1002e74cc80e2e35025ef15819c3eb7ebdd
 SHA512:
-  metadata.gz: c16e0eb7be520d7eace0ab904c838d61ab3eaa29b34d3f2fda9d5c23b35f03721f244ffb814389399bb6f1a175ba68cdd39a2b9fefb7f4cc7bb4f84ce8dbeef0
-  data.tar.gz: 98cf8b5bde3d91115a0763e0561718f04a99d560134d52448f68384662af9814cad6fdc44a283352e00897cf323fd450e4f1c9e77de7c052f9a75ab7dbc4ae51
+  metadata.gz: da220e1d481946d3f418e724c78b308a8a50bd8173d6b57d41ccf82329a962f6783342ab8d1d46b7ea87524f1378e2cffccf4cda13f577c9f7dc556c70edc802
+  data.tar.gz: c3d50105e3584840e0e5511774aa2a2dd315092add7a597056a7df0f3c31bf309244c66091d5e94c18b21a47820782eb3f0a1a93c3cba4e8a81bb7269b4ca7bc

data/bin/intar

@@ -13,7 +13,7 @@ class IntarApp < Application
   NAME      = "intar"
   VERSION   = APPL_VERSION
   SUMMARY   = "Interactive Ruby"
-  COPYRIGHT = "(C) 2008-2013 Bertram Scharpf <software@bertram-scharpf.de>"
+  COPYRIGHT = "(C) 2008-2016 Bertram Scharpf <software@bertram-scharpf.de>"
   LICENSE   = "BSD"
   AUTHOR    = "Bertram Scharpf <software@bertram-scharpf.de>"
 
@@ -120,27 +120,18 @@ EOT
     end
   end
 
-
   def read_cfg
-    c = @configfile
-    return unless c
-    unless c[ File::SEPARATOR] or (File.exists? c) then
-      c = File.expand_path c, "~"
-      return unless File.exists? c
-    end
-    r = File.read c
-    r.prepend "$SAFE = 1#$/"
-    Thread.new {
-      begin
-        eval r, TOPLEVEL_BINDING
-      rescue Exception
-        $@.pop 2
-        e = $@.shift
-        puts "#{e}: #$! (#{$!.class})"
-        $@.each { |l| puts "\t#{l}" }
-        raise "Error in config file #{c}"
-      end
-    }.value
+    return unless @configfile
+    h = "~" unless @configfile[ File::SEPARATOR]
+    c = File.expand_path @configfile, h
+    return unless File.exists? c
+    load c
+  rescue Exception
+    $@.pop 2
+    e = $@.shift
+    puts "#{e}: #$! (#{$!.class})"
+    $@.each { |l| puts "\t#{l}" }
+    raise "Error in config file #{c}"
   end
 
   def nil_if_none var

data/lib/appl.rb

@@ -5,7 +5,7 @@
 
 class Application
 
-  APPL_VERSION = "1.2".freeze
+  APPL_VERSION = "1.5".freeze
 
   OPTIONS_ENV = nil
 
@@ -91,8 +91,6 @@ This base class does nothing by default.
     $!.to_i rescue 1
   end
 
-  HASH_ORDER = RUBY_VERSION >= "1.9"
-
   class <<self
 
     def run args = nil
@@ -209,7 +207,6 @@ This base class does nothing by default.
       all_aliases.each { |k,v|
         a[ v].push k
       }
-      a.values.each { |v| v.sort! } unless HASH_ORDER
       each_option { |opt,desc,arg,dfl,|
         yield opt, arg, dfl, desc
         a[ opt].each { |l|
@@ -223,7 +220,6 @@ This base class does nothing by default.
 
     def each_option
       o = all_options
-      o = o.sort_by { |k,v| k.swapcase } unless HASH_ORDER
       o.each { |opt,(desc,arg,dfl,act)|
         case dfl
           when Symbol then dfl = const_get dfl
@@ -293,6 +289,7 @@ This base class does nothing by default.
         end
       end
       r.concat $*
+      $*.clear
       r
     end
 

data/lib/intar.rb

@@ -47,7 +47,7 @@ require "supplement/terminal"
 
 
 class Object
-  def empty_binding
+  def intar_binding
     binding
   end
 end
@@ -62,7 +62,7 @@ class Intar
     def initialize filename
       @filename = filename
       return unless @filename
-      h = "~" unless @filename.starts_with "./"
+      h = "~" unless @filename[ File::SEPARATOR]
       @filename = File.expand_path @filename, h
       File.exists? @filename and File.open @filename do |h|
         c = []
@@ -238,16 +238,16 @@ class Intar
   autoload :Etc,    "etc"
   autoload :Socket, "socket"
 
-  def cur_prompt
+  def cur_prompt prev
     t = Time.now
     self.class.prompt.gsub /%(?:
-                               \(([^\)]*)\)
+                               \(([^\)]+)?\)
                              |
                                ([+-]?[0-9]+(?:\.[0-9]+)?)
                              )?(.)/nx do
       case $3
         when "s" then @obj.to_s
-        when "i" then $1.notempty? ? (@obj.send $1) : @obj.inspect
+        when "i" then $1 ? (@obj.send $1) : @obj.inspect
         when "n" then "%#$2d" % @n
         when "t" then t.strftime $1||"%X"
         when "u" then Etc.getpwuid.name
@@ -255,7 +255,7 @@ class Intar
         when "w" then cwd_short
         when "W" then File.basename cwd_short
         when "c" then (colour *($1 || $2 || "").split.map { |x| x.to_i }).to_s
-        when ">" then Process.uid == 0 ? "#" : ">"
+        when ">" then prev ? "." : Process.uid == 0 ? "#" : ">"
         when "%" then $3
         else          $&
       end
@@ -284,29 +284,23 @@ class Intar
   def readline
     r, @previous = @previous, nil
     r or @n += 1
-    cp = cur_prompt
-    loop do
-      begin
-        l = Readline.readline r ? "" : cp
-      rescue Interrupt
-        puts "^C  --  #{$!.inspect}"
-        retry
-      end
-      if r then
-        break if l.nil?
-        r << $/ << l
-        break if l.empty?
-      else
-        return if l.nil?
-        next unless l =~ /\S/
-        r = l
-        break unless l =~ /\\+\z/ and $&.length % 2 != 0
-      end
+    cp = cur_prompt r
+    begin
+      l = Readline.readline cp
+    rescue Interrupt
+      puts "^C  --  #{$!.inspect}"
+      retry
+    end
+    return if l.nil?
+    if r then
+      r << $/ << l
+    else
+      r = l
     end
+    self.class.hist_add l
     cp.strip!
     cp.gsub! /\e\[[0-9]*(;[0-9]*)*m/, ""
     @file = "#{self.class}/#{cp}"
-    self.class.hist_add r
     r
   end
 
@@ -354,10 +348,10 @@ class Intar
   class CmdFailed < Exception ; end
 
   def run *precmds
-    bind = @obj.empty_binding
+    bind = @obj.intar_binding
     precmds.each { |l| eval l, bind }
     oldset = eval OLDSET, bind
-    @cl = eval "caller.length", bind
+    @cl = (eval "caller.length", bind) + 2  # 2 = eval + run()
     while l = readline do
       re_sh_pref = /\A#{Regexp.quote self.class.sh_pref}/
       re_pi_suff = /#{Regexp.quote self.class.pi_suff}\z/
@@ -432,7 +426,6 @@ class Intar
     bt = $@.dup
     if bt.length > @cl then
       bt.pop @cl
-      bt.push bt.pop[ /(.*:\d+):.*/, 1]
     end
     puts bt
   end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: appl
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.5'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
-dependencies:
-- !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'
+date: 2019-03-13 00:00:00.000000000 Z
+dependencies: []
 description: |
   A base class for command line applications doing options parsing
   and generating exit codes.
@@ -39,7 +25,7 @@ files:
 - lib/intar.rb
 homepage: http://www.bertram-scharpf.de/software/appl
 licenses:
-- BSD
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -58,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Just Ruby
 rubyforge_project: NONE
-rubygems_version: 2.6.4
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Easy option parsing