Merge remote-tracking branch 'origin/master'

Author: jhs

Rakefile

@@ -36,7 +36,7 @@ task :default => :build
 
 desc "Clean everything"
 task :clean do
-  rm "-rf", BUILD, "#{HERE}/test/browserify/browserified.js", "#{HERE}/test/browserify/node_modules"
+  rm_cmd "-rf", BUILD, "#{HERE}/test/browserify/browserified.js", "#{HERE}/test/browserify/node_modules"
 end
 
 desc "Build all package types"
@@ -220,7 +220,7 @@ generated code into a tag, then clean up in a subsequent commit.
  3. ver=v$(node -e 'console.log(require("./package.json").version)'); echo "Tag: $ver"
  4. git add -f dist/ && git commit -m "Code release"
  5. git tag -a "$ver" -m some_tag_message
- 6. git push origin "$ver:/refs/tags/$ver"
+ 6. git push origin && git push origin --tags
  7. npm publish
  8. Edit package.json and bump the version
  9. git rm -r dist/
@@ -232,7 +232,7 @@ end
 # Helpers
 #
 
-def rm(*opts)
+def rm_cmd(*opts)
   opts.unshift "-v" # Potentially remove this for platforms without rm -v
   sh "rm", *opts
 end

package.json

@@ -1,5 +1,5 @@
 { "name": "browser-request"
-, "version"     : "0.2.1"
+, "version"     : "0.2.2"
 , "author"      : { "name": "Jason Smith" , "email": "[email protected]" }
 , "description" : "Browser port of the Node.js 'request' package"
 , "keywords"    : ["request", "http", "browser", "ender", "browserify"]