josevalim-thor 0.10.21 → 0.10.22

data/lib/thor/actions.rb

@@ -142,6 +142,7 @@ class Thor
     #   chmod "script/*", 0755
     #
     def chmod(path, mode, log_status=true)
+      return unless behavior == :invoke
       path = File.expand_path(path, root)
       say_status :chmod, relative_to_absolute_root(path), log_status
       FileUtils.chmod_R(mode, path) unless options[:pretend]
@@ -161,6 +162,7 @@ class Thor
     #   end
     #
     def run(command, log_status=true)
+      return unless behavior == :invoke
       say_status :run, "#{command} from #{relative_to_absolute_root(root, false)}", log_status
       `#{command}` unless options[:pretend]
     end
@@ -218,6 +220,7 @@ class Thor
     #   remove_file 'app/controllers/application_controller.rb'
     #
     def remove_file(path, log_status=true)
+      return unless behavior == :invoke
       path = File.expand_path(path, root)
       say_status :remove, relative_to_absolute_root(path), log_status
 
@@ -242,6 +245,7 @@ class Thor
     #   end
     #
     def gsub_file(path, flag, *args, &block)
+      return unless behavior == :invoke
       log_status = args.last.is_a?(Symbol) || [ true, false ].include?(args.last) ? args.pop : true
 
       path = File.expand_path(path, root)
@@ -267,9 +271,9 @@ class Thor
     #   append_file 'config/environments/test.rb', 'config.gem "rspec"'
     #
     def append_file(path, data=nil, log_status=true, &block)
+      return unless behavior == :invoke
       path = File.expand_path(path, root)
       say_status :append, relative_to_absolute_root(path), log_status
-
       File.open(path, 'ab') { |file| file.write(data || block.call) } unless options[:pretend]
     end
 
@@ -286,6 +290,7 @@ class Thor
     #   prepend_file 'config/environments/test.rb', 'config.gem "rspec"'
     #
     def prepend_file(path, data=nil, log_status=true, &block)
+      return unless behavior == :invoke
       path = File.expand_path(path, root)
       say_status :prepend, relative_to_absolute_root(path), log_status
 

data/lib/thor/base.rb

@@ -35,36 +35,19 @@ class Thor
         send("#{key}=", value)
       end
 
-      if options.is_a?(Array)
-        task_options  = config.delete(:task_options)
-        parse_options = self.class.class_options
-        parse_options = parse_options.merge(task_options) if task_options
+      parse_options = self.class.class_options
 
-        options = Thor::Options.parse(parse_options, options)
-        _set_default_options(options, task_options) if task_options
+      options = if options.is_a?(Array)
+        task_options  = config.delete(:task_options) # hook for start
+        parse_options = parse_options.merge(task_options) if task_options
+        Thor::Options.parse(parse_options, options)
+      else
+        Thor::Options.parse(parse_options, []).merge(options)
       end
 
-      _set_default_options(options, self.class.class_options)
       self.options = Thor::CoreExt::HashWithIndifferentAccess.new(options).freeze
     end
 
-    protected
-
-      # Receives a hash of options, stringify keys and merge with default
-      # values from thor options.
-      #
-      def _set_default_options(options, default_options)
-        options.each_key do |key|
-          next unless key.is_a?(Symbol)
-          options[key.to_s] = options.delete(key)
-        end
-
-        default_options.each do |key, option|
-          next if option.default.nil? || options.key?(option.human_name.to_s)
-          options[option.human_name.to_s] ||= option.default
-        end
-      end
-
     class << self
       def included(base) #:nodoc:
         base.send :extend,  ClassMethods
@@ -178,7 +161,7 @@ class Thor
 
       # Adds a bunch of options to the set of class options.
       #
-      #   class_options :foo => :optional, :bar => :required, :baz => :string
+      #   class_options :foo => false, :bar => :required, :baz => :string
       #
       # If you prefer more detailed declaration, check class_option.
       #
@@ -200,11 +183,10 @@ class Thor
       # ==== Options
       # :desc     - Description for the argument.
       # :required - If the argument is required or not.
-      # :default  - Default value for this argument. It cannot be required and have default values.
+      # :default  - Default value for this argument.
       # :group    - The group for this options. Use by class options to output options in different levels.
       # :aliases  - Aliases for this option.
-      # :type     - The type of the argument, can be :string, :hash, :array, :numeric, :boolean or :default.
-      #             Default accepts arguments as booleans (--switch) or as strings (--switch=VALUE).
+      # :type     - The type of the argument, can be :string, :hash, :array, :numeric or :boolean.
       # :banner   - String to show on usage notes.
       #
       def class_option(name, options)
@@ -433,7 +415,7 @@ class Thor
         # Receives a hash of options, parse them and add to the scope. This is a
         # fast way to set a bunch of options:
         #
-        #   build_options :foo => :optional, :bar => :required, :baz => :string
+        #   build_options :foo => true, :bar => :required, :baz => :string
         #
         # ==== Parameters
         # Hash[Symbol => Object]

data/lib/thor/invocation.rb

@@ -76,9 +76,10 @@ 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.is_a?(Array)
-      object, task = _setup_for_invoke(name, task)
+      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)
 
+      object, task = _setup_for_invoke(name, task)
       if object.is_a?(Class)
         klass = object
 

data/lib/thor/parser/argument.rb

@@ -9,15 +9,16 @@ class Thor
       class_name = self.class.name.split("::").last
 
       raise ArgumentError, "#{class_name} name can't be nil."                         if name.nil?
-      raise ArgumentError, "#{class_name} cannot be required and have default value." if required && !default.nil?
       raise ArgumentError, "Type :#{type} is not valid for #{class_name.downcase}s."  if type && !valid_type?(type)
 
       @name        = name.to_s
       @description = description
       @required    = required || false
-      @type        = (type || :default).to_sym
+      @type        = (type || :string).to_sym
       @default     = default
       @banner      = banner || default_banner
+
+      validate! # Trigger specific validations
     end
 
     def usage
@@ -37,12 +38,12 @@ class Thor
       end
     end
 
-    def input_required?
-      [ :numeric, :hash, :array, :string ].include?(type)
-    end
-
     protected
 
+      def validate!
+        raise ArgumentError, "An argument cannot be required and have default value." if required? && !default.nil?
+      end
+
       def valid_type?(type)
         VALID_TYPES.include?(type.to_sym)
       end

data/lib/thor/parser/arguments.rb

@@ -23,24 +23,29 @@ class Thor
     # Takes an array of Thor::Argument objects.
     #
     def initialize(arguments=[])
-      @arguments = arguments
-      @non_assigned_required = @arguments.select { |a| a.required? }
+      @assigns, @non_assigned_required = {}, []
+      @switches = arguments
+
+      arguments.each do |argument|
+        if argument.default
+          @assigns[argument.human_name] = argument.default
+        elsif argument.required?
+          @non_assigned_required << argument
+        end
+      end
     end
 
     def parse(args)
-      @pile, assigns = args.dup, {}
+      @pile = args.dup
 
-      @arguments.each do |argument|
-        assigns[argument.human_name] = if peek
-          @non_assigned_required.delete(argument)
-          send(:"parse_#{argument.type}", argument.human_name)
-        else
-          argument.default
-        end
+      @switches.each do |argument|
+        break unless peek
+        @non_assigned_required.delete(argument)
+        @assigns[argument.human_name] = send(:"parse_#{argument.type}", argument.human_name)
       end
 
       check_requirement!
-      assigns
+      @assigns
     end
 
     private

data/lib/thor/parser/option.rb

@@ -2,10 +2,10 @@ class Thor
   class Option < Argument
     attr_reader :aliases, :group
 
-    VALID_TYPES = [:boolean, :numeric, :hash, :array, :string, :default]
+    VALID_TYPES = [:boolean, :numeric, :hash, :array, :string]
 
     def initialize(name, description=nil, required=nil, type=nil, default=nil, banner=nil, group=nil, aliases=nil)
-      super(name, description, required, type || :default, default, banner)
+      super(name, description, required, type, default, banner)
       @aliases = [*aliases].compact
       @group   = group.to_s.capitalize if group
     end
@@ -22,9 +22,6 @@ class Thor
     #   parse :foo => :required
     #   #=> Required option foo without default value
     #
-    #   parse :foo => :optional
-    #   #=> Optional foo without default value
-    #
     #   parse :foo => 2
     #   #=> Option foo with default value 2 and type numeric
     #
@@ -58,6 +55,10 @@ 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
@@ -94,8 +95,16 @@ class Thor
       end
     end
 
+    def input_required?
+      type != :boolean
+    end
+
     protected
 
+      def validate!
+        raise ArgumentError, "An option cannot be boolean and required." if type == :boolean && required?
+      end
+
       def valid_type?(type)
         VALID_TYPES.include?(type.to_sym)
       end

data/lib/thor/parser/options.rb

@@ -30,23 +30,22 @@ class Thor
 
     # Takes a hash of Thor::Option objects.
     #
-    def initialize(switches={})
-      @shorts, @non_assigned_required = {}, []
+    def initialize(options={})
+      options = options.values
+      super(options)
+      @shorts, @switches = {}, {}
 
-      @switches = switches.values.inject({}) do |mem, option|
-        @non_assigned_required << option if option.required?
+      options.each do |option|
+        @switches[option.switch_name] = option
 
         option.aliases.each do |short|
           @shorts[short.to_s] ||= option.switch_name
         end
-
-        mem[option.switch_name] = option
-        mem
       end
     end
 
     def parse(args)
-      @pile, options = args.dup, {}
+      @pile = args.dup
 
       while peek
         if current_is_switch?
@@ -64,19 +63,14 @@ class Thor
           switch = normalize_switch(switch)
           next unless option = switch_option(switch)
 
-          if option.input_required?
-            raise RequiredArgumentMissingError, "no value provided for required option '#{switch}'" if peek.nil?
-            raise MalformattedArgumentError, "cannot pass switch '#{peek}' as an argument" unless current_is_value?
-          end
-
-          options[option.human_name] = parse_peek(switch, option)
+          @assigns[option.human_name] = parse_peek(switch, option)
         else
           shift
         end
       end
 
       check_requirement!
-      options
+      @assigns
     end
 
     protected
@@ -97,13 +91,18 @@ class Thor
       end
 
       def switch_option(arg)
-        if arg =~ /^--(no|skip)-([-\w]+)$/
-          @switches[arg] || @switches["--#{$2}"]
+        if match = no_or_skip?(arg)
+          @switches[arg] || @switches["--#{match}"]
         else
           @switches[arg]
         end
       end
 
+      def no_or_skip?(arg)
+        arg =~ /^--(no|skip)-([-\w]+)$/
+        $2
+      end
+
       # Check if the given argument is actually a shortcut.
       #
       def normalize_switch(arg)
@@ -116,24 +115,20 @@ class Thor
         if current_is_value?
           ["true", "TRUE", "t", "T", true].include?(shift)
         else
-          @switches.key?(switch) || switch !~ /^--(no|skip)-([-\w]+)$/
+          @switches.key?(switch) || !no_or_skip?(switch)
         end
       end
 
-      # Receives switch, option and the current values hash and assign the next
-      # value to it. Also removes the option from the array where non assigned
-      # required are kept.
+      # Parse the value at the peek analyzing if it requires an input or not.
       #
       def parse_peek(switch, option)
-        @non_assigned_required.delete(option)
-
-        type = if option.type == :default
-          current_is_value? ? :string : :boolean
-        else
-          option.type
+        if option.input_required?
+          return nil if no_or_skip?(switch)
+          raise MalformattedArgumentError, "no value provided for option '#{switch}'" unless current_is_value?
         end
 
-        send(:"parse_#{type}", switch)
+        @non_assigned_required.delete(option)
+        send(:"parse_#{option.type}", switch)
       end
 
   end

data/lib/thor/runner.rb

@@ -31,7 +31,7 @@ class Thor::Runner < Thor
   end
 
   desc "install NAME", "Install a Thor file into your system tasks, optionally named for future updates"
-  method_options :as => :optional, :relative => :boolean
+  method_options :as => :string, :relative => :boolean
   def install(name)
     initialize_thorfiles
 
@@ -132,7 +132,7 @@ class Thor::Runner < Thor
 
   desc "list [SEARCH]",
        "List the available thor tasks (--substring means SEARCH anywhere in the namespace)"
-  method_options :substring => :boolean, :group => :optional, :all => :boolean
+  method_options :substring => :boolean, :group => :string, :all => :boolean
   def list(search="")
     initialize_thorfiles
 

data/lib/thor.rb

@@ -72,7 +72,8 @@ class Thor
     #
     # ==== Parameters
     # Hash[Symbol => Object]:: The hash key is the name of the option and the value
-    # is the type of the option. Can be :optional, :required, :boolean or :numeric.
+    # is the type of the option. Can be :string, :array, :hash, :boolean, :numeric
+    # or :required (string). If you give a value, the type of the value is used.
     #
     def method_options(options=nil)
       @method_options ||= {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.21
+  version: 0.10.22
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-07-01 00:00:00 -07:00
 default_executable: 
 dependencies: []