clamp 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fe91eba2afc3a9297ecee33bfaf08a3be3522db
-  data.tar.gz: 54f0085f58bf85f9cb5d0db0339eaabfe7ffb528
+  metadata.gz: 7e919d5a5f983e9de93adeccf16090c2ccf673d6
+  data.tar.gz: fcc637ed598db752ac2411970391ff9440e96fcc
 SHA512:
-  metadata.gz: ffd0bc644d279f96e68663a0a815ebc0c6825d8cbb4ec69d2fea5315e273fdc587040f1dc761cb51a66362aa6b203789d9c15f56b02bd37c1c98024eaf6b79ff
-  data.tar.gz: 06a3e512e3bec497227459f93a9dfd7357fd258695f837d1a3ba4569ae2f3bcfeb0561a7d65f8163b5272e0251224017b7e80e64fbe861295223c9ade8ce9e69
+  metadata.gz: bc3d0c1e9a7172ab3a0f8d09cc0583aec4f03ee8a85db033d2e0c413a03a7455ddc1c1cca622781620a28ab47148ebe9b3245d54ac533278bc0398e767dc558b
+  data.tar.gz: 9551a0bbae48288c19b9ac5a2f1918753620d4deefd8efc1e47fa5206c9911e9ee80aa60223f017133e7ff545d8d61624ff1308fb17a9412d2c1724ee6623c9b

data/lib/clamp/attribute/definition.rb

@@ -74,6 +74,17 @@ module Clamp
         Attribute::Instance.new(self, command)
       end
 
+      def option_missing_message
+        if environment_variable
+          Clamp.message(:option_or_env_required,
+                        :option => switches.first,
+                        :env => environment_variable)
+        else
+          Clamp.message(:option_required,
+                        :option => switches.first)
+        end
+      end
+
       private
 
       def default_description

data/lib/clamp/attribute/instance.rb

@@ -60,6 +60,10 @@ module Clamp
         end
       end
 
+      def signal_usage_error(*args)
+        command.send(:signal_usage_error, *args)
+      end
+
       def default_from_environment
         return if self.defined?
         return if attribute.environment_variable.nil?
@@ -69,10 +73,26 @@ module Clamp
         begin
           take(value)
         rescue ArgumentError => e
-          command.send(:signal_usage_error, Clamp.message(:env_argument_error, :env => attribute.environment_variable, :message => e.message))
+          signal_usage_error Clamp.message(:env_argument_error, :env => attribute.environment_variable, :message => e.message)
         end
       end
 
+      def unset?
+        if attribute.multivalued?
+          read.empty?
+        else
+          read.nil?
+        end
+      end
+
+      def missing?
+        attribute.required? && unset?
+      end
+
+      def verify_not_missing
+        signal_usage_error attribute.option_missing_message if missing?
+      end
+
     end
 
   end

data/lib/clamp/option/parsing.rb

@@ -69,19 +69,7 @@ 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 (or [] for multivalued), there's an error.
-          next unless option.required? &&
-		  (!option.multivalued? && send(option.attribute_name).nil?) ||
-		  (option.multivalued? && send(option.attribute_name).empty?)
-          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
 

data/lib/clamp/version.rb

@@ -1,3 +1,3 @@
 module Clamp
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

data/spec/clamp/command_spec.rb

@@ -139,6 +139,12 @@ describe Clamp::Command do
         expect(command.flavours).to eql %w(mud pie)
       end
 
+      it "does not require a value" do
+        expect do
+          command.parse([])
+        end.not_to raise_error
+      end
+
     end
 
     context "with :environment_variable" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clamp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies: []
 description: |
   Clamp provides an object-model for command-line utilities.