mkalias 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7141b7cc6b6bdfe69ebcd7bfc3a9daf28a3bff3e
-  data.tar.gz: fd583834b2ea509075c8c8f02b9c71657615da57
+  metadata.gz: 1948f9aa0438885fe26d111aff8ffc7b97ab1f6e
+  data.tar.gz: cacd144cb21b36258d1e129b3da46c560ee2e442
 SHA512:
-  metadata.gz: 8c6124af31a8ea0e14e6fe0f2e7151efbe8f4889709f16f9ab5a5ba4911bfa868221f84fdcc5b384587edf854293c56909a5a11fe2a88a33c56d4a75775772dd
-  data.tar.gz: 8214e02207f4b6bf8025717193a044e0a4f67906e8a55d1976999fa1d9155d8b695c4df05c626dc229d0966469a7fed1e7e726aadbe5e678c2f03ddae88d6af7
+  metadata.gz: d97cd21536fb5a1d58533ff7c6ae14cf93ba5a87745c545ca1a92da0e1de667f1cf6f2f5e7f6a5add46df4c69e925589831a6072fa6c064a2c29d9879963d0a3
+  data.tar.gz: 42b5d41f02465b52790105b2012d1257e3f0ad1d19b57c0d8b7500ce00eab5e2cce4a17c9da1de10e5e23172fece86d6fcc0468a849f132e41b2aff8c3293e58

data/README.md

@@ -23,7 +23,7 @@ Or install it yourself as:
 
     run: $ mkalias [option]
 
-		options:
+    options:
 
      new            $ mkalias new [alias] [command 1] [command 2] ... [command n]
                     - Create a new alias to run the commands
@@ -40,17 +40,17 @@ Or install it yourself as:
      remove         $ mkalias remove [alias 1] [alias 2] ... [alias n]
                     - Remove the specified alias
 
-		 add_signal     $ mkalias add_signal
+     add_signal     $ mkalias add_signal
                     - Add signal to run 'source ~/.bashrc' when
                     - add or remove an alias
 
-		 remove_signal  $ mkalias remove_signal"
+     remove_signal  $ mkalias remove_signal"
                     - Remove signal to run 'source ~/.bashrc' when
                     - add or remove an alias
 
-    Attention: To make alias with args use #. Example:
-               $ mkalias new [alias] "echo #1 #2 #3"
-               Then you can use: $ [alias] arg1 arg2 arg3
+     Attention:     To make alias with args use #. Example:
+                    $ mkalias new [alias] "echo #1 #2 #3"
+                    Then you can use: $ [alias] arg1 arg2 arg3
 
 
 ## Development

data/lib/mkalias/version.rb

@@ -1,3 +1,3 @@
 module Mkalias
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/mkalias.rb

@@ -3,15 +3,14 @@ require 'set'
 
 module Mkalias
 
-	SIGNAL_NAME = 'USR1'
+  SIGNAL_NAME = 'USR1'
   BASHRC_PATH = "#{File.expand_path('~')}/.bashrc"
 
   def self.new_alias(alias_name, commands, file_path=BASHRC_PATH)
     alias_names = Mkalias.list_alias(file_path)
     return false if alias_names.include?(alias_name)
 
-    commands = commands.join('; ') if commands.kind_of?(Array)
-    commands = commands.tr('#', '$')
+    commands = Mkalias.prepare_commands(commands)
 
     function_name = "mkalias_#{alias_name}"
     bash_function = "function #{function_name}(){ #{commands}; }"
@@ -23,7 +22,7 @@ module Mkalias
       file.puts(bash_function)
     end
 
-    true
+    return true
   end
 
   def self.list_alias(file_path=BASHRC_PATH)
@@ -50,7 +49,7 @@ module Mkalias
     end
 
     alias_commands.select!{ |_, value| !value.nil? }
-    return alias_commands
+    alias_commands
   end
 
   def self.remove_alias(alias_names, file_path=BASHRC_PATH)
@@ -62,36 +61,36 @@ module Mkalias
       removed_alias << alias_name if removed
     end
 
-    return removed_alias
+    removed_alias
   end
 
-	def self.add_signal(file_path=BASHRC_PATH)
-		return false if Mkalias.has_signal?(file_path)
+  def self.add_signal(file_path=BASHRC_PATH)
+    return false if Mkalias.has_signal?(file_path)
 
-		trap_command = "trap 'source #{file_path}' #{SIGNAL_NAME}"
+    trap_command = "trap 'source #{file_path}' #{SIGNAL_NAME}"
     open(file_path, 'a') do |file|
       file.puts("\n")
       file.puts(trap_command)
     end
 
-		true
-	end
+    return true
+  end
 
-	def self.remove_signal(file_path=BASHRC_PATH)
-		return false unless has_signal?(file_path)
+  def self.remove_signal(file_path=BASHRC_PATH)
+    return false unless has_signal?(file_path)
 
-		trap_regex = /\btrap\s'source\s(.*)\sUSR1/
+    trap_regex = /\btrap\s'source\s(.*)\sUSR1/
 
     lines = File.readlines(file_path).reject{ |line| line =~ trap_regex }
     File.open(file_path, "w"){ |f| lines.each { |line| f.puts line } }
 
-		true
-	end
+    return true
+  end
 
-	def self.has_signal?(file_path=BASHRC_PATH)
-		trap_regex = /\btrap\s'source\s(.*)\sUSR1/
-		!File.foreach(file_path).grep(trap_regex).empty?
-	end
+  def self.has_signal?(file_path=BASHRC_PATH)
+    trap_regex = /\btrap\s'source\s(.*)\sUSR1/
+    !File.foreach(file_path).grep(trap_regex).empty?
+  end
 
   def self.get_alias_command(alias_name, file_path=BASHRC_PATH)
     alias_names = Mkalias.list_alias(file_path)
@@ -107,7 +106,7 @@ module Mkalias
         return result.captures.first.split(';').each{ |c| c.strip! } if result
     end
 
-    nil
+    return nil
   end
 
   def self.remove_one_alias(alias_name, file_path=BASHRC_PATH)
@@ -122,4 +121,14 @@ module Mkalias
 
     return true
   end
+
+  def self.prepare_commands(commands)
+    commands = commands.join('; ') if commands.kind_of?(Array)
+    unless commands.include?(';') or commands.include?('#')
+        commands = "#{commands} $@"
+    end
+    commands = commands.tr('#', '$')
+
+    commands
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkalias
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler