lib/mkalias.rb in mkalias-0.1.7 vs lib/mkalias.rb in mkalias-0.1.8

- old
+ new

@@ -37,11 +37,38 @@ end alias_names.to_a end - def self.show_alias(alias_name, file_path=BASHRC_PATH) + def self.show_alias(alias_names, file_path=BASHRC_PATH) + alias_names = [alias_names] unless alias_names.kind_of?(Array) + + alias_functions = {} + alias_names.each do |alias_name| + alias_functions[alias_name] = Mkalias.get_alias_function(alias_name, + file_path) + end + + alias_functions.select!{ |key, value| !value.nil? } + return alias_functions + end + + def self.remove_alias(alias_names, file_path=BASHRC_PATH) + alias_names = [alias_names] unless alias_names.kind_of?(Array) + + removed_alias = [] + alias_names.each do |alias_name| + removed = Mkalias.remove_one_alias(alias_name, file_path) + removed_alias << alias_name if removed + end + + return removed_alias + end + + private + + def self.get_alias_function(alias_name, file_path=BASHRC_PATH) alias_names = Mkalias.list_alias(file_path) return nil unless alias_names.include?(alias_name) alias_regex = /\bmkalias_#{alias_name}[(]/ function_regex = /[{](.*)[;]/ @@ -54,10 +81,10 @@ end nil end - def self.remove_alias(alias_name, file_path=BASHRC_PATH) + def self.remove_one_alias(alias_name, file_path=BASHRC_PATH) alias_names = Mkalias.list_alias(file_path) return false unless alias_names.include?(alias_name) alias_regex = /\bmkalias_#{alias_name}[(']/