appl 1.9 → 1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163c100bd1d2a0ab224680a33b33ecc1496dee585e74daffdfe25611057e6037
-  data.tar.gz: b10b33c7d254a3ff68d53275da766a2ca4668ededd54735c748e7c25826d9017
+  metadata.gz: 45ad7f9759023d5910cca734d856a368baf06770ad4e193b6dee940e7b417beb
+  data.tar.gz: 55bc842b3ac4fced98fc3c9574bf6a048e838590d26e709b8f4cd3d38cdeab4f
 SHA512:
-  metadata.gz: 1fdeab1e5d163954a585149fee970c9a6f552a1224ec803d92351a16807d36bc8a4f71612225a516722477b0490732830044f123b83cebd4c9c086b57138f8e3
-  data.tar.gz: 00d03be61474b82295ac21ccb600a49d5a2a55dbf1c451ada43b37361612280bf90c012aae63f2d92f121bc2af0faa71ae397723576bc58640d5ff8c2f615367
+  metadata.gz: a7a30d4159280cef5ca6692decc3f561fd2073bcac52f45234936c75f4aa32e20175ba41bc1495aed79383e69cc9ac84410d9b72c89fcdf0d8043e2b12245a7b
+  data.tar.gz: 82e73a96e8e23b880feeeb783d491b52d0d5c2ae29f368ac2d86c26875b5d86fb39a1c6c244c4b38881423ba171d502e034e51e63354727045f37fce529c2256

data/lib/appl.rb

@@ -5,7 +5,7 @@
 
 class Application
 
-  APPL_VERSION = "1.9".freeze
+  APPL_VERSION = "1.14".freeze
 
   OPTIONS_ENV = nil
 
@@ -13,14 +13,16 @@ class Application
   UNKNOWN = "Unknown option: `%s'."
   UNPROCA = "Warning: unprocessed arguments: %s"
 
+  ALIASES = [].freeze
+
   W_OPTS = 10
   W_ARGS = 16
 
   class OptionError < StandardError ; end
   class Done        < Exception     ; end
 
-  def initialize args = nil
-    @args = args||self.class.cmdline_arguments
+  def initialize name = nil, args = nil
+    @name, @args = name, args
     self.class.each_option { |opt,desc,arg,dfl,act|
       begin
         send act, dfl if dfl
@@ -92,7 +94,8 @@ class Application
     private
 
     def execute args = nil
-      i = new args
+      n = File.basename $0
+      i = new n, args||cmdline_arguments
       i.execute
     rescue Done
       0
@@ -214,14 +217,32 @@ class Application
       self
     end
 
-    def applname
-      self::NAME
+    def all_names
+      [ self::NAME, *self::ALIASES].join "|"
+    end
+
+    def full_name
+      n = []
+      s = self
+      loop do
+        l = s.all_names
+        n.unshift l
+        break if s == root
+        s = s.root
+      end
+      n.join ' '
     end
 
     def help
-      puts "#{applname}  --  #{self::SUMMARY}"
+      fn = full_name
+      puts "#{fn}  --  #{self::SUMMARY}"
       puts
-      puts self::DESCRIPTION
+      d = self::DESCRIPTION.gsub /#(\w+?)?#/ do
+        case $1
+          when "NAME" then fn
+        end
+      end
+      puts d
       puts
       show_options
       if block_given? then
@@ -231,7 +252,7 @@ class Application
     end
 
     def version
-      puts "#{applname} #{self::VERSION}  --  #{self::SUMMARY}"
+      puts "#{self::NAME} #{self::VERSION}  --  #{self::SUMMARY}"
       puts self::COPYRIGHT if const_defined? :COPYRIGHT
       puts "License: #{self::LICENSE}" if const_defined? :LICENSE
       a = []

data/lib/applfan.rb

@@ -5,9 +5,7 @@
 require "appl"
 
 
-ApplicationFan = Class.new Application
-
-class ApplicationFan
+class ApplicationFan < Application
 
   AVAILCMDS = "Available commands (say -h after one for help)"
   NOCOMMAND = "No command given. Say -h for a list."
@@ -22,7 +20,7 @@ class ApplicationFan
     attr_accessor :commands
 
     def find_command name
-      @commands.find { |c| c::NAME == name }
+      @commands.find { |c| c::NAME == name or c::ALIASES.include? name }
     end
 
 
@@ -35,7 +33,7 @@ class ApplicationFan
         puts self::AVAILCMDS
         puts
         @commands.each { |c|
-          puts "  %-*s  %s" % [ self::W_CMDS, c::NAME, c::SUMMARY]
+          puts "  %-*s  %s" % [ self::W_CMDS, c.all_names, c::SUMMARY]
         }
       end
     end
@@ -54,9 +52,6 @@ class ApplicationFan
             define_singleton_method :root do
               sub
             end
-            define_singleton_method :applname do
-              "#{root::NAME} #{self::NAME}"
-            end
           end
         )
       end
@@ -70,7 +65,7 @@ class ApplicationFan
     c or raise CommandError, self.class::NOCOMMAND
     cmd = self.class.find_command c
     cmd or raise CommandError, self.class::UNKNWNCMD % c
-    sub = cmd.new @args.slice! 0, @args.length
+    sub = cmd.new c, (@args.slice! 0, @args.length)
     yield sub if block_given?
     sub.execute
   end

metadata

@@ -1,35 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: appl
 version: !ruby/object:Gem::Version
-  version: '1.9'
+  version: '1.14'
 platform: ruby
 authors:
 - Bertram Scharpf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-29 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies: []
 description: |
   A base class for command line applications doing options parsing
   and generating exit codes.
 email: "<software@bertram-scharpf.de>"
-executables:
-- intar
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/intar
 - doc/demoappl
 - doc/demofan
 - lib/appl.rb
 - lib/applfan.rb
-- lib/intar.rb
 homepage: http://www.bertram-scharpf.de/software/appl
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -45,8 +42,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Just Ruby
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Easy option parsing
 test_files: []

data/bin/intar

@@ -1,136 +0,0 @@
-#!/usr/local/bin/ruby
-
-#
-#  intar  --  Interactive Ruby evaluation
-#
-
-require "intar"
-require "appl"
-
-
-class IntarApp < Application
-
-  NAME      = "intar"
-  VERSION   = APPL_VERSION
-  SUMMARY   = "Interactive Ruby"
-  COPYRIGHT = "(C) 2008-2016 Bertram Scharpf <software@bertram-scharpf.de>"
-  LICENSE   = "BSD"
-  AUTHOR    = "Bertram Scharpf <software@bertram-scharpf.de>"
-
-  DESCRIPTION = <<~EOT
-    Prompt for Ruby statements, evaluate them. This is a replacement
-    for "irb". The underlying library may be entered from inside any
-    Ruby program.
-
-    Example:
-
-      $ intar -p '%(33 1)c%t%c%> '
-
-  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_bang :quiet, :bw, :catch_exit, :histall
-
-  define_option "p", :prompt=, "STR",
-                              "prompt - see source code for % escapes"
-  alias_option  "p", "prompt"
-
-  define_option "q", :quiet!,                     "don't show results"
-  alias_option  "q", "quiet"
-
-  define_option "s", :show=, "N",     "show result line limit (0=all)"
-  alias_option  "s", "show"
-
-  define_option "r", :require, "FILE",                  "Ruby require"
-  alias_option  "r", "require"
-
-  define_option "bw", :bw!,                            "black & white"
-
-  define_option "c", :configfile=, "FILE", ".intarrc",
-                                        "config file, NONE means none"
-  alias_option  "c", "configfile"
-
-  define_option "H", :histfile=, "FILE", ".intar_history",
-                                       "history file, NONE means none"
-  alias_option  "H", "histfile"
-
-  define_option "m", :histmax=, "NUM",
-                                     "maximum history entries to save"
-  alias_option  "m", "histmax"
-
-  define_option "A", :histall!,
-                          "pass lines starting with blanks to history"
-  alias_option  "A", "histall"
-
-  define_option "E", :encoding=, "ENC",  "set encoding (like ruby -E)"
-  alias_option  "E", "encoding"
-
-  define_option "x", :catch_exit!,
-                     "On exit exception: Wait 3 seconds for interrupt"
-  alias_option  "x", "catchexit"
-  alias_option  "x", "catch-exit"
-
-  define_option "h", :help,                             "show options"
-  alias_option  "h", "help"
-  define_option "V", :version,                          "show version"
-  alias_option  "V", "version"
-
-  def run
-    # @debug = true      # Only development.
-    read_cfg
-    if @quiet then
-      Intar.show = 0
-    elsif @show then
-      Intar.show = Integer @show
-    end
-    Intar.prompt = @prompt if @prompt
-    Intar.colour = false if @bw
-    Intar.catch_exit = (Intar.catch_exit||0) + 3 if @catch_exit
-    Intar.histhid = false if @histall
-    Intar.histfile = @histfile if @histfile
-    Intar.histmax = Integer @histmax if @histmax
-
-    main = eval "self", TOPLEVEL_BINDING
-    Intar.open main do |i|
-      i.run *(@args.shift @args.length)
-    end
-  end
-
-  private
-
-  def encoding= ei
-    e, i = ei.split ":"
-    Encoding.default_external = e if e and not e.empty?
-    Encoding.default_internal = i if i and not i.empty?
-    [ $stdin, $stdout, $stderr].each do |io|
-      io.set_encoding e, i
-    end
-  end
-
-  def read_cfg
-    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
-    case var
-      when "", "NONE" then nil
-      else                 var
-    end
-  end
-
-end
-
-IntarApp.run
-

data/lib/intar.rb

@@ -1,447 +0,0 @@
-#
-#  intar.rb  --  Interactive Ruby evaluation
-#
-
-
-=begin rdoc
-
-This could be opened not only by the Intar executable but also
-everywhere inside your Ruby program.
-
-= Example 1
-
-  require "intar"
-
-  Intar.prompt = "str(%(length)i):%03n%> "
-  a = "hello"
-  Intar.run a
-
-
-= Example 2
-
-  require "intar"
-
-  class C
-  end
-
-  class IntarC < Intar
-    @show     = 3
-    @prompt   = "%(33 1)c%t%c%> "
-    @histfile = ".intarc_history"
-
-    class <<self
-      def open
-        super C.new
-      end
-    end
-  end
-
-  IntarC.open do |ia| ia.run end
-
-=end
-
-
-require "readline"
-require "supplement"
-require "supplement/terminal"
-
-
-class Object
-  def intar_binding
-    binding
-  end
-end
-
-class Intar
-
-  class History
-
-    IND = "  "
-    IND_RE = /^#{IND}/
-
-    def initialize filename
-      @filename = filename
-      return unless @filename
-      h = "~" unless @filename[ File::SEPARATOR]
-      @filename = File.expand_path @filename, h
-      File.exists? @filename and File.open @filename do |h|
-        c = []
-        h.each { |l|
-          case l
-            when IND_RE then c.push $'
-            else             push c.join.chomp ; c.clear
-          end
-        }
-        push c.join.chomp
-      end
-      @num = Readline::HISTORY.length
-    end
-
-    def finish max
-      return unless @filename
-      @num.times { Readline::HISTORY.shift }
-      File.open @filename, "a" do |h|
-        a = []
-        while (c = Readline::HISTORY.shift) do a.push c end
-        if a.any? then
-          h.puts "# #{Time.now}"
-          a.each { |c|
-            c.each_line { |l| h.puts IND + l }
-            h.puts "-"
-          }
-          i = a.length
-          h.puts "# #{i} #{entry_str i} added"
-        end
-      end
-      n = File.open @filename do |h|
-        h.inject 0 do |i,l| i += 1 if l =~ IND_RE ; i end
-      end
-      i = max - n
-      if i < 0 then
-        f = nil
-        File.open @filename do |h|
-          h.each_line { |l|
-            f.push l if f
-            case l
-              when IND_RE then i += 1
-              else             f ||= [] if i >= 0
-            end
-          }
-        end
-        f and File.open @filename, "w" do |h| h.puts f end
-      end
-    rescue Errno
-      # Forget it if there isn't enough disk space.
-    end
-
-    def push l
-      Readline::HISTORY.push l unless l.empty?
-    end
-
-    private
-
-    def entry_str i
-      i == 1 ? "entry" : "entries"
-    end
-
-  end
-
-  class <<self
-
-    attr_accessor :prompt, :show, :shownil, :colour
-
-    attr_reader :histfile
-    def histfile= hf
-      @histfile = hf
-      if @history then
-        @history.finish @histmax
-        @history = History.new @histfile
-      end
-    end
-
-    # Maximum number of history entries.
-    attr_accessor :histmax
-
-    # Whether to hide entries starting with whitespace.
-    attr_accessor :histhid
-
-    # Shell prefix and Pipe suffix
-    attr_accessor :sh_pref, :pi_suff
-
-    # Whether <code>Kernel#exit</code> should be caught.
-    attr_accessor :catch_exit
-
-    private
-
-    def inherited sub
-      sub.class_eval {
-        s = superclass
-        @prompt     = s.prompt
-        @show       = s.show
-        @shownil    = s.shownil
-        @colour     = s.colour
-        @histfile   = s.histfile
-        @histmax    = s.histmax
-        @histhid    = s.histhid
-        @sh_pref    = s.sh_pref
-        @pi_suff    = s.pi_suff
-        @catch_exit = s.catch_exit
-      }
-    end
-
-    def history_file
-      if @history then
-        yield
-      else
-        @history = History.new @histfile
-        begin
-          yield
-        ensure
-          @history.finish @histmax
-          @history = nil
-        end
-      end
-    end
-
-    public
-
-    private :new
-    def open obj
-      history_file do
-        i = new obj
-        yield i
-      end
-    end
-
-    def run obj
-      open obj do |i| i.run end
-    end
-
-    def hist_add l
-      return if @histhid and l == /\A[ \t]+/
-      lst = Readline::HISTORY[-1] if Readline::HISTORY.length > 0
-      @history.push l unless l == lst
-    end
-
-  end
-
-  self.prompt     = "%(32)c%i%c:%1c%03n%c%> "
-  self.show       = 1
-  self.shownil    = false
-  self.colour     = true
-  self.histfile   = nil
-  self.histmax    = 500
-  self.histhid    = true
-  self.sh_pref    = "."
-  self.pi_suff    = " |"
-  self.catch_exit = nil
-
-  private
-
-  def initialize obj
-    @obj = obj
-    @n = 0
-  end
-
-  OLDSET = <<~EOT
-    _, __, ___ = nil, nil, nil
-    proc { |r,n|
-      Array === __ or __ = []
-      Hash === ___ or ___ = {}
-      unless r.nil? or r.equal? __ or r.equal? ___ then
-        _ = r
-        __.delete r rescue nil
-        __.unshift r
-        ___[ n] = r
-      end
-    }
-  EOT
-
-  autoload :Etc,    "etc"
-  autoload :Socket, "socket"
-
-  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 ? (@obj.send $1) : @obj.inspect
-        when "n" then "%#$2d" % @n
-        when "t" then t.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 (colour *($1 || $2 || "").split.map { |x| x.to_i }).to_s
-        when ">" then prev ? "." : Process.uid == 0 ? "#" : ">"
-        when "%" then $3
-        else          $&
-      end
-    end
-  end
-
-  def colour *c
-    if self.class.colour then
-      s = c.map { |i| "%d" % i }.join ";"
-      "\e[#{s}m"
-    end
-  end
-
-  def switchcolour *c
-    s = colour *c
-    print s if s
-  end
-
-  def cwd_short
-    r = Dir.pwd
-    h = Etc.getpwuid.dir
-    r[ 0, h.length] == h and r[ 0, h.length] = "~"
-    r
-  end
-
-  def readline
-    r, @previous = @previous, nil
-    r or @n += 1
-    begin
-      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 unless l.empty?
-      end
-      self.class.hist_add l
-      cp.strip!
-      cp.gsub! /\e\[[0-9]*(;[0-9]*)*m/, ""
-      @file = "#{self.class}/#{cp}"
-    end until r
-    r
-  end
-
-  # :stopdoc:
-  ARROW    = "=> "
-  ELLIPSIS = "..."
-  # :startdoc:
-
-  def display r
-    return if r.nil? and not self.class.shownil
-    show = (self.class.show or return)
-    i = ARROW.dup
-    i << r.inspect
-    if show > 0 then
-      siz, = $stdout.winsize
-      siz *= show
-      if i.length > siz then
-        i.cut! siz-ELLIPSIS.length
-        i << ELLIPSIS
-      end
-    end
-    puts i
-  end
-
-  def pager doit
-    if doit then
-      IO.popen ENV[ "PAGER"]||"more", "w" do |pg|
-        begin
-          stdout = $stdout.dup
-          $stdout.reopen pg
-          yield
-        ensure
-          $stdout.reopen stdout
-        end
-      end
-    else
-      yield
-    end
-  end
-
-  public
-
-  class Exit      < Exception ; end
-  class CmdFailed < Exception ; end
-
-  def run *precmds
-    bind = @obj.intar_binding
-    precmds.each { |l| eval l, bind }
-    oldset = eval OLDSET, 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/
-      switchcolour
-      begin
-        pg = l.slice! re_pi_suff
-        r = pager pg do
-          unless l =~ re_sh_pref then
-            eval l, bind, @file
-          else
-            call_system $', bind
-          end
-        end
-        oldset.call r, @n
-        display r
-      rescue Exit
-        wait_exit and break
-      rescue CmdFailed
-        oldset.call $?, @n
-        switchcolour 33
-        puts "Exit code: #{$?.exitstatus}"
-      rescue LoadError
-        oldset.call $!, @n
-        show_exception
-      rescue SyntaxError
-        if l.end_with? $/ then
-          switchcolour 33
-          puts $!
-        else
-          @previous = l
-        end
-      rescue SystemExit
-        break if wait_exit
-        oldset.call $!, @n
-        show_exception
-      rescue Exception
-        oldset.call $!, @n
-        show_exception
-      ensure
-	switchcolour
-      end
-    end
-    puts
-  ensure
-    done
-  end
-
-  protected
-
-  def done
-  end
-
-  private
-
-  def wait_exit
-    c = self.class.catch_exit
-    c and c.times { print "." ; $stdout.flush ; sleep 1 }
-    true
-  rescue Interrupt
-    puts
-  end
-
-  def show_exception
-    unless $!.to_s.empty? then
-      switchcolour 31, 1
-      print $!
-      print " " unless $!.to_s =~ /\s\z/
-    end
-    switchcolour 31, 22
-    puts "(#{$!.class})"
-    switchcolour 33
-    bt = $@.dup
-    if bt.length > @cl then
-      bt.pop @cl
-    end
-    puts bt
-  end
-
-  def call_system l, bind
-    l.strip!
-    raise Exit if l.empty?
-    eot = "EOT0001"
-    eot.succ! while l[ eot]
-    l = eval "<<#{eot}\n#{l}\n#{eot}", bind, @file
-    system l or raise CmdFailed
-    nil
-  end
-
-end
-