Merge pull request #13 from liamg/master

fixed placeholder replacement

src/scripts/alias.coffee

@@ -20,6 +20,7 @@ loadArgumentsInAction = (args, action) ->
 
     for val, i in argItems
       if action.indexOf('$'+(i+1)) > -1 then action = action.replace('$'+(i+1), val) else action += " #{val}"
+
   action = action.replace(/\$\d+/g, "")
   action.trim()
 
@@ -34,7 +35,7 @@ module.exports = (robot) ->
       sp = RegExp.$2
       action = RegExp.$3
 
-      if action && action != 'alias'
+      if action && action.indexOf('alias') != 0
         rest = ''
         for k in Object.keys(table).sort().reverse()
           v = table[k]

test/alias_test.coffee

@@ -47,6 +47,7 @@ describe 'alias', ->
 
   sharedExample = (done, src, dst)->
     adapter.on "send", (envelope, strings)->
+      return if strings[0].indexOf('I made an alias') == 0
       try
         expect(strings).to.have.length(1)
         expect(strings[0]).to.equal dst
@@ -90,6 +91,10 @@ describe 'alias', ->
       it 'appends unused string', (done)->
         sharedExample done, 'hubot params john hello hey', 'goo --name=john --message=hello hey'
 
+    context 'with placeholders in an alias action', ->
+      it 'does not replace placeholders', (done)->
+        sharedExample done, 'hubot alias command=something=$1 other=$2', 'alias command=something=$1 other=$2'
+
     context 'with reverse order placeholders', ->
       it 'replaces alias string', (done)->
         sharedExample done, 'hubot reverse_params john hello hey', 'goo --name=hey --message=john hello'