thor 0.13.1 → 0.13.2

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.13, released 2010-02-03
+
+* Several bug fixes
+* Decoupled Thor::Group and Thor, so it's easier to vendor
+* Added check_unknown_options! in case you want error messages to be raised in valid switches.
+
 == 0.12, released 2010-01-02
 
 * Methods generated by attr_* are automatically not marked as tasks

data/Thorfile

@@ -64,6 +64,6 @@ class Default < Thor
 
     Jeweler::GemcutterTasks.new
   rescue LoadError
-    puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+    puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
   end
 end

data/lib/thor.rb

@@ -120,8 +120,8 @@ class Thor
     #   script = MyScript.new(args, options, config)
     #   script.invoke(:task, first_arg, second_arg, third_arg)
     #
-    def start(given_args=ARGV, config={})
-      super do
+    def start(original_args=ARGV, config={})
+      super do |given_args|
         meth = normalize_task_name(given_args.shift)
         task = all_tasks[meth]
 
@@ -145,8 +145,9 @@ class Thor
     # task_name<String>
     #
     def task_help(shell, task_name)
-      task = all_tasks[task_name]
-      raise UndefinedTaskError, "task '#{task_name}' could not be found in namespace '#{self.namespace}'" unless task
+      meth = normalize_task_name(task_name)
+      task = all_tasks[meth]
+      handle_no_task_error(meth) unless task
 
       shell.say "Usage:"
       shell.say "  #{banner(task)}"
@@ -183,6 +184,10 @@ class Thor
       end
     end
 
+    def handle_argument_error(task, error) #:nodoc:
+      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{task.formatted_usage(self, banner_base == "thor").inspect}."
+    end
+
     protected
 
       # The banner for this class. You can customize it if you are invoking the
@@ -191,8 +196,7 @@ class Thor
       # the namespace should be displayed as arguments.
       #
       def banner(task)
-        base = $thor_runner ? "thor" : File.basename($0.split(" ").first)
-        "#{base} #{task.formatted_usage(self, base == "thor")}"
+        "#{banner_base} #{task.formatted_usage(self, banner_base == "thor")}"
       end
 
       def baseclass #:nodoc:

data/lib/thor/base.rb

@@ -38,9 +38,8 @@ class Thor
     # config<Hash>:: Configuration for this Thor class.
     #
     def initialize(args=[], options={}, config={})
-      Thor::Arguments.parse(self.class.arguments, args).each do |key, value|
-        send("#{key}=", value)
-      end
+      args = Thor::Arguments.parse(self.class.arguments, args)
+      args.each { |key, value| send("#{key}=", value) }
 
       parse_options = self.class.class_options
 
@@ -52,9 +51,9 @@ class Thor
         array_options, hash_options = [], options
       end
 
-      options = Thor::Options.parse(parse_options, array_options)
-      self.options = Thor::CoreExt::HashWithIndifferentAccess.new(options).merge!(hash_options)
-      self.options.freeze
+      opts = Thor::Options.new(parse_options, hash_options)
+      self.options = opts.parse(array_options)
+      opts.check_unknown! if self.class.check_unknown_options?
     end
 
     class << self
@@ -109,6 +108,16 @@ class Thor
         no_tasks { super }
       end
 
+      # If you want to raise an error for unknown options, call check_unknown_options!
+      # This is disabled by default to allow dynamic invocations.
+      def check_unknown_options!
+        @check_unknown_options = true
+      end
+
+      def check_unknown_options? #:nodoc:
+        @check_unknown_options || false
+      end
+
       # Adds an argument to the class and creates an attr_accessor for it.
       #
       # Arguments are different from options in several aspects. The first one
@@ -355,7 +364,7 @@ class Thor
       def namespace(name=nil)
         case name
           when nil
-            @namespace ||= Thor::Util.namespace_from_thor_class(self, false)
+            @namespace ||= Thor::Util.namespace_from_thor_class(self)
           else
             @namespace = name.to_s
         end
@@ -366,14 +375,18 @@ class Thor
       def start(given_args=ARGV, config={})
         self.debugging = given_args.include?("--debug")
         config[:shell] ||= Thor::Base.shell.new
-        yield
+        yield(given_args.dup)
       rescue Thor::Error => e
-        if debugging
-          raise e
+        debugging ? (raise e) : config[:shell].error(e.message)
+        exit(1) if exit_on_failure?
+      end
+
+      def handle_no_task_error(task) #:nodoc:
+        if self.banner_base == "thor"
+          raise UndefinedTaskError, "Could not find task #{task.inspect} in #{namespace.inspect} namespace."
         else
-          config[:shell].error e.message
+          raise UndefinedTaskError, "Could not find task #{task.inspect}."
         end
-        exit(1) if exit_on_failure?
       end
 
       protected
@@ -419,7 +432,6 @@ class Thor
         end
 
         # Raises an error if the word given is a Thor reserved word.
-        #
         def is_thor_reserved_word?(word, type) #:nodoc:
           return false unless THOR_RESERVED_WORDS.include?(word.to_s)
           raise "#{word.inspect} is a Thor reserved word and cannot be defined as #{type}"
@@ -430,7 +442,6 @@ class Thor
         # ==== Parameters
         # name<Symbol>:: The name of the argument.
         # options<Hash>:: Described in both class_option and method_option.
-        #
         def build_option(name, options, scope) #:nodoc:
           scope[name] = Thor::Option.new(name, options[:desc], options[:required],
                                                options[:type], options[:default], options[:banner],
@@ -444,7 +455,6 @@ class Thor
         #
         # ==== Parameters
         # Hash[Symbol => Object]
-        #
         def build_options(options, scope) #:nodoc:
           options.each do |key, value|
             scope[key] = Thor::Option.parse(key, value)
@@ -454,7 +464,6 @@ class Thor
         # Finds a task with the given name. If the task belongs to the current
         # class, just return it, otherwise dup it and add the fresh copy to the
         # current task hash.
-        #
         def find_and_refresh_task(name) #:nodoc:
           task = if task = tasks[name.to_s]
             task
@@ -467,14 +476,12 @@ class Thor
 
         # Everytime someone inherits from a Thor class, register the klass
         # and file into baseclass.
-        #
         def inherited(klass)
           Thor::Base.register_klass_file(klass)
         end
 
         # Fire this callback whenever a method is added. Added methods are
         # tracked as tasks by invoking the create_task method.
-        #
         def method_added(meth)
           meth = meth.to_s
 
@@ -495,7 +502,6 @@ class Thor
 
         # Retrieves a value from superclass. If it reaches the baseclass,
         # returns default.
-        #
         def from_superclass(method, default=nil)
           if self == baseclass || !superclass.respond_to?(method, true)
             default
@@ -506,11 +512,15 @@ class Thor
         end
 
         # A flag that makes the process exit with status 1 if any error happens.
-        #
         def exit_on_failure?
           false
         end
 
+        # Returns the base for banner.
+        def banner_base
+          @banner_base ||= $thor_runner ? "thor" : File.basename($0.split(" ").first)
+        end
+
         # SIGNATURE: Sets the baseclass. This is where the superclass lookup
         # finishes.
         def baseclass #:nodoc:

data/lib/thor/error.rb

@@ -19,6 +19,9 @@ class Thor
   class InvocationError < Error
   end
 
+  class UnknownArgumentError < Error
+  end
+
   class RequiredArgumentMissingError < InvocationError
   end
 

data/lib/thor/group.rb

@@ -25,8 +25,8 @@ class Thor::Group
     # Start works differently in Thor::Group, it simply invokes all tasks
     # inside the class.
     #
-    def start(given_args=ARGV, config={})
-      super do
+    def start(original_args=ARGV, config={})
+      super do |given_args|
         if Thor::HELP_MAPPINGS.include?(given_args.first)
           help(config[:shell])
           return
@@ -219,14 +219,16 @@ class Thor::Group
       [item]
     end
 
+    def handle_argument_error(task, error) #:nodoc:
+      raise error, "#{task.name.inspect} was called incorrectly. Are you sure it has arity equals to 0?"
+    end
+
     protected
 
       # The banner for this class. You can customize it if you are invoking the
       # thor class by another ways which is not the Thor::Runner.
-      #
       def banner
-        base = $thor_runner ? "thor" : File.basename($0.split(" ").first)
-        "#{base} #{self_task.formatted_usage(self, false)}"
+        "#{banner_base} #{self_task.formatted_usage(self, false)}"
       end
 
       # Represents the whole class as a task.

data/lib/thor/invocation.rb

@@ -5,21 +5,20 @@ class Thor
     end
 
     module ClassMethods
-      # Prepare for class methods invocations. This method must return a klass to
-      # have the invoked class options showed in help messages in generators.
-      #
+      # This method is responsible for receiving a name and find the proper
+      # class and task for it. The key is an optional parameter which is
+      # available only in class methods invocations (i.e. in Thor::Group).
       def prepare_for_invocation(key, name) #:nodoc:
         case name
           when Symbol, String
-            Thor::Util.namespace_to_thor_class_and_task(name.to_s, false)
+            Thor::Util.find_class_and_task_by_namespace(name.to_s)
           else
             name
         end
       end
     end
 
-    # Make initializer aware of invocations and the initializer proc.
-    #
+    # Make initializer aware of invocations and the initialization args.
     def initialize(args=[], options={}, config={}, &block) #:nodoc:
       @_invocations = config[:invocations] || Hash.new { |h,k| h[k] = [] }
       @_initializer = [ args, options, config ]
@@ -34,6 +33,8 @@ class Thor
     # the task to be invoked, if none is given, the same values used to
     # initialize the invoker are used to initialize the invoked.
     #
+    # When no name is given, it will invoke the default task of the current class.
+    #
     # ==== Examples
     #
     #   class A < Thor
@@ -92,9 +93,9 @@ class Thor
     #
     #   invoke Rspec::RR, [], :style => :foo
     #
-    def invoke(name=nil, task=nil, args=nil, opts=nil, config=nil)
-      task, args, opts, config = nil, task, args, opts if task.nil? || task.is_a?(Array)
-      args, opts, config = nil, args, opts if args.is_a?(Hash)
+    def invoke(name=nil, *args)
+      args.unshift(nil) if Array === args.first || NilClass === args.first
+      task, args, opts, config = args
 
       object, task    = _prepare_for_invocation(name, task)
       klass, instance = _initialize_klass_with_initializer(object, args, opts, config)
@@ -121,15 +122,13 @@ class Thor
     protected
 
       # Configuration values that are shared between invocations.
-      #
       def _shared_configuration #:nodoc:
         { :invocations => @_invocations }
       end
 
-      # Prepare for invocation in the instance level. In this case, we have to
-      # take into account that a just a task name from the current class was
-      # given or even a Thor::Task object.
-      #
+      # This method can receive several different types of arguments and it's then
+      # responsible to normalize them by returning the object where the task should
+      # be invoked and a Thor::Task object.
       def _prepare_for_invocation(name, sent_task=nil) #:nodoc:
         if name.is_a?(Thor::Task)
           task = name
@@ -147,18 +146,16 @@ class Thor
 
       # Check if the object given is a Thor class object and get a task object
       # for it.
-      #
       def _validate_task(object, task) #:nodoc:
         klass = object.is_a?(Class) ? object : object.class
         raise "Expected Thor class, got #{klass}" unless klass <= Thor::Base
 
-        task ||= klass.default_task if klass <= Thor
+        task ||= klass.default_task if klass.respond_to?(:default_task)
         task = klass.all_tasks[task.to_s] || Thor::Task::Dynamic.new(task) if task && !task.is_a?(Thor::Task)
         task
       end
 
       # Initialize klass using values stored in the @_initializer.
-      #
       def _initialize_klass_with_initializer(object, args, opts, config) #:nodoc:
         if object.is_a?(Class)
           klass = object

data/lib/thor/parser/arguments.rb

@@ -16,8 +16,9 @@ class Thor
       return arguments, args[Range.new(arguments.size, -1)]
     end
 
-    def self.parse(base, args)
-      new(base).parse(args)
+    def self.parse(*args)
+      to_parse = args.pop
+      new(*args).parse(to_parse)
     end
 
     # Takes an array of Thor::Argument objects.
@@ -116,7 +117,7 @@ class Thor
         return shift if peek.is_a?(Numeric)
 
         unless peek =~ NUMERIC && $& == peek
-          raise MalformattedArgumentError, "expected numeric value for '#{name}'; got #{peek.inspect}"
+          raise MalformattedArgumentError, "Expected numeric value for '#{name}'; got #{peek.inspect}"
         end
 
         $&.index('.') ? shift.to_f : shift.to_i
@@ -137,7 +138,7 @@ class Thor
           end.join("', '")
 
           class_name = self.class.name.split('::').last.downcase
-          raise RequiredArgumentMissingError, "no value provided for required #{class_name} '#{names}'"
+          raise RequiredArgumentMissingError, "No value provided for required #{class_name} '#{names}'"
         end
       end
 

data/lib/thor/parser/option.rb

@@ -55,10 +55,6 @@ class Thor
             value
           elsif required = (value == :required)
             :string
-          elsif value == :optional
-            # TODO Remove this warning in the future.
-            warn "Optional type is deprecated. Choose :boolean or :string instead. Assumed to be :boolean."
-            :boolean
           end
         when TrueClass, FalseClass
           :boolean

data/lib/thor/parser/options.rb

@@ -10,7 +10,6 @@ class Thor
     SHORT_NUM   = /^(-[a-z])#{NUMERIC}$/i
 
     # Receives a hash and makes it switches.
-    #
     def self.to_switches(options)
       options.map do |key, value|
         case value
@@ -28,12 +27,18 @@ class Thor
       end.join(" ")
     end
 
-    # Takes a hash of Thor::Option objects.
-    #
-    def initialize(options={})
-      options = options.values
+    # Takes a hash of Thor::Option and a hash with defaults.
+    def initialize(hash_options={}, defaults={})
+      options = hash_options.values
       super(options)
-      @shorts, @switches = {}, {}
+
+      # Add defaults
+      defaults.each do |key, value|
+        @assigns[key.to_s] = value
+        @non_assigned_required.delete(hash_options[key])
+      end
+
+      @shorts, @switches, @unknown = {}, {}, []
 
       options.each do |option|
         @switches[option.switch_name] = option
@@ -61,16 +66,24 @@ class Thor
           end
 
           switch = normalize_switch(switch)
-          next unless option = switch_option(switch)
-
+          option = switch_option(switch)
           @assigns[option.human_name] = parse_peek(switch, option)
+        elsif peek =~ /^\-/
+          @unknown << shift
         else
           shift
         end
       end
 
       check_requirement!
-      @assigns
+
+      assigns = Thor::CoreExt::HashWithIndifferentAccess.new(@assigns)
+      assigns.freeze
+      assigns
+    end
+
+    def check_unknown!
+      raise UnknownArgumentError, "Unknown switches '#{@unknown.join(', ')}'" unless @unknown.empty?
     end
 
     protected
@@ -130,7 +143,7 @@ class Thor
           elsif option.string? && !option.required?
             return option.human_name # Return the option name
           else
-            raise MalformattedArgumentError, "no value provided for option '#{switch}'"
+            raise MalformattedArgumentError, "No value provided for option '#{switch}'"
           end
         end
 

data/lib/thor/runner.rb

@@ -16,8 +16,7 @@ class Thor::Runner < Thor #:nodoc:
   def help(meth=nil)
     if meth && !self.respond_to?(meth)
       initialize_thorfiles(meth)
-      klass, task = Thor::Util.namespace_to_thor_class_and_task(meth)
-      # Send mapping -h because it works with Thor::Group too
+      klass, task = Thor::Util.find_class_and_task_by_namespace!(meth)
       klass.start(["-h", task].compact, :shell => self.shell)
     else
       super
@@ -30,9 +29,9 @@ class Thor::Runner < Thor #:nodoc:
   def method_missing(meth, *args)
     meth = meth.to_s
     initialize_thorfiles(meth)
-    klass, task = Thor::Util.namespace_to_thor_class_and_task(meth)
+    klass, task = Thor::Util.find_class_and_task_by_namespace!(meth)
     args.unshift(task) if task
-    klass.start(args, :shell => shell)
+    klass.start(args, :shell => self.shell)
   end
 
   desc "install NAME", "Install an optionally named Thor file into your system tasks"

data/lib/thor/task.rb

@@ -9,10 +9,11 @@ class Thor
       end
 
       def run(instance, args=[])
-        unless (instance.methods & [name.to_s, name.to_sym]).empty?
-          raise Error, "could not find Thor class or task '#{name}'"
+        if (instance.methods & [name.to_s, name.to_sym]).empty?
+          super
+        else
+          instance.class.handle_no_task_error(name)
         end
-        super
       end
     end
 
@@ -28,14 +29,14 @@ class Thor
     # By default, a task invokes a method in the thor class. You can change this
     # implementation to create custom tasks.
     def run(instance, args=[])
-      raise UndefinedTaskError, "the '#{name}' task of #{instance.class} is private" unless public_method?(instance)
-      instance.send(name, *args)
+      public_method?(instance) ?
+        instance.send(name, *args) : instance.class.handle_no_task_error(name)
     rescue ArgumentError => e
-      raise e if instance.class.respond_to?(:debugging) && instance.class.debugging
-      parse_argument_error(instance, e, caller)
+      handle_argument_error?(instance, e, caller) ?
+        instance.class.handle_argument_error(self, e) : (raise e)
     rescue NoMethodError => e
-      raise e if instance.class.respond_to?(:debugging) && instance.class.debugging
-      parse_no_method_error(instance, e)
+      handle_no_method_error?(instance, e, caller) ?
+        instance.class.handle_no_task_error(name) : (raise e)
     end
 
     # Returns the formatted usage by injecting given required arguments 
@@ -68,6 +69,10 @@ class Thor
 
     protected
 
+      def not_debugging?(instance)
+        !(instance.class.respond_to?(:debugging) && instance.class.debugging)
+      end
+
       def required_options
         @required_options ||= options.map{ |_, o| o.usage if o.required? }.compact.sort.join(" ")
       end
@@ -83,28 +88,14 @@ class Thor
         saned -= caller
       end
 
-      def parse_argument_error(instance, e, caller) #:nodoc:
-        backtrace = sans_backtrace(e.backtrace, caller)
-
-        if backtrace.empty? && e.message =~ /wrong number of arguments/
-          if instance.is_a?(Thor::Group)
-            raise e, "'#{name}' was called incorrectly. Are you sure it has arity equals to 0?"
-          else
-            raise InvocationError, "'#{name}' was called incorrectly. Call as " <<
-                                   "'#{formatted_usage(instance.class)}'"
-          end
-        else
-          raise e
-        end
+      def handle_argument_error?(instance, error, caller)
+        not_debugging?(instance) && error.message =~ /wrong number of arguments/ &&
+          sans_backtrace(error.backtrace, caller).empty?
       end
 
-      def parse_no_method_error(instance, e) #:nodoc:
-        if e.message =~ /^undefined method `#{name}' for #{Regexp.escape(instance.to_s)}$/
-          raise UndefinedTaskError, "The #{instance.class.namespace} namespace " <<
-                                    "doesn't have a '#{name}' task"
-        else
-          raise e
-        end
+      def handle_no_method_error?(instance, error, caller)
+        not_debugging?(instance) &&
+          error.message =~ /^undefined method `#{name}' for #{Regexp.escape(instance.to_s)}$/
       end
 
   end

data/lib/thor/util.rb

@@ -23,10 +23,7 @@ class Thor
     #
     def self.find_by_namespace(namespace)
       namespace = "default#{namespace}" if namespace.empty? || namespace =~ /^:/
-
-      Thor::Base.subclasses.find do |klass|
-        klass.namespace == namespace
-      end
+      Thor::Base.subclasses.find { |klass| klass.namespace == namespace }
     end
 
     # Receives a constant and converts it to a Thor namespace. Since Thor tasks
@@ -43,10 +40,9 @@ class Thor
     # ==== Returns
     # String:: If we receive Foo::Bar::Baz it returns "foo:bar:baz"
     #
-    def self.namespace_from_thor_class(constant, remove_default=true)
+    def self.namespace_from_thor_class(constant)
       constant = constant.to_s.gsub(/^Thor::Sandbox::/, "")
       constant = snake_case(constant).squeeze(":")
-      constant.gsub!(/^default/, '') if remove_default
       constant
     end
 
@@ -132,13 +128,7 @@ class Thor
     # ==== Parameters
     # namespace<String>
     #
-    # ==== Errors
-    # Thor::Error:: raised if the namespace cannot be found.
-    #
-    # Thor::Error:: raised if the namespace evals to a class which does not
-    #               inherit from Thor or Thor::Group.
-    #
-    def self.namespace_to_thor_class_and_task(namespace, raise_if_nil=true)
+    def self.find_class_and_task_by_namespace(namespace)
       if namespace.include?(?:)
         pieces = namespace.split(":")
         task   = pieces.pop
@@ -149,7 +139,14 @@ class Thor
         klass, task = Thor::Util.find_by_namespace(namespace), nil
       end
 
-      raise Error, "could not find Thor class or task '#{namespace}'" if raise_if_nil && klass.nil?
+      return klass, task
+    end
+
+    # The same as namespace_to_thor_class_and_task!, but raises an error if a klass
+    # could not be found.
+    def self.find_class_and_task_by_namespace!(namespace)
+      klass, task = find_class_and_task_by_namespace(namespace)
+      raise Error, "Could not find namespace or task #{namespace.inspect}." unless klass
       return klass, task
     end
 

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.13.1".freeze
+  VERSION = "0.13.2".freeze
 end

data/spec/base_spec.rb

@@ -230,22 +230,34 @@ describe Thor::Base do
     it "raises an error instead of rescueing if --debug is given" do
       lambda {
         MyScript.start ["what", "--debug"]
-      }.must raise_error(Thor::UndefinedTaskError, /the 'what' task of MyScript is private/)
+      }.must raise_error(Thor::UndefinedTaskError, 'Could not find task "what" in "my_script" namespace.')
+    end
+
+    it "does not steal args" do
+      args = ["foo", "bar", "--force", "true"]
+      MyScript.start(args)
+      args.must == ["foo", "bar", "--force", "true"]
+    end
+
+    it "checks unknown options" do
+      capture(:stderr) {
+        MyScript.start(["foo", "bar", "--force", "true", "--unknown", "baz"])
+      }.strip.must == "Unknown switches '--unknown'"
     end
   end
 
   describe "attr_*" do
     it "should not add attr_reader as a task" do
-      capture(:stderr){ MyScript.start(["another_attribute"]) }.must =~ /could not find/
+      capture(:stderr){ MyScript.start(["another_attribute"]) }.must =~ /Could not find/
     end
 
     it "should not add attr_writer as a task" do
-      capture(:stderr){ MyScript.start(["another_attribute=", "foo"]) }.must =~ /could not find/
+      capture(:stderr){ MyScript.start(["another_attribute=", "foo"]) }.must =~ /Could not find/
     end
 
     it "should not add attr_accessor as a task" do
-      capture(:stderr){ MyScript.start(["some_attribute"]) }.must =~ /could not find/
-      capture(:stderr){ MyScript.start(["some_attribute=", "foo"]) }.must =~ /could not find/
+      capture(:stderr){ MyScript.start(["some_attribute"]) }.must =~ /Could not find/
+      capture(:stderr){ MyScript.start(["some_attribute=", "foo"]) }.must =~ /Could not find/
     end
   end
 end

data/spec/fixtures/script.thor

@@ -1,4 +1,6 @@
 class MyScript < Thor
+  check_unknown_options!
+
   attr_accessor :some_attribute
   attr_writer :another_attribute
   attr_reader :another_attribute
@@ -53,6 +55,10 @@ END
   def long_description
   end
 
+  desc "name-with-dashes", "Ensure normalization of task names"
+  def name_with_dashes
+  end
+
   method_options :all => :boolean
   desc "with_optional NAME", "invoke with optional name"
   def with_optional(name=nil)

data/spec/parser/arguments_spec.rb

@@ -42,7 +42,7 @@ describe Thor::Arguments do
 
       it "and required arguments raises an error" do
         create :string => nil, :numeric => nil
-        lambda { parse }.must raise_error(Thor::RequiredArgumentMissingError, "no value provided for required arguments 'string', 'numeric'")
+        lambda { parse }.must raise_error(Thor::RequiredArgumentMissingError, "No value provided for required arguments 'string', 'numeric'")
       end
 
       it "and default arguments returns default values" do

data/spec/parser/option_spec.rb

@@ -35,16 +35,6 @@ describe Thor::Option do
         end
       end
 
-      describe "equals to :optional" do
-        it "has type equals to :boolean" do
-          capture(:stderr){ parse(:foo, :optional).type.must == :boolean }
-        end
-
-        it "has no default value" do
-          capture(:stderr){ parse(:foo, :optional).default.must be_nil }
-        end
-      end
-
       describe "and symbol is not a reserved key" do
         it "has type equals to :string" do
           parse(:foo, :bar).type.must == :string

data/spec/parser/options_spec.rb

@@ -2,18 +2,22 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'thor/parser'
 
 describe Thor::Options do
-  def create(opts)
+  def create(opts, defaults={})
     opts.each do |key, value|
       opts[key] = Thor::Option.parse(key, value) unless value.is_a?(Thor::Option)
     end
 
-    @opt = Thor::Options.new(opts)
+    @opt = Thor::Options.new(opts, defaults)
   end
 
   def parse(*args)
     @opt.parse(args.flatten)
   end
 
+  def check_unknown!
+    @opt.check_unknown!
+  end
+
   describe "#to_switches" do
     it "turns true values into a flag" do
       Thor::Options.to_switches(:color => true).must == "--color"
@@ -81,7 +85,23 @@ describe Thor::Options do
 
     it "returns the default value if none is provided" do
       create :foo => "baz", :bar => :required
-      parse("--bar=boom")["foo"].must == "baz"
+      parse("--bar", "boom")["foo"].must == "baz"
+    end
+
+    it "returns the default value from defaults hash to required arguments" do
+      create Hash[:bar => :required], Hash[:bar => "baz"]
+      parse["bar"].must == "baz"
+    end
+
+    it "gives higher priority to defaults given in the hash" do
+      create Hash[:bar => true], Hash[:bar => false]
+      parse["bar"].must == false
+    end
+
+    it "raises an error for unknown switches" do
+      create :foo => "baz", :bar => :required
+      parse("--bar", "baz", "--baz", "unknown")
+      lambda { check_unknown! }.must raise_error(Thor::UnknownArgumentError, "Unknown switches '--baz'")
     end
 
     describe "with no input" do
@@ -97,7 +117,7 @@ describe Thor::Options do
 
       it "and a required switch raises an error" do
         create "--foo" => :required
-        lambda { parse }.must raise_error(Thor::RequiredArgumentMissingError, "no value provided for required options '--foo'")
+        lambda { parse }.must raise_error(Thor::RequiredArgumentMissingError, "No value provided for required options '--foo'")
       end
     end
 
@@ -247,7 +267,7 @@ describe Thor::Options do
 
       it "raises error when value isn't numeric" do
         lambda { parse("-n", "foo") }.must raise_error(Thor::MalformattedArgumentError,
-          "expected numeric value for '-n'; got \"foo\"")
+          "Expected numeric value for '-n'; got \"foo\"")
       end
     end
 

data/spec/runner_spec.rb

@@ -32,7 +32,7 @@ describe Thor::Runner do
     it "raises error if a class/task cannot be found" do
       Thor::Runner.should_receive(:exit).with(1)
       content = capture(:stderr){ Thor::Runner.start(["help", "unknown"]) }
-      content.must =~ /could not find Thor class or task 'unknown'/
+      content.strip.must == 'Could not find namespace or task "unknown".'
     end
   end
 
@@ -70,7 +70,8 @@ describe Thor::Runner do
     it "raises an error if class/task can't be found" do
       Thor::Runner.should_receive(:exit).with(1)
       ARGV.replace ["unknown"]
-      capture(:stderr){ Thor::Runner.start }.must =~ /could not find Thor class or task 'unknown'/
+      content = capture(:stderr){ Thor::Runner.start }
+      content.strip.must == 'Could not find namespace or task "unknown".'
     end
 
     it "does not swallow NoMethodErrors that occur inside the called method" do
@@ -85,7 +86,8 @@ describe Thor::Runner do
 
     it "does not swallow Thor InvocationError" do
       ARGV.replace ["my_script:animal"]
-      capture(:stderr) { Thor::Runner.start }.must =~ /'animal' was called incorrectly\. Call as 'my_script:animal TYPE'/
+      content = capture(:stderr) { Thor::Runner.start }
+      content.strip.must == '"animal" was called incorrectly. Call as "my_script:animal TYPE".'
     end
   end
 

data/spec/task_spec.rb

@@ -38,9 +38,9 @@ describe Thor::Task do
     end
 
     it "does not invoke an existing method" do
-      lambda {
-        Thor::Task::Dynamic.new('to_s').run([])
-      }.must raise_error(Thor::Error, "could not find Thor class or task 'to_s'")
+      mock = mock()
+      mock.class.should_receive(:handle_no_task_error).with("to_s")
+      Thor::Task::Dynamic.new('to_s').run(mock)
     end
   end
 
@@ -62,9 +62,8 @@ describe Thor::Task do
     it "raises an error if the method to be invoked is private" do
       mock = mock()
       mock.should_receive(:private_methods).and_return(['can_has'])
-      lambda {
-        task.run(mock)
-      }.must raise_error(Thor::UndefinedTaskError, "the 'can_has' task of Spec::Mocks::Mock is private")
+      mock.class.should_receive(:handle_no_task_error).with("can_has")
+      task.run(mock)
     end
   end
 end

data/spec/thor_spec.rb

@@ -112,11 +112,11 @@ describe Thor do
     end
 
     it "raises an error if a required param is not provided" do
-      capture(:stderr) { MyScript.start(["animal"]) }.must =~ /'animal' was called incorrectly\. Call as 'my_script:animal TYPE'/
+      capture(:stderr) { MyScript.start(["animal"]) }.strip.must == '"animal" was called incorrectly. Call as "my_script:animal TYPE".'
     end
 
     it "raises an error if the invoked task does not exist" do
-      capture(:stderr) { Amazing.start(["animal"]) }.must =~ /The amazing namespace doesn't have a 'animal' task/
+      capture(:stderr) { Amazing.start(["animal"]) }.strip.must == 'Could not find task "animal" in "amazing" namespace.'
     end
 
     it "calls method_missing if an unknown method is passed in" do
@@ -124,7 +124,7 @@ describe Thor do
     end
 
     it "does not call a private method no matter what" do
-      capture(:stderr) { MyScript.start(["what"]) }.must =~ /the 'what' task of MyScript is private/
+      capture(:stderr) { MyScript.start(["what"]) }.strip.must == 'Could not find task "what" in "my_script" namespace.'
     end
 
     it "uses task default options" do
@@ -200,7 +200,11 @@ END
       it "raises an error if the task can't be found" do
         lambda {
           MyScript.task_help(shell, "unknown")
-        }.must raise_error(Thor::Error, "task 'unknown' could not be found in namespace 'my_script'")
+        }.must raise_error(Thor::UndefinedTaskError, 'Could not find task "unknown" in "my_script" namespace.')
+      end
+
+      it "normalizes names before claiming they don't exist" do
+        capture(:stdout) { MyScript.task_help(shell, "name-with-dashes") }.must =~ /thor my_script:name-with-dashes/
       end
     end
 

data/spec/util_spec.rb

@@ -38,11 +38,6 @@ describe Thor::Util do
       Thor::Util.namespace_from_thor_class("FooBar::BarBaz::BazBoom").must == "foo_bar:bar_baz:baz_boom"
     end
 
-    it "gets rid of an initial Default module" do
-      Thor::Util.namespace_from_thor_class("Default::Foo::Bar").must == ":foo:bar"
-      Thor::Util.namespace_from_thor_class("Default").must == ""
-    end
-
     it "accepts class and module objects" do
       Thor::Util.namespace_from_thor_class(Thor::CoreExt::OrderedHash).must == "thor:core_ext:ordered_hash"
       Thor::Util.namespace_from_thor_class(Thor::Util).must == "thor:util"
@@ -92,30 +87,30 @@ describe Thor::Util do
     end
   end
 
-  describe "#namespace_to_thor_class_and_task" do
+  describe "#find_class_and_task_by_namespace" do
     it "returns a Thor::Group class if full namespace matches" do
-      Thor::Util.namespace_to_thor_class_and_task("my_counter").must == [MyCounter, nil]
+      Thor::Util.find_class_and_task_by_namespace("my_counter").must == [MyCounter, nil]
     end
 
     it "returns a Thor class if full namespace matches" do
-      Thor::Util.namespace_to_thor_class_and_task("thor").must == [Thor, nil]
+      Thor::Util.find_class_and_task_by_namespace("thor").must == [Thor, nil]
     end
 
     it "returns a Thor class and the task name" do
-      Thor::Util.namespace_to_thor_class_and_task("thor:help").must == [Thor, "help"]
+      Thor::Util.find_class_and_task_by_namespace("thor:help").must == [Thor, "help"]
     end
 
     it "fallbacks in the namespace:task look up even if a full namespace does not match" do
       Thor.const_set(:Help, Module.new)
-      Thor::Util.namespace_to_thor_class_and_task("thor:help").must == [Thor, "help"]
+      Thor::Util.find_class_and_task_by_namespace("thor:help").must == [Thor, "help"]
       Thor.send :remove_const, :Help
     end
 
     describe 'errors' do
       it "raises an error if the Thor class or task can't be found" do
         lambda {
-          Thor::Util.namespace_to_thor_class_and_task("foobar")
-        }.must raise_error(Thor::Error, "could not find Thor class or task 'foobar'")
+          Thor::Util.find_class_and_task_by_namespace!("foobar")
+        }.must raise_error(Thor::Error, 'Could not find namespace or task "foobar".')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: []