josevalim-thor 0.10.13 → 0.10.14

data/lib/thor.rb

@@ -124,7 +124,10 @@ class Thor
       opts = Thor::Options.new(options)
       opts.parse(args)
 
-      instance = new(opts.arguments, opts.options, config) do |klass, invoke, overrides|
+      defaults = config[:default_options] ? config[:default_options].dup : {}
+      merge_with_thor_options(defaults, task.options)
+
+      instance = new(opts.arguments, defaults.merge!(opts.options), config) do |klass, invoke, overrides|
         klass.prepare(invoke, args, config.merge(overrides))
       end
 

data/lib/thor/actions.rb

@@ -42,25 +42,9 @@ class Thor
     #                as destination root.
     #
     def initialize(args=[], options={}, config={})
-      self.behavior = case config[:behavior]
-        when :force
-          options.merge!(:force => true, 'force' => true)
-          :invoke
-        when :skip
-          options.merge!(:skip => true, 'skip' => true)
-          :invoke
-        when :pretend
-          options.merge!(:pretend => true, 'pretend' => true)
-          :invoke
-        when :revoke
-          :revoke
-        else
-          :invoke
-      end
-
       super
-
-      self.root = config[:root]
+      self.root     = config[:root]
+      self.behavior = config[:behavior].to_s == "revoke" ? :revoke : :invoke
     end
 
     # Wraps an action object and call it accordingly to the thor class behavior.

data/lib/thor/base.rb

@@ -17,8 +17,8 @@ class Thor
     # It receives arguments in an Array and two hashes, one for options and
     # other for configuration.
     #
-    # Notice that it does not check arguments type neither if all required
-    # arguments were supplied. It should be done by the parser.
+    # Notice that it does not check if all required arguments were supplied.
+    # It should be done by the parser.
     #
     # ==== Parameters
     # args<Array[Object]>:: An array of objects. The objects are applied to their
@@ -31,10 +31,12 @@ class Thor
     # config<Hash>:: Configuration for this Thor class.
     #
     def initialize(args=[], options={}, config={})
+      # Set arguments and default values
       self.class.arguments.zip(args).each do |argument, value|
-        send("#{argument.human_name}=", value)
+        send("#{argument.human_name}=", value || argument.default)
       end
 
+      self.class.merge_with_thor_options(options, self.class.class_options)
       self.options = Thor::CoreExt::HashWithIndifferentAccess.new(options).freeze
     end
 
@@ -350,6 +352,21 @@ class Thor
         config[:shell].error e.message
       end
 
+      # Receives a hash of options, stringify keys and merge with default
+      # values from thor options.
+      #
+      def merge_with_thor_options(options, thor_options)
+        options.each_key do |key|
+          next unless key.is_a?(Symbol)
+          options[key.to_s] = options.delete(key)
+        end
+
+        thor_options.each do |key, option|
+          next if option.argument? || option.default.nil?
+          options[option.human_name.to_s] ||= option.default
+        end
+      end
+
       protected
 
         # Prints the class optins per group. If a class options does not belong
@@ -462,6 +479,9 @@ class Thor
           create_task(meth)
         end
 
+        # Retrieves a value from superclass. If it reaches the baseclass,
+        # returns nil.
+        #
         def from_superclass(method, default=nil)
           if self == baseclass
             default

data/lib/thor/group.rb

@@ -24,7 +24,10 @@ class Thor::Group
       opts = Thor::Options.new(class_options)
       opts.parse(args)
 
-      instance = new(opts.arguments, opts.options, config) do |klass, invoke, overrides|
+      defaults = config[:default_options] ? config[:default_options].dup : {}
+      merge_with_thor_options(defaults, {})
+
+      instance = new(opts.arguments, defaults.merge!(opts.options), config) do |klass, invoke, overrides|
         klass.prepare(invoke, args, config.merge(overrides))
       end
 

data/lib/thor/options.rb

@@ -57,12 +57,7 @@ class Thor
 
       @switches = switches.values.inject({}) do |mem, option|
         @non_assigned_required  << option if option.required?
-
-        if option.argument?
-          @non_assigned_arguments << option
-        elsif !option.default.nil?
-          @options[option.human_name] = option.default
-        end
+        @non_assigned_arguments << option if option.argument?
 
         # If there are no shortcuts specified, generate one using the first character
         shorts = option.aliases.dup
@@ -110,7 +105,6 @@ class Thor
         end
       end
 
-      assign_arguments_default_values!
       check_validity!
       @options
     end
@@ -153,8 +147,8 @@ class Thor
       # Returns the option object for the given switch.
       #
       def switch_option(arg)
-        if arg =~ /^--no-(\w+)$/
-          @switches[arg] || @switches["--#{$1}"]
+        if arg =~ /^--(no|skip)-([-\w]+)$/
+          @switches[arg] || @switches["--#{$2}"]
         else
           @switches[arg]
         end
@@ -173,12 +167,16 @@ class Thor
       def parse_option(switch, option, hash)
         human_name = option.human_name
 
-        case option.type
-          when :default
-            hash[human_name] = peek.nil? || peek.to_s =~ /^-/ || shift
+        type = if option.type == :default
+          peek.nil? || peek.to_s =~ /^-/ ? :boolean : :string
+        else
+          option.type
+        end
+
+        case type
           when :boolean
-            if !@switches.key?(switch) && switch =~ /^--no-(\w+)$/
-              hash[$1] = false
+            if !@switches.key?(switch) && switch =~ /^--(no|skip)-([-\w]+)$/
+              hash[$2] = false
             else
               hash[human_name] = true
             end
@@ -265,14 +263,6 @@ class Thor
         end
       end
 
-      # Assign default values to the argument hash.
-      #
-      def assign_arguments_default_values!
-        @non_assigned_arguments.each do |option|
-          @arguments << option.default
-        end
-      end
-
       # Remove shortcuts that happen to coincide with any of the main switches
       #
       def remove_duplicated_shortcuts!

metadata

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