deac/dencli
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

defined_in for determine already defined commands/aliases.

Browse source
This commit is contained in:
Denis Knauf 2022-01-30 01:41:54 +01:00
parent 8fe78bb406
commit 09b467f7bd
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dencli/cmd.rb
View file

@ -2,11 +2,11 @@ require_relative '../dencli'
class DenCli::CMD
attr_reader :parent, :name, :description, :exe, :completion, :options
attr_reader :parent, :name, :description, :exe, :completion, :options, :defined_in
def initialize parent, name, description, exe
def initialize parent, name, description, exe, defined_in
raise "Proc expected, instead of: #{exe.inspect}" unless Proc === exe
@parent, @name, @description, @exe = parent, name, description, lambda( &exe)
@parent, @name, @description, @exe, @defined_in = parent, name, description, lambda( &exe), defined_in
@parameters = @exe.parameters
@arguments_required = @exe.parameters.select {|e| :req == e[0] }.map {|e| e[1] }
@arguments_additional = @exe.parameters.select {|e| :opt == e[0] }.map {|e| e[1] }

20
lib/dencli/sub.rb
View file

@ -1,14 +1,14 @@
require_relative '../dencli'
class DenCli::Sub
attr_reader :parent, :name, :description, :subs, :aliases
attr_reader :parent, :name, :description, :subs, :aliases, :defined_in
def initialize parent, name, description, noshortaliases: nil
def initialize parent, name, description, noshortaliases: nil, defined_in: nil
#DenCli::assert_type self, __method__, :name, name, Symbol
#DenCli::assert_type self, __method__, :parent, parent, DenCli, DenCli::Sub
#DenCli::assert_type self, __method__, :description, description, String
@parent, @name, @description, @subs, @aliases = parent, name, "-> #{description}", {}, {}
@noshortaliases = ! ! noshortaliases
@noshortaliases, @defined_in = ! ! noshortaliases, defined_in || Kernel.caller
end
def _full_cmd( post) parent._full_cmd [@name]+post end
@ -120,17 +120,17 @@ class DenCli::Sub
name = name.to_s unless name.nil?
@subs[name] = obj
if @noshortaliases
warn "Command/Alias for [#{obj.full_cmd}] already exists: #{full_cmd.join ' '} #{name}. Used by: #{@aliases[name].full_cmd}" if @aliases.has_key? name
warn "Command/Alias for #{obj.full_cmd} defined in #{obj.defined_in} already exists: #{full_cmd.join ' '} #{name}. Used by #{@aliases[name].full_cmd} defined in #{@aliases[name].defined_in}" if @aliases.has_key? name
@aliases[name] = obj
else
DenCli.gen_aliases name, min do |a|
warn "Command/Alias for [#{obj.full_cmd}] already exists: #{full_cmd.join ' '} #{a}. Used by: #{@aliases[a].full_cmd}" if @aliases.has_key? a
warn "Command/Alias for #{obj.full_cmd} defined in #{obj.defined_in} already exists: #{full_cmd.join ' '} #{a}. Used by #{@aliases[a].full_cmd} defined in #{@aliases[a].defined_in}" if @aliases.has_key? a
@aliases[a] ||= obj
end
end
if aliases
[*aliases].each do |a|
raise ArgumentError, "Alias for [#{obj.full_cmd}] already exists: #{full_cmd.join ' '} #{a}. Used by: #{@aliases[a].full_cmd}" if @aliases.has_key? a
raise ArgumentError, "Alias for #{obj.full_cmd} defined in #{obj.defined_in} already exists: #{full_cmd.join ' '} #{a}. Used by #{@aliases[a].full_cmd} defined in #{@aliases[a].defined_in}" if @aliases.has_key? a
@aliases[a] = obj
end
end
@ -138,13 +138,13 @@ class DenCli::Sub
end
private :_add
def sub name, description, min: nil, aliases: nil, noshortaliases: nil, &exe
r = _add name, min, DenCli::Sub.new( self, name, description, noshortaliases: noshortaliases), aliases
def sub name, description, min: nil, aliases: nil, noshortaliases: nil, defined_in: nil, &exe
r = _add name, min, DenCli::Sub.new( self, name, description, noshortaliases: noshortaliases, defined_in: defined_in || Kernel.caller.first), aliases
block_given? ? yield( r) : r
end
def cmd name, description, min: nil, aliases: nil, &exe
_add name, min, DenCli::CMD.new( self, name, description, exe), aliases
def cmd name, description, min: nil, aliases: nil, defined_in: nil, &exe
_add name, min, DenCli::CMD.new( self, name, description, exe, defined_in || Kernel.caller.first), aliases
end
def complete *pre, str