cmd.rb in cl-0.1.13

- old
+ new

@@ -1,23 +1,30 @@
 require 'registry'
 require 'cl/args'
-require 'cl/helper'
+require 'cl/dsl'
 require 'cl/opts'
 require 'cl/parser'
 
 class Cl
+  # Base class for all command classes that can be run.
+  #
+  # Inherit your command classes from this class, use the {Cl::Cmd::Dsl} to
+  # declare arguments, options, summary, description, examples etc., and
+  # implement the method #run.
+  #
+  # See {Cl::Cmd::Dsl} for details on the DSL methods.
   class Cmd
     include Registry
+    extend Dsl
 
     class << self
-      include Merge
+      include Merge, Underscore
 
       inherited = ->(const) do
         const.register [registry_key, underscore(const.name.split('::').last)].compact.join(':') if const.name
         const.define_singleton_method(:inherited, &inherited)
       end
-
       define_method(:inherited, &inherited)
 
       def cmds
         registry.values
       end
@@ -25,55 +32,10 @@
       def parse(ctx, args)
         opts = Parser.new(self.opts, args).opts unless self == Help
         opts = merge(ctx.config[registry_key], opts) if ctx.config[registry_key]
         [args, opts || {}]
       end
-
-      def abstract
-        unregister
-      end
-
-      def args(*args)
-        return @args ||= Args.new unless args.any?
-        opts = args.last.is_a?(Hash) ? args.pop : {}
-        args.each { |arg| arg(arg, opts) }
-      end
-
-      def arg(*args)
-        self.args.define(self, *args)
-      end
-
-      def opt(*args, &block)
-        self.opts.define(self, *args, &block)
-      end
-
-      def opts
-        @opts ||= self == Cmd ? Opts.new : superclass.opts.dup
-      end
-
-      def description(description = nil)
-        description ? @description = description : @description
-      end
-
-      def required?
-        !!@required
-      end
-
-      def required(*required)
-        required.any? ? self.required << required : @required ||= []
-      end
-
-      def summary(summary = nil)
-        summary ? @summary = summary : @summary
-      end
-      alias purpose summary
-
-      def underscore(string)
-        string.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        downcase
-      end
     end
 
     opt '--help', 'Get help on this command'
 
     attr_reader :ctx, :args
@@ -90,9 +52,9 @@
     end
 
     def deprecated_opts
       opts = self.class.opts.select(&:deprecated?)
       opts = opts.select { |opt| self.opts.key?(opt.deprecated[0]) }
-      opts.map(&:deprecated)
+      opts.map(&:deprecated).to_h
     end
   end
 end