clamp 1.2.0.beta1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec7a5c34695b2517afb8215a0cbe8e9e4b2c8b9
-  data.tar.gz: f20e0d18b9e4be570fc7ae1f349d4d022f0f7644
+  metadata.gz: 2fe91eba2afc3a9297ecee33bfaf08a3be3522db
+  data.tar.gz: 54f0085f58bf85f9cb5d0db0339eaabfe7ffb528
 SHA512:
-  metadata.gz: 554f0e8fefe510adeacd74357333302d2f3ae9a4b98f87e0140956e4b35ff6f60b7b3031260b8cba2c2f96079b201ebc4c6256bed160d52038a079e7538defda
-  data.tar.gz: 85d29744e560feb6c06096739df752128bd1df915237da53b1c7ea7150ade1d3516016eb3014c7fc1f2958fdcf2074c35e00d6aa64057a8c8c56c9c82094f879
+  metadata.gz: ffd0bc644d279f96e68663a0a815ebc0c6825d8cbb4ec69d2fea5315e273fdc587040f1dc761cb51a66362aa6b203789d9c15f56b02bd37c1c98024eaf6b79ff
+  data.tar.gz: 06a3e512e3bec497227459f93a9dfd7357fd258695f837d1a3ba4569ae2f3bcfeb0561a7d65f8163b5272e0251224017b7e80e64fbe861295223c9ade8ce9e69

data/.rubocop.yml

@@ -2,6 +2,15 @@ Eval:
   Exclude:
     - "Rakefile"
 
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Layout/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines
+
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -11,9 +20,13 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 30
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false
 
+Naming/FileName:
+  Exclude:
+    - "bin/*"
+
 Style/ClassAndModuleChildren:
   EnforcedStyle: nested
   Exclude:
@@ -24,23 +37,9 @@ Style/Documentation:
     - "lib/**/version.rb"
     - "spec/**/*"
 
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-Style/EmptyLinesAroundClassBody:
-  EnforcedStyle: empty_lines
-
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-
 Style/Encoding:
-  EnforcedStyle: when_needed
   Enabled: true
 
-Style/FileName:
-  Exclude:
-    - "bin/*"
-
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
@@ -50,7 +49,7 @@ Style/Lambda:
 Style/NumericLiterals:
   Enabled: false
 
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: false
 
 Style/StringLiterals:

data/CHANGES.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## PENDING
+## 1.2.0 (2018-02-12)
 
 * Add option to `Clamp.allow_options_after_parameters`.
 

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
   gem "guard-rspec", "~> 4.6.5", :require => false
   gem "listen", "~> 3.0.2"
   gem "rake", "~> 10.4"
-  gem "rubocop", "~> 0.43.0", :require => false
+  gem "rubocop", :require => false
 end
 
 group :test do

data/README.md

@@ -298,11 +298,13 @@ Clamp will check the specified envariables in the absence of values supplied on
 
 ### Allowing options after parameters
 
-Many option-parsing libraries - notably [GNU `getopt(3)`](https://www.gnu.org/software/libc/manual/html_node/Using-Getopt.html) - allow option and parameter arguments to appear in any order on the command-line, e.g.
+By default, Clamp only recognises options _before_ positional parameters. 
+
+Some other option-parsing libraries - notably [GNU `getopt(3)`](https://www.gnu.org/software/libc/manual/html_node/Using-Getopt.html) - allow option and parameter arguments to appear in any order on the command-line, e.g.
 
     foobar --foo=bar something --fnord=snuffle another-thing
 
-By default, Clamp does not allow options and parameters to be "interspersed" in this way. If you want that behaviour, set:
+If you want Clamp to allow options and parameters to be "interspersed" in this way, set:
 
 ```ruby
 Clamp.allow_options_after_parameters = true

data/lib/clamp/option/parsing.rb

@@ -69,8 +69,10 @@ 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 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,

data/lib/clamp/version.rb

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

data/spec/clamp/command_spec.rb

@@ -269,6 +269,34 @@ describe Clamp::Command do
 
     end
 
+    context "with :required and :multivalued" do
+
+      before do
+        command.class.option "--port", "PORT", "port to listen on", :required => true, :multivalued => true
+      end
+
+      context "when no value is provided" do
+
+        it "raises a UsageError" do
+          expect do
+            command.parse([])
+          end.to raise_error(Clamp::UsageError)
+        end
+
+      end
+
+      context "when a value is provided" do
+
+        it "does not raise an error" do
+          expect do
+            command.parse(["--port", "12345"])
+          end.not_to raise_error
+        end
+
+      end
+
+    end
+
     context "with a block" do
 
       before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clamp
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta1
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies: []
 description: |
   Clamp provides an object-model for command-line utilities.
@@ -82,9 +82,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13