josevalim-thor 0.10.9 → 0.10.10

data/lib/thor.rb

@@ -198,7 +198,7 @@ class Thor
       end
 
       def create_task(meth) #:nodoc:
-        tasks[meth.to_s] = Thor::Task.new(meth, @desc, @usage, method_options, nil)
+        tasks[meth.to_s] = Thor::Task.new(meth, @desc, @usage, method_options)
         @usage, @desc, @method_options = nil
       end
 

data/lib/thor/base.rb

@@ -160,6 +160,42 @@ class Thor
         build_option(name, options, class_options)
       end
 
+      # Removes a previous defined argument. If :undefine is given, undefine
+      # accessors as well.
+      #
+      # ==== Paremeters
+      # names<Array>:: Arguments to be removed
+      #
+      # ==== Examples
+      #
+      #   remove_argument :foo
+      #   remove_argument :foo, :bar, :baz, :undefine => true
+      #
+      def remove_argument(*names)
+        options = names.last.is_a?(Hash) ? names.pop : {}
+
+        names.each do |name|
+          class_options.delete(name)
+          undef_method name, "#{name}=" if options[:undefine]
+        end
+      end
+
+      # Removes a previous defined class option.
+      #
+      # ==== Paremeters
+      # names<Array>:: Class options to be removed
+      #
+      # ==== Examples
+      #
+      #   remove_class_option :foo
+      #   remove_class_option :foo, :bar, :baz
+      #
+      def remove_class_option(*names)
+        names.each do |name|
+          class_options.delete(name)
+        end
+      end
+
       # Defines the group. This is used when thor list is invoked so you can specify
       # that only tasks from a pre-defined group will be shown. Defaults to standard.
       #

data/lib/thor/group.rb

@@ -22,71 +22,6 @@ class Thor::Group
       end
     end
 
-    # Sets the condition for some task to be executed in the class level. Why
-    # is this important? Setting the conditions in the class level allows to
-    # an inherited class change the conditions and customize the Thor::Group as
-    # it wishes.
-    #
-    # The conditions given are retrieved from the options hash. Let's suppose
-    # that a task is only executed if --test-framework is rspec. You could do
-    # this:
-    #
-    #   class_option :test_framework, :type => :string
-    #
-    #   conditions :test_framework => :rspec
-    #   def create_rspec_files
-    #     # magic
-    #   end
-    #
-    # Later someone creates a framework on top of rspec and need rspec files to
-    # generated as well. He could then change the conditions:
-    #
-    #   conditions :test_framework => [ :rspec, :remarkable ], :for => :create_rspec_files
-    #
-    # He could also use remove_conditions and remove previous set conditions:
-    #
-    #   remove_conditions :test_framework, :for => :create_rspec_files
-    #
-    # Conditions only work with the class option to be comparead to is a boolean,
-    # string or numeric (no array or hash comparisions).
-    #
-    # ==== Parameters
-    # conditions<Hash>:: the conditions for the task. The key is the option name
-    #                    and the value is the condition to be checked. If the
-    #                    condition is an array, it checkes if the current value
-    #                    is included in the array. If a regexp, checks if the
-    #                    value matches, all other values are simply compared (==).
-    #
-    def conditions(conditions=nil)
-      subject = if conditions && conditions[:for]
-        find_and_refresh_task(conditions.delete(:for)).conditions
-      else
-        @conditions ||= {}
-      end
-
-      subject.merge!(conditions) if conditions
-      subject
-    end
-
-    # Remove a previous specified condition. Check <tt>conditions</tt> above for
-    # a complete example.
-    #
-    # ==== Parameters
-    # conditions<Array>:: An array of conditions to be removed.
-    # for<Hash>:: A hash with :for as key indicating the task to remove the conditions from.
-    #
-    # ==== Examples
-    #
-    #   remove_conditions :test_framework, :orm, :for => :create_app_skeleton
-    #
-    def remove_conditions(*conditions)
-      subject = find_and_refresh_task(conditions.pop[:for]).conditions
-      conditions.each do |condition|
-        subject.delete(condition)
-      end
-      subject
-    end
-
     # Start in Thor::Group works differently. It invokes all tasks inside the
     # class and does not have to parse task options.
     #
@@ -140,8 +75,7 @@ class Thor::Group
       end
 
       def create_task(meth) #:nodoc:
-        tasks[meth.to_s] = Thor::Task.new(meth, nil, nil, nil, @conditions)
-        @conditions = nil
+        tasks[meth.to_s] = Thor::Task.new(meth, nil, nil, nil)
       end
   end
 

data/lib/thor/task.rb

@@ -1,5 +1,5 @@
 class Thor
-  class Task < Struct.new(:name, :description, :usage, :options, :conditions)
+  class Task < Struct.new(:name, :description, :usage, :options)
 
     # Creates a dynamic task. Dynamic tasks are created on demand to allow method
     # missing calls (since a method missing does not have a task object for it).
@@ -8,16 +8,15 @@ class Thor
       new(name, "A dynamically-generated task", name.to_s)
     end
 
-    def initialize(name, description, usage, options=nil, conditions=nil)
-      super(name.to_s, description, usage, options || {}, conditions || {})
+    def initialize(name, description, usage, options=nil)
+      super(name.to_s, description, usage, options || {})
     end
 
     # Dup the options hash on clone.
     #
     def initialize_copy(other)
       super(other)
-      self.options    = other.options.dup    if other.options
-      self.conditions = other.conditions.dup if other.conditions
+      self.options = other.options.dup if other.options
     end
 
     # By default, a task invokes a method in the thor class. You can change this
@@ -25,7 +24,7 @@ class Thor
     #
     def run(instance, args=[])
       raise UndefinedTaskError, "the '#{name}' task of #{instance.class} is private" unless public_method?(instance)
-      instance.send(name, *args) if valid_conditions?(instance)
+      instance.send(name, *args)
     rescue ArgumentError => e
       backtrace = sans_backtrace(e.backtrace, caller)
 
@@ -91,28 +90,6 @@ class Thor
         !(collection).include?(name.to_s) && !(collection).include?(name.to_sym) # For Ruby 1.9
       end
 
-      # Check if the task conditions are met before invoking.
-      #
-      def valid_conditions?(instance)
-        return true if conditions.empty?
-
-        conditions.each do |key, expected|
-          actual   = stringify!(instance.options[key])
-          expected = stringify!(expected)
-
-          return false if case expected
-            when Regexp
-              actual !~ expected
-            when Array
-              !expected.include?(actual)
-            else
-              actual != expected
-          end
-        end
-
-        true
-      end
-
       # Clean everything that comes from the Thor gempath and remove the caller.
       #
       def sans_backtrace(backtrace, caller)
@@ -121,18 +98,5 @@ class Thor
         saned -= caller
       end
 
-      # Receives an object and convert any symbol to string.
-      #
-      def stringify!(duck)
-        case duck
-          when Array
-            duck.map!{ |i| i.is_a?(Symbol) ? i.to_s : i }
-          when Symbol
-            duck.to_s
-          else
-            duck
-        end
-      end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.9
+  version: 0.10.10
 platform: ruby
 authors: 
 - Yehuda Katz