clamp 1.2.0.beta1 → 1.3.2

data/lib/clamp/messages.rb

@@ -1,5 +1,9 @@
-module Clamp
+# frozen_string_literal: true
 
+module Clamp #:nodoc:
+
+  # Message lookup, to allow localization.
+  #
   module Messages
 
     def messages=(new_messages)
@@ -7,7 +11,10 @@ module Clamp
     end
 
     def message(key, options = {})
-      format(messages.fetch(key), options)
+      string = messages.fetch(key)
+      return string if options.empty?
+
+      format string, options
     end
 
     def clear_messages!
@@ -17,19 +24,22 @@ module Clamp
     private
 
     DEFAULTS = {
-      :too_many_arguments => "too many arguments",
-      :option_required => "option '%<option>s' is required",
-      :option_or_env_required => "option '%<option>s' (or env %<env>s) is required",
-      :option_argument_error => "option '%<switch>s': %<message>s",
-      :parameter_argument_error => "parameter '%<param>s': %<message>s",
-      :env_argument_error => "$%<env>s: %<message>s",
-      :unrecognised_option => "Unrecognised option '%<switch>s'",
-      :no_such_subcommand => "No such sub-command '%<name>s'",
-      :no_value_provided => "no value provided",
-      :usage_heading => "Usage",
-      :parameters_heading => "Parameters",
-      :subcommands_heading => "Subcommands",
-      :options_heading => "Options"
+      too_many_arguments: "too many arguments",
+      option_required: "option '%<option>s' is required",
+      option_or_env_required: "option '%<option>s' (or env %<env>s) is required",
+      option_argument_error: "option '%<switch>s': %<message>s",
+      parameter_argument_error: "parameter '%<param>s': %<message>s",
+      env_argument_error: "$%<env>s: %<message>s",
+      unrecognised_option: "Unrecognised option '%<switch>s'",
+      no_such_subcommand: "No such sub-command '%<name>s'",
+      no_value_provided: "no value provided",
+      default: "default",
+      or: "or",
+      required: "required",
+      usage_heading: "Usage",
+      parameters_heading: "Parameters",
+      subcommands_heading: "Subcommands",
+      options_heading: "Options"
     }.freeze
 
     def messages

data/lib/clamp/option/declaration.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require "clamp/attribute/declaration"
 require "clamp/option/definition"
 
 module Clamp
   module Option
 
+    # Option declaration methods.
+    #
     module Declaration
 
       include Clamp::Attribute::Declaration
@@ -25,7 +29,7 @@ module Clamp
       end
 
       def recognised_options
-        unless @implicit_options_declared
+        unless @implicit_options_declared ||= false
           declare_implicit_help_option
           @implicit_options_declared = true
         end

data/lib/clamp/option/definition.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require "clamp/attribute/definition"
 require "clamp/truthy"
 
 module Clamp
   module Option
 
+    # Represents an option of a Clamp::Command class.
+    #
     class Definition < Attribute::Definition
 
       def initialize(switches, type, description, options = {})
@@ -76,14 +80,16 @@ module Clamp
       end
 
       def infer_attribute_name
-        unless long_switch
-          raise Clamp::DeclarationError, "You must specify either a long-switch or an :attribute_value"
-        end
+        raise Clamp::DeclarationError, "You must specify either a long-switch or an :attribute_value" unless long_switch
         inferred_name = long_switch.sub(/^--(\[no-\])?/, "").tr("-", "_")
         inferred_name += "_list" if multivalued?
         inferred_name
       end
 
+      def required_indicator
+        Clamp.message(:required) if required?
+      end
+
     end
 
   end

data/lib/clamp/option/parsing.rb

@@ -1,11 +1,17 @@
-module Clamp
+# frozen_string_literal: true
+
+module Clamp #:nodoc:
 
   class << self
+
     attr_accessor :allow_options_after_parameters
+
   end
 
   module Option
 
+    # Option parsing methods.
+    #
     module Parsing
 
       protected
@@ -13,7 +19,6 @@ module Clamp
       def parse_options
         set_options_from_command_line
         default_options_from_environment
-        verify_required_options_are_set
       end
 
       private
@@ -22,43 +27,43 @@ module Clamp
         argument_buffer = []
         argument_buffer_limit = self.class.parameter_buffer_limit
         until remaining_arguments.empty?
-
           unless remaining_arguments.first.start_with?("-")
-            if argument_buffer.size < argument_buffer_limit
-              argument_buffer << remaining_arguments.shift
-              next
-            else
-              break
-            end
+            break unless argument_buffer.size < argument_buffer_limit
+            argument_buffer << remaining_arguments.shift
+            next
           end
-
           switch = remaining_arguments.shift
           break if switch == "--"
+          handle_switch(switch)
+        end
+        remaining_arguments.unshift(*argument_buffer)
+      end
 
-          case switch
-          when /\A(-\w)(.+)\z/m # combined short options
-            switch = Regexp.last_match(1)
-            if find_option(switch).flag?
-              remaining_arguments.unshift("-" + Regexp.last_match(2))
-            else
-              remaining_arguments.unshift(Regexp.last_match(2))
-            end
-          when /\A(--[^=]+)=(.*)\z/m
-            switch = Regexp.last_match(1)
-            remaining_arguments.unshift(Regexp.last_match(2))
-          end
-
-          option = find_option(switch)
-          value = option.extract_value(switch, remaining_arguments)
+      def handle_switch(switch)
+        switch = split_trailing_switches(switch)
+        option = find_option(switch)
+        value = option.extract_value(switch, remaining_arguments)
+        begin
+          option.of(self).take(value)
+        rescue ArgumentError => e
+          signal_usage_error Clamp.message(:option_argument_error, switch: switch, message: e.message)
+        end
+      end
 
-          begin
-            option.of(self).take(value)
-          rescue ArgumentError => e
-            signal_usage_error Clamp.message(:option_argument_error, :switch => switch, :message => e.message)
+      def split_trailing_switches(switch)
+        case switch
+        when /\A(-\w)(.+)\z/m # combined short options
+          switch = Regexp.last_match(1)
+          if find_option(switch).flag?
+            remaining_arguments.unshift("-" + Regexp.last_match(2))
+          else
+            remaining_arguments.unshift(Regexp.last_match(2))
           end
-
+        when /\A(--[^=]+)=(.*)\z/m
+          switch = Regexp.last_match(1)
+          remaining_arguments.unshift(Regexp.last_match(2))
         end
-        remaining_arguments.unshift(*argument_buffer)
+        switch
       end
 
       def default_options_from_environment
@@ -69,23 +74,13 @@ module Clamp
 
       def verify_required_options_are_set
         self.class.recognised_options.each do |option|
-          # If this option is required and the value is nil, there's an error.
-          next unless option.required? && send(option.attribute_name).nil?
-          if option.environment_variable
-            message = Clamp.message(:option_or_env_required,
-                                    :option => option.switches.first,
-                                    :env => option.environment_variable)
-          else
-            message = Clamp.message(:option_required,
-                                    :option => option.switches.first)
-          end
-          signal_usage_error message
+          option.of(self).verify_not_missing
         end
       end
 
       def find_option(switch)
         self.class.find_option(switch) ||
-          signal_usage_error(Clamp.message(:unrecognised_option, :switch => switch))
+          signal_usage_error(Clamp.message(:unrecognised_option, switch: switch))
       end
 
     end

data/lib/clamp/parameter/declaration.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require "clamp/attribute/declaration"
 require "clamp/parameter/definition"
 
 module Clamp
   module Parameter
 
+    # Parameter declaration methods.
+    #
     module Declaration
 
       include Clamp::Attribute::Declaration

data/lib/clamp/parameter/definition.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 require "clamp/attribute/definition"
 
 module Clamp
   module Parameter
 
+    # Represents an parameter of a Clamp::Command class.
+    #
     class Definition < Attribute::Definition
 
       def initialize(name, description, options = {})
@@ -40,13 +44,15 @@ module Clamp
 
       def infer_attribute_name
         inferred_name = name.downcase.tr("-", "_").sub(ELLIPSIS_SUFFIX, "").sub(OPTIONAL) { Regexp.last_match(1) }
-        unless inferred_name =~ VALID_ATTRIBUTE_NAME
-          raise "cannot infer attribute_name from #{name.inspect}"
-        end
+        raise "cannot infer attribute_name from #{name.inspect}" unless inferred_name =~ VALID_ATTRIBUTE_NAME
         inferred_name += "_list" if multivalued?
         inferred_name
       end
 
+      def required_indicator
+        # implied by LHS
+      end
+
     end
 
   end

data/lib/clamp/parameter/parsing.rb

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 module Clamp
   module Parameter
 
+    # Parameter parsing methods.
+    #
     module Parsing
 
       protected
@@ -19,7 +23,7 @@ module Clamp
               parameter.of(self).take(value)
             end
           rescue ArgumentError => e
-            signal_usage_error Clamp.message(:parameter_argument_error, :param => parameter.name, :message => e.message)
+            signal_usage_error Clamp.message(:parameter_argument_error, param: parameter.name, message: e.message)
           end
         end
       end

data/lib/clamp/subcommand/declaration.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require "clamp/errors"
 require "clamp/subcommand/definition"
 
 module Clamp
   module Subcommand
 
+    # Subcommand declaration methods.
+    #
     module Declaration
 
       def recognised_subcommands
@@ -37,18 +41,16 @@ module Clamp
       end
 
       def default_subcommand=(name)
-        if has_subcommands?
-          raise Clamp::DeclarationError, "default_subcommand must be defined before subcommands"
-        end
+        raise Clamp::DeclarationError, "default_subcommand must be defined before subcommands" if has_subcommands?
         @default_subcommand = name
       end
 
       def default_subcommand(*args, &block)
         if args.empty?
-          @default_subcommand
+          @default_subcommand ||= false
         else
           $stderr.puts "WARNING: Clamp default_subcommand syntax has changed; check the README."
-          $stderr.puts "  (from #{caller.first})"
+          $stderr.puts "  (from #{caller(1..1).first})"
           self.default_subcommand = args.first
           subcommand(*args, &block)
         end
@@ -57,21 +59,21 @@ module Clamp
       private
 
       def declare_subcommand_parameters
-        if @default_subcommand
+        if default_subcommand
           parameter "[SUBCOMMAND]", "subcommand",
-                    :attribute_name => :subcommand_name,
-                    :default => @default_subcommand,
-                    :inheritable => false
+                    attribute_name: :subcommand_name,
+                    default: default_subcommand,
+                    inheritable: false
         else
           parameter "SUBCOMMAND", "subcommand",
-                    :attribute_name => :subcommand_name,
-                    :required => false,
-                    :inheritable => false
+                    attribute_name: :subcommand_name,
+                    required: false,
+                    inheritable: false
         end
-        remove_method :default_subcommand_name
+        remove_method :default_subcommand_name if method_defined?(:default_subcommand_name)
         parameter "[ARG] ...", "subcommand arguments",
-                  :attribute_name => :subcommand_arguments,
-                  :inheritable => false
+                  attribute_name: :subcommand_arguments,
+                  inheritable: false
       end
 
     end

data/lib/clamp/subcommand/definition.rb

@@ -1,16 +1,15 @@
+# frozen_string_literal: true
+
 module Clamp
   module Subcommand
 
-    Definition = Struct.new(:name, :description, :subcommand_class) do
+    Definition = Struct.new(:names, :description, :subcommand_class) do
 
       def initialize(names, description, subcommand_class)
-        @names = Array(names)
-        @description = description
-        @subcommand_class = subcommand_class
+        names = Array(names)
+        super
       end
 
-      attr_reader :names, :description, :subcommand_class
-
       def is_called?(name)
         names.member?(name)
       end

data/lib/clamp/subcommand/execution.rb

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 module Clamp
   module Subcommand
 
+    # Support for subcommand execution.
+    #
+    # This module is mixed into command instances that have subcommands, overriding
+    # default behaviour in {Clamp::Command}.
+    #
     module Execution
 
       # override default Command behaviour
@@ -24,7 +31,7 @@ module Clamp
       end
 
       def invocation_path_for(name)
-        param_names = self.class.inheritable_parameters.map(&:name)
+        param_names = self.class.parameters.select(&:inheritable?).map(&:name)
         [invocation_path, *param_names, name].join(" ")
       end
 
@@ -34,6 +41,10 @@ module Clamp
         subcommand_missing(name)
       end
 
+      def verify_required_options_are_set
+        # not required
+      end
+
     end
 
   end

data/lib/clamp/subcommand/parsing.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 require "clamp/subcommand/execution"
 
 module Clamp
   module Subcommand
 
+    # Subcommand parsing methods.
+    #
     module Parsing
 
       protected

data/lib/clamp/truthy.rb

@@ -1,6 +1,8 @@
-module Clamp
+# frozen_string_literal: true
 
-  TRUTHY_VALUES = %w(1 yes enable on true).freeze
+module Clamp #:nodoc:
+
+  TRUTHY_VALUES = %w[1 yes enable on true].freeze
 
   def self.truthy?(arg)
     TRUTHY_VALUES.include?(arg.to_s.downcase)