daemon-kit 0.1.8rc2 → 0.1.8rc3

data/lib/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/lib/thor/error.rb

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

data/lib/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/lib/thor/group.rb

@@ -1,8 +1,9 @@
+require 'thor/base'
+
 # Thor has a special class called Thor::Group. The main difference to Thor class
 # is that it invokes all tasks at once. It also include some methods that allows
 # invocations to be done at the class method, which are not available to Thor
 # tasks.
-#
 class Thor::Group
   class << self
     # The descrition for this Thor::Group. If none is provided, but a source root
@@ -24,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
@@ -218,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.
@@ -250,22 +253,19 @@ class Thor::Group
   # Shortcut to invoke with padding and block handling. Use internally by
   # invoke and invoke_from_option class methods.
   def _invoke_for_class_method(klass, task=nil, *args, &block) #:nodoc:
-    shell.padding += 1
-
-    result = if block_given?
-      case block.arity
-      when 3
-        block.call(self, klass, task)
-      when 2
-        block.call(self, klass)
-      when 1
-        instance_exec(klass, &block)
+    with_padding do
+      if block
+        case block.arity
+        when 3
+          block.call(self, klass, task)
+        when 2
+          block.call(self, klass)
+        when 1
+          instance_exec(klass, &block)
+        end
+      else
+        invoke klass, task, *args
       end
-    else
-      invoke klass, task, *args
     end
-
-    shell.padding -= 1
-    result
   end
 end

data/lib/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/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, !key)
           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)
@@ -118,18 +119,21 @@ class Thor
       end
     end
 
+    # Invokes using shell padding.
+    def invoke_with_padding(*args)
+      with_padding { invoke(*args) }
+    end
+
     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 +151,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/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/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.
@@ -50,6 +51,10 @@ class Thor
 
     private
 
+      def last?
+        @pile.empty?
+      end
+
       def peek
         @pile.first
       end
@@ -116,7 +121,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 +142,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/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/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/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/lib/thor/parser/options.rb

@@ -3,14 +3,13 @@ class Thor
   # under Ruby's license.
   #
   class Options < Arguments #:nodoc:
-    LONG_RE     = /^(--\w+[-\w+]*)$/
+    LONG_RE     = /^(--\w+(?:-\w+)*)$/
     SHORT_RE    = /^(-[a-z])$/i
-    EQ_RE       = /^(--\w+[-\w+]*|-[a-z])=(.*)$/i
+    EQ_RE       = /^(--\w+(?:-\w+)*|-[a-z])=(.*)$/i
     SHORT_SQ_RE = /^-([a-z]{2,})$/i # Allow either -x -v or -xv style for single char args
     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 current_is_switch_formatted?
+          @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
@@ -86,6 +99,19 @@ class Thor
         end
       end
 
+      def switch_formatted?(arg)
+        case arg
+        when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM, SHORT_SQ_RE
+          true
+        else
+          false
+        end
+      end
+
+      def current_is_switch_formatted?
+        switch_formatted? peek
+      end
+
       def switch?(arg)
         switch_option(arg) || @shorts.key?(arg)
       end
@@ -122,15 +148,16 @@ class Thor
       # Parse the value at the peek analyzing if it requires an input or not.
       #
       def parse_peek(switch, option)
-        unless current_is_value?
+        if current_is_switch_formatted? || last?
           if option.boolean?
             # No problem for boolean types
           elsif no_or_skip?(switch)
             return nil # User set value to nil
           elsif option.string? && !option.required?
-            return option.human_name # Return the option name
+            # Return the default if there is one, else the human name
+            return option.default || option.human_name
           else
-            raise MalformattedArgumentError, "no value provided for option '#{switch}'"
+            raise MalformattedArgumentError, "No value provided for option '#{switch}'"
           end
         end
 

data/lib/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/lib/thor/runner.rb

@@ -1,3 +1,7 @@
+require 'thor'
+require 'thor/group'
+require 'thor/core_ext/file_binary_read'
+
 require 'fileutils'
 require 'open-uri'
 require 'yaml'
@@ -5,15 +9,14 @@ require 'digest/md5'
 require 'pathname'
 
 class Thor::Runner < Thor #:nodoc:
-  map "-T" => :list, "-i" => :install, "-u" => :update
+  map "-T" => :list, "-i" => :install, "-u" => :update, "-v" => :version
 
   # Override Thor#help so it can give information about any class and any method.
   #
   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
@@ -26,13 +29,13 @@ 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"
-  method_options :as => :string, :relative => :boolean
+  method_options :as => :string, :relative => :boolean, :force => :boolean
   def install(name)
     initialize_thorfiles
 
@@ -41,10 +44,10 @@ class Thor::Runner < Thor #:nodoc:
     begin
       if File.directory?(File.expand_path(name))
         base, package = File.join(name, "main.thor"), :directory
-        contents      = open(base).read
+        contents      = open(base) {|input| input.read }
       else
         base, package = name, :file
-        contents      = open(name).read
+        contents      = open(name) {|input| input.read }
       end
     rescue OpenURI::HTTPError
       raise Error, "Error opening URI '#{name}'"
@@ -55,7 +58,9 @@ class Thor::Runner < Thor #:nodoc:
     say "Your Thorfile contains:"
     say contents
 
-    return false if no?("Do you wish to continue [y/N]?")
+    unless options["force"]
+      return false if no?("Do you wish to continue [y/N]?")
+    end
 
     as = options["as"] || begin
       first_line = contents.split("\n")[0]
@@ -93,6 +98,12 @@ class Thor::Runner < Thor #:nodoc:
     thor_yaml[as][:filename] # Indicate success
   end
 
+  desc "version", "Show Thor version"
+  def version
+    require 'thor/version'
+    say "Thor #{Thor::VERSION}"
+  end
+
   desc "uninstall NAME", "Uninstall a named Thor module"
   def uninstall(name)
     raise Error, "Can't find module '#{name}'" unless thor_yaml[name]

data/lib/daemon_kit/vendor/{thor-0.12.3 → thor-0.13.6}/lib/thor/shell.rb

@@ -45,19 +45,16 @@ class Thor
 
     # Holds the shell for the given Thor instance. If no shell is given,
     # it gets a default shell from Thor::Base.shell.
-    #
     def shell
       @shell ||= Thor::Base.shell.new
     end
 
     # Sets the shell for this thor class.
-    #
     def shell=(shell)
       @shell = shell
     end
 
     # Common methods that are delegated to the shell.
-    #
     SHELL_DELEGATED_METHODS.each do |method|
       module_eval <<-METHOD, __FILE__, __LINE__
         def #{method}(*args)
@@ -66,6 +63,14 @@ class Thor
       METHOD
     end
 
+    # Yields the given block with padding.
+    def with_padding
+      shell.padding += 1
+      yield
+    ensure
+      shell.padding -= 1
+    end
+
     protected
 
       # Allow shell to be shared between invocations.