gem-alias 0.0.2 → 0.0.3

data/README.md

@@ -15,16 +15,17 @@ Add `:aliases` key to your ~/.gemrc and put definitions as a hash.
 Example:
 
 	:aliases:
-	  upgrade = update
-	  ls = list
-	  search = search --remote
+	  upgrade: update
+	  ls: list
+	  lsd: ls -d
+	  rsearch = search --remote
 
 Now you can use them!
 
-	$ gem search rake
-	*** expanding search rake to search --remote rake
-	
-	*** REMOTE GEMS ***
+	$ gem lsd
+    *** expanding lsd to ls -d ***
+    *** expanding ls -d to list -d ***
+    actionmailer (3.2.6)
 	<snip>
 
 Verbose expansion message above can be suppressed with the `:verbose` configuration.
@@ -32,7 +33,8 @@ Verbose expansion message above can be suppressed with the `:verbose` configurat
 You can list the definitions by `gem aliases`:
 
         ls = list
-        search = search --remote
+        lsd = ls -d
+        rsearch = search --remote
         upgrade = update
 
 Note that this list is sorted.
@@ -48,4 +50,4 @@ Note that this list is sorted.
 ## ToDo
 
 * Like normal commands, aliases should also be looked up with shorter, but unambiguous names.
-* Support multi-level expanstion without falling into infinite loop.
+* <del>Support multi-level expanstion without falling into infinite loop.</del>

data/lib/gem-alias/extension.rb

@@ -21,14 +21,20 @@ module Gem
 
     private
 
-    def expand_alias(args)
-      definition = Gem.configuration.aliases[args.first]
+    def expand_alias(args, expansion_count=Hash.new(0))
+      command_name, *rest = args
+      if expansion_count[command_name] > 1
+        say "Alias loop: #{command_name}"
+        terminate_interaction 1
+      end
+      definition = Gem.configuration.aliases[command_name]
       if definition
-        (definition.shellsplit + args[1..-1]).tap do |expanded_args|
-          if Gem.configuration.verbose
-            say "*** expanding #{args.shelljoin} to #{expanded_args.shelljoin}"
-          end
+        expanded_args = definition.shellsplit + rest
+        if Gem.configuration.verbose
+          say "*** expanding #{args.shelljoin} to #{expanded_args.shelljoin} ***"
         end
+        expansion_count[expanded_args.first] += 1
+        expand_alias(expanded_args, expansion_count)
       else
         args
       end

data/lib/gem-alias/version.rb

@@ -2,6 +2,6 @@
 
 module Gem
   module Alias
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-alias
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies: []
 description: ! 'This gem adds alias expansion feature to the ''gem'' command.