command_kit 0.1.0.pre2 → 0.2.1

data/lib/command_kit/options/option_value.rb

@@ -14,6 +14,8 @@ module CommandKit
     #
     # Represents an additional argument associated with an option flag.
     #
+    # @api private
+    #
     class OptionValue < Arguments::ArgumentValue
 
       # Maps OptionParser types to USAGE strings.
@@ -39,7 +41,7 @@ module CommandKit
 
       # The desired type of the argument value.
       #
-      # @return [Class, Hash, Array, Regexp, nil]
+      # @return [Class, Hash, Array, Regexp]
       attr_reader :type
 
       # The default parsed value for the argument value.
@@ -90,10 +92,11 @@ module CommandKit
       def self.default_usage(type)
         USAGES.fetch(type) do
           case type
-          when Class  then Inflector.underscore(type.name).upcase
           when Hash   then type.keys.join('|')
           when Array  then type.join('|')
           when Regexp then type.source
+          when Class
+            Inflector.underscore(Inflector.demodularize(type.name)).upcase
           else
             raise(TypeError,"unsupported option type: #{type.inspect}")
           end

data/lib/command_kit/options/parser.rb

@@ -33,6 +33,9 @@ module CommandKit
       include Main
       include Printing
 
+      #
+      # @api private
+      #
       module ModuleMethods
         #
         # Sets {CommandKit::Usage::ClassMethods#usage .usage} or extends
@@ -58,6 +61,8 @@ module CommandKit
       # The option parser.
       #
       # @return [OptionParser]
+      #
+      # @api semipublic
       attr_reader :option_parser
 
       #
@@ -65,6 +70,8 @@ module CommandKit
       #
       # @return [OptionParser]
       #
+      # @api public
+      #
       def initialize(**kwargs)
         super(**kwargs)
 
@@ -91,6 +98,8 @@ module CommandKit
       # @return [Integer]
       #   The exit status code.
       #
+      # @api public
+      #
       def main(argv=[])
         super(parse_options(argv))
       rescue SystemExit => system_exit
@@ -106,24 +115,24 @@ module CommandKit
       # @return [Array<String>]
       #   The remaining non-option arguments.
       #
+      # @api semipublic
+      #
       def parse_options(argv)
-        begin
-          option_parser.parse(argv)
-        rescue OptionParser::InvalidOption => error
-          on_invalid_option(error)
-        rescue OptionParser::AmbiguousOption => error
-          on_ambiguous_option(error)
-        rescue OptionParser::InvalidArgument => error
-          on_invalid_argument(error)
-        rescue OptionParser::MissingArgument => error
-          on_missing_argument(error)
-        rescue OptionParser::NeedlessArgument => error
-          on_needless_argument(error)
-        rescue OptionParser::AmbiguousArgument => error
-          on_ambiguous_argument(error)
-        rescue OptionParser::ParseError => error
-          on_parse_error(error)
-        end
+        option_parser.parse(argv)
+      rescue OptionParser::InvalidOption => error
+        on_invalid_option(error)
+      rescue OptionParser::AmbiguousOption => error
+        on_ambiguous_option(error)
+      rescue OptionParser::InvalidArgument => error
+        on_invalid_argument(error)
+      rescue OptionParser::MissingArgument => error
+        on_missing_argument(error)
+      rescue OptionParser::NeedlessArgument => error
+        on_needless_argument(error)
+      rescue OptionParser::AmbiguousArgument => error
+        on_ambiguous_argument(error)
+      rescue OptionParser::ParseError => error
+        on_parse_error(error)
       end
 
       #
@@ -132,9 +141,11 @@ module CommandKit
       # @param [OptionParser::ParseError] error
       #   The error from `OptionParser`.
       #
+      # @api semipublic
+      #
       def on_parse_error(error)
-        print_error("#{command_name}: #{error.message}")
-        print_error("Try '#{command_name} --help' for more information.")
+        print_error(error.message)
+        stderr.puts("Try '#{command_name} --help' for more information.")
         exit(1)
       end
 
@@ -145,6 +156,8 @@ module CommandKit
       #
       # @see on_parse_error
       #
+      # @api semipublic
+      #
       def on_invalid_option(error)
         on_parse_error(error)
       end
@@ -157,6 +170,8 @@ module CommandKit
       #
       # @see on_parse_error
       #
+      # @api semipublic
+      #
       def on_ambiguous_option(error)
         on_parse_error(error)
       end
@@ -169,6 +184,8 @@ module CommandKit
       #
       # @see on_parse_error
       #
+      # @api semipublic
+      #
       def on_invalid_argument(error)
         on_parse_error(error)
       end
@@ -181,6 +198,8 @@ module CommandKit
       #
       # @see on_parse_error
       #
+      # @api semipublic
+      #
       def on_missing_argument(error)
         on_parse_error(error)
       end
@@ -193,6 +212,8 @@ module CommandKit
       #
       # @see on_parse_error
       #
+      # @api semipublic
+      #
       def on_needless_argument(error)
         on_parse_error(error)
       end
@@ -205,6 +226,8 @@ module CommandKit
       #
       # @see on_parse_error
       #
+      # @api semipublic
+      #
       def on_ambiguous_argument(error)
         on_parse_error(error)
       end
@@ -212,6 +235,8 @@ module CommandKit
       #
       # Prints the `--help` output.
       #
+      # @api semipublic
+      #
       def help_options
         puts option_parser
       end
@@ -219,6 +244,8 @@ module CommandKit
       #
       # @see #help_options
       #
+      # @api public
+      #
       def help
         help_options
       end

data/lib/command_kit/options/quiet.rb

@@ -18,6 +18,9 @@ module CommandKit
     module Quiet
       include Options
 
+      #
+      # @api private
+      #
       module ModuleMethods
         #
         # Defines a `-q, --quiet` option.

data/lib/command_kit/options/verbose.rb

@@ -18,6 +18,9 @@ module CommandKit
     module Verbose
       include Options
 
+      #
+      # @api private
+      #
       module ModuleMethods
         #
         # Defines a `-v, --verbose` option or extends {ModuleMethods}, depending
@@ -47,6 +50,8 @@ module CommandKit
       #
       # @return [Boolean]
       #
+      # @api public
+      #
       def verbose?
         @verbose
       end

data/lib/command_kit/options/version.rb

@@ -35,6 +35,8 @@ module CommandKit
         # @return [String, nil]
         #   The classes version string.
         #
+        # @api public
+        #
         def version(new_version=nil)
           if new_version
             @version = new_version
@@ -47,6 +49,8 @@ module CommandKit
       #
       # @see ClassMethods#version
       #
+      # @api public
+      #
       def version
         self.class.version
       end
@@ -54,6 +58,8 @@ module CommandKit
       #
       # Prints the version.
       #
+      # @api public
+      #
       def print_version
         puts "#{command_name} #{version}"
       end

data/lib/command_kit/options.rb

@@ -1,3 +1,4 @@
+require 'command_kit/arguments'
 require 'command_kit/options/option'
 require 'command_kit/options/parser'
 
@@ -22,7 +23,7 @@ module CommandKit
   #       @bar = arg.split(':')
   #     end
   #
-  # ### initialize and using ivars
+  # ### initialize and using instance variables
   #     
   #     option :number, value: {type: Integer},
   #                     desc: 'Numbers' do |num|
@@ -36,8 +37,12 @@ module CommandKit
   #     end
   #
   module Options
+    include Arguments
     include Parser
 
+    #
+    # @api private
+    #
     module ModuleMethods
       #
       # Extends {ClassMethods} or {ModuleMethods}, depending on whether
@@ -68,6 +73,8 @@ module CommandKit
       #
       # @return [Hash{Symbol => Option}]
       #
+      # @api semipublic
+      #
       def options
         @options ||= if superclass.kind_of?(ClassMethods)
                        superclass.options.dup
@@ -172,6 +179,8 @@ module CommandKit
       #       # ...
       #     end
       #
+      # @api public
+      #
       def option(name,**kwargs,&block)
         options[name] = Option.new(name,**kwargs,&block)
       end
@@ -180,6 +189,9 @@ module CommandKit
     # Hash of parsed option values.
     #
     # @return [Hash{Symbol => Object}]
+    #
+    # @api semipublic
+    #
     attr_reader :options
 
     #
@@ -187,24 +199,26 @@ module CommandKit
     # {Parser#option_parser option parser}.
     #
     # @param [Hash{Symbol => Object}] options
-    #   Optional pre-populated options hash.
+    #   Optional prepopulated options hash.
     #
     # @note
     #   The {#option_parser} will populate {#options} and also call any
     #   {ClassMethods#option option} blocks with the parsed option values.
     #
+    # @api public
+    #
     def initialize(options: {}, **kwargs)
       @options = options
 
       super(**kwargs)
 
       self.class.options.each_value do |option|
+        default_value = option.default_value
+
+        @options[option.name] = default_value unless default_value.nil?
+
         option_parser.on(*option.usage,option.type,option.desc) do |arg,*captures|
-          @options[option.name] = if arg.nil?
-                                    option.default_value
-                                  else
-                                    arg
-                                  end
+          @options[option.name] = arg
 
           if option.block
             instance_exec(*arg,*captures,&option.block)
@@ -212,5 +226,16 @@ module CommandKit
         end
       end
     end
+
+    #
+    # Overrides the default {Usage#help help} method and calls {#help_options}
+    # and {#help_arguments}.
+    #
+    # @api public
+    #
+    def help
+      help_options
+      help_arguments
+    end
   end
 end

data/lib/command_kit/os/linux.rb

@@ -0,0 +1,157 @@
+require 'command_kit/os'
+
+module CommandKit
+  module OS
+    #
+    # Provides methods for determining the specific type of Linux.
+    #
+    # ## Example
+    #
+    #     require 'command_kit/command'
+    #     require 'command_kit/os/linux'
+    #     
+    #     class Command < CommandKit::Command
+    #     
+    #       include CommandKit::OS::Linux
+    #     
+    #       def run
+    #         if debian_linux?
+    #           # ...
+    #         elsif redhat_linux?
+    #           # ...
+    #         elsif suse_linux?
+    #           # ...
+    #         elsif arch_linux?
+    #           # ...
+    #         end
+    #       end
+    #     end
+    #
+    # @since 0.2.0
+    #
+    module Linux
+      #
+      # @api private
+      #
+      module ModuleMethods
+        #
+        # Extends {ClassMethods} or {ModuleMethods}, depending on whether
+        # {OS} is being included into a class or a module..
+        #
+        # @param [Class, Module] context
+        #   The class or module which is including {OS}.
+        #
+        def included(context)
+          super(context)
+
+          if context.class == Module
+            context.extend ModuleMethods
+          else
+            context.extend ClassMethods
+          end
+        end
+      end
+
+      extend ModuleMethods
+
+      module ClassMethods
+        #
+        # Determines the specific Linux distro.
+        #
+        # @return [:fedora, :redhat, :debian, :suse, :arch, nil]
+        #   Returns the type of Linux distro or `nil` if the Linux distro could
+        #   not be determined.
+        #
+        # @api semipublic
+        #
+        def linux_distro
+          if    File.file?('/etc/fedora-release') then :fedora
+          elsif File.file?('/etc/redhat-release') then :redhat
+          elsif File.file?('/etc/debian_version') then :debian
+          elsif File.file?('/etc/SuSE-release')   then :suse
+          elsif File.file?('/etc/arch-release')   then :arch
+          end
+        end
+      end
+
+      # The Linux distro.
+      #
+      # @return [:fedora, :redhat, :debian, :suse, :arch, nil]
+      #
+      # @api public
+      attr_reader :linux_distro
+
+      #
+      # Initializes the command.
+      #
+      # @param [:fedora, :redhat, :debian, :suse, :arch, nil] linux_distro
+      #   Overrides the default detected Linux distro.
+      #
+      # @param [Hash{Symbol => Object}] kwargs
+      #   Additional keyword arguments.
+      #
+      # @api public
+      #
+      def initialize(linux_distro: self.class.linux_distro, **kwargs)
+        super(**kwargs)
+
+        @linux_distro = linux_distro
+      end
+
+      #
+      # Determines if the current OS is RedHat Linux based distro.
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      #
+      def redhat_linux?
+        @linux_distro == :redhat
+      end
+
+      #
+      # Determines if the current OS is Fedora Linux based distro.
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      #
+      def fedora_linux?
+        @linux_distro == :fedora
+      end
+
+      #
+      # Determines if the current OS is Debian Linux based distro.
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      #
+      def debian_linux?
+        @linux_distro == :debian
+      end
+
+      #
+      # Determines if the current OS is SUSE Linux based distro.
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      #
+      def suse_linux?
+        @linux_distro == :suse
+      end
+
+      #
+      # Determines if the current OS is Arch Linux based distro.
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      #
+      def arch_linux?
+        @linux_distro == :arch
+      end
+    end
+  end
+end

data/lib/command_kit/os.rb

@@ -4,26 +4,111 @@ module CommandKit
   #
   # ## Examples
   #
-  #     include CommandKit::OS
+  #     require 'command_kit/command'
+  #     require 'command_kit/os'
   #     
-  #     def main(*argv)
-  #       if linux?
-  #         # ...
-  #       elsif macos?
-  #         # ...
-  #       elsif windows?
-  #         # ...
+  #     class Command < CommandKit::Command
+  #     
+  #       include CommandKit::OS
+  #     
+  #       def main(*argv)
+  #         if linux?
+  #           # ...
+  #         elsif macos?
+  #           # ...
+  #         elsif freebsd?
+  #           # ...
+  #         elsif windows?
+  #           # ...
+  #         end
   #       end
+  #     
   #     end
   #
   module OS
+    #
+    # @api private
+    #
+    module ModuleMethods
+      #
+      # Extends {ClassMethods} or {ModuleMethods}, depending on whether
+      # {OS} is being included into a class or a module..
+      #
+      # @param [Class, Module] context
+      #   The class or module which is including {OS}.
+      #
+      def included(context)
+        super(context)
+
+        if context.class == Module
+          context.extend ModuleMethods
+        else
+          context.extend ClassMethods
+        end
+      end
+    end
+
+    extend ModuleMethods
+
+    module ClassMethods
+      #
+      # Determines the current OS.
+      #
+      # @return [:linux, :macos, :freebsd, :openbsd, :netbsd, :windows, nil]
+      #   The OS type or `nil` if the OS could not be determined.
+      #
+      # @api semipublic
+      #
+      # @since 0.2.0
+      #
+      def os
+        if    RUBY_PLATFORM.include?('linux')   then :linux
+        elsif RUBY_PLATFORM.include?('darwin')  then :macos
+        elsif RUBY_PLATFORM.include?('freebsd') then :freebsd
+        elsif RUBY_PLATFORM.include?('openbsd') then :openbsd
+        elsif RUBY_PLATFORM.include?('netbsd')  then :netbsd
+        elsif Gem.win_platform?                 then :windows
+        end
+      end
+    end
+
+    # The current OS.
+    #
+    # @return [:linux, :macos, :freebsd, :openbsd, :netbsd, :windows, nil]
+    #
+    # @api public
+    #
+    # @since 0.2.0
+    attr_reader :os
+
+    #
+    # Initializes the command.
+    #
+    # @param [:linux, :macos, :freebsd, :openbsd, :netbsd, :windows, nil] os
+    #   Overrides the default OS.
+    #   
+    # @param [Hash{Symbol => Object}] kwargs
+    #   Additional keyword arguments.
+    #
+    # @api public
+    #
+    # @since 0.2.0
+    #
+    def initialize(os: self.class.os, **kwargs)
+      super(**kwargs)
+
+      @os = os
+    end
+
     #
     # Determines if the current OS is Linux.
     #
     # @return [Boolean]
     #
+    # @api public
+    #
     def linux?
-      RUBY_PLATFORM.include?('linux')
+      @os == :linux
     end
 
     #
@@ -31,8 +116,75 @@ module CommandKit
     #
     # @return [Boolean]
     #
+    # @api public
+    #
     def macos?
-      RUBY_PLATFORM.include?('darwin')
+      @os == :macos
+    end
+
+    #
+    # Determines if the current OS is FreeBSD.
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    #
+    # @since 0.2.0
+    #
+    def freebsd?
+      @os == :freebsd
+    end
+
+    #
+    # Determines if the current OS is OpenBSD.
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    #
+    # @since 0.2.0
+    #
+    def openbsd?
+      @os == :openbsd
+    end
+
+    #
+    # Determines if the current OS is NetBSD.
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    #
+    # @since 0.2.0
+    #
+    def netbsd?
+      @os == :netbsd
+    end
+
+    #
+    # Determines if the current OS is BSD based.
+    #
+    # @return [Boolean]
+    #
+    # @since 0.2.0
+    #
+    # @api public
+    #
+    def bsd?
+      freebsd? || openbsd? || netbsd?
+    end
+
+    #
+    # Determines if the current OS is UNIX based.
+    #
+    # @return [Boolean]
+    #
+    # @since 0.2.0
+    #
+    # @api public
+    #
+    def unix?
+      linux? || macos? || bsd?
     end
 
     #
@@ -40,8 +192,10 @@ module CommandKit
     #
     # @return [Boolean]
     #
+    # @api public
+    #
     def windows?
-      Gem.win_platform?
+      @os == :windows
     end
   end
 end