josevalim-thor 0.10.17 → 0.10.18

data/lib/thor.rb

@@ -124,10 +124,8 @@ class Thor
       opts = Thor::Options.new(options)
       opts.parse(args)
 
-      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|
+      merge_with_thor_options(opts.options, task.options)
+      instance = new(opts.arguments, opts.options, config) do |klass, invoke, overrides|
         klass.prepare(invoke, args, config.merge(overrides))
       end
 

data/lib/thor/actions.rb

@@ -42,9 +42,18 @@ class Thor
     #                as destination root.
     #
     def initialize(args=[], options={}, config={})
+      self.behavior = case config[:behavior].to_s
+        when "force", "skip"
+          _cleanup_options_and_set(options, config[:behavior])
+          :invoke
+        when "revoke"
+          :revoke
+        else
+          :invoke
+      end
+
       super
-      self.root     = config[:root]
-      self.behavior = config[:behavior].to_s == "revoke" ? :revoke : :invoke
+      self.root = config[:root]
     end
 
     # Wraps an action object and call it accordingly to the thor class behavior.
@@ -295,5 +304,10 @@ class Thor
         super.merge!(:root => self.root)
       end
 
+      def _cleanup_options_and_set(options, key)
+        [:force, :skip, "force", "skip"].each { |i| options.delete(i) }
+        options.merge!(key => true)
+      end
+
   end
 end

data/lib/thor/base.rb

@@ -388,7 +388,7 @@ class Thor
               options.each do |option|
                 next if option.argument?
                 list << [ option.usage, option.description || "" ]
-                list << [ "", "Default: #{option.default}" ] if option.description && option.default
+                list << [ "", "Default: #{option.default}" ] if option.show_default?
               end
 
               unless list.empty?

data/lib/thor/group.rb

@@ -24,10 +24,7 @@ class Thor::Group
       opts = Thor::Options.new(class_options)
       opts.parse(args)
 
-      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|
+      instance = new(opts.arguments, opts.options, config) do |klass, invoke, overrides|
         klass.prepare(invoke, args, config.merge(overrides))
       end
 

data/lib/thor/option.rb

@@ -134,6 +134,15 @@ class Thor
       sample
     end
 
+    def show_default?
+      case default
+        when Array, String, Hash
+          !default.empty?
+        else
+          default
+      end
+    end
+
     protected
 
       def position

data/lib/thor/options.rb

@@ -137,6 +137,12 @@ class Thor
         end
       end
 
+      # Returns true if the next value exists and is not a switch.
+      #
+      def current_is_value?
+        peek && peek !~ /^-/
+      end
+
       # Check if the given argument matches with a switch.
       #
       def switch?(arg)
@@ -167,14 +173,18 @@ class Thor
         @non_assigned_required.delete(option)
 
         type = if option.type == :default
-          peek.nil? || peek.to_s =~ /^-/ ? :boolean : :string
+          current_is_value? ? :string : :boolean
         else
           option.type
         end
 
         case type
           when :boolean
-            @switches.key?(switch) || switch !~ /^--(no|skip)-([-\w]+)$/
+            if current_is_value?
+              shift == "true"
+            else
+              @switches.key?(switch) || switch !~ /^--(no|skip)-([-\w]+)$/
+            end
           when :string
             shift
           when :numeric
@@ -198,7 +208,7 @@ class Thor
       def parse_hash
         hash = {}
 
-        while peek && peek !~ /^\-/
+        while current_is_value? && peek.include?(?:)
           key, value = shift.split(':')
           hash[key] = value
         end
@@ -218,7 +228,7 @@ class Thor
       def parse_array
         array = []
 
-        while peek && peek !~ /^\-/
+        while current_is_value?
           array << shift
         end
 
@@ -240,7 +250,7 @@ class Thor
       def check_requirement!(switch, option)
         if option.input_required?
           raise RequiredArgumentMissingError, "no value provided for required argument '#{switch}'" if peek.nil?
-          raise MalformattedArgumentError, "cannot pass switch '#{peek}' as an argument" if switch?(peek)
+          raise MalformattedArgumentError, "cannot pass switch '#{peek}' as an argument" unless current_is_value?
         end
       end
 

metadata

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