Merge remote-tracking branch 'upstream/master' into shorter-case-syntax

.rspec

@@ -1,2 +1,3 @@
 --color
+--fail-fast
 --order random

lib/thor/base.rb

@@ -471,8 +471,12 @@ def handle_argument_error(task, error, arity=nil) #:nodoc:
         msg = "#{basename} #{task.name}"
         if arity
           required = arity < 0 ? (-1 - arity) : arity
-          msg << " requires at least #{required} argument"
-          msg << "s" if required > 1
+          if required == 0
+            msg << " should have no arguments"
+          else
+            msg << " requires at least #{required} argument"
+            msg << "s" if required > 1
+          end
         else
           msg = "call #{msg} as"
         end

thor.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakeweb', '~> 1.3'
   s.add_development_dependency 'rake', '~> 0.9'
   s.add_development_dependency 'rdoc', '~> 3.9'
-  s.add_development_dependency 'rspec', '~> 2.3'
+  s.add_development_dependency 'rspec', '~> 2.11'
   s.add_development_dependency 'simplecov', '~> 0.4'
   s.add_development_dependency 'childlabor'
   s.authors = ['Yehuda Katz', 'José Valim']
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['CHANGELOG.rdoc', 'LICENSE.md', 'README.md', 'Thorfile']
   s.files = `git ls-files`.split("\n")
   s.homepage = 'http://whatisthor.com/'
+  s.licenses = ['MIT']
   s.name = 'thor'
   s.rdoc_options = ['--charset=UTF-8']
   s.require_paths = ['lib']