opt 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4c5e2c614056045ba24f44b7fe368b76bc3c8ae7
-  data.tar.gz: 42212a7f059c754fd846bbcbd9f5ad6823ca8a57
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2JlZjg3YjFkYzA5N2QzNjYwNWZmMWQ4ODkwZTc5NjRlZmZhOWNkYw==
+  data.tar.gz: !binary |-
+    MjE4NmNlNDMzYzhkNTQ5NDUxYWExNDU1ZGNkYTc4MmFkOGNlZmEwNA==
 SHA512:
-  metadata.gz: 29820dfd8267e9fe3e95586b74738e6094949ca4b4d95810522e9a7bf3f1ddc8ff7ae1c55b91f0f3422440a18d4e49c33f43fa6a085028a2e337752871c137c2
-  data.tar.gz: 9d70b7861cc491645a317f7d608f503682afa42f80951a4163662efd7a78b704d67a8e835b0ecd83c1ca4b20c12bc18deae2479e80e2f15005f76d15ae17863e
+  metadata.gz: !binary |-
+    ZGI2ZmRjODA3NjU5MmUxYzc1MTMwZTRlZGM4ZmY3YWZmN2YyMDFhNjA2ZmQ3
+    NTlhZTEwYTJiODM1NGJlN2VjMGQ3NTJmNzAxMjk0NjI2NmJmZmI4Zjg1NDdm
+    MjU3N2U0ODdjZDQxMTRiZmQzNGZiMmEyM2M1MTFmNmY2ODgxOGI=
+  data.tar.gz: !binary |-
+    Y2YzYmVkMzM1MWU4NzMwMDY2N2RiNjYzZmEzOGMyZGNhNDA0ZDQzYTNkY2Rj
+    MWRhNWNjZGIyOTI5NzJmYmExNzVmMzY4MThhZDk2OGJhNTA3OTMwZGZkZjRl
+    NzlmMmI1MWJhMDYyZTc1MzRhMWQ2MmYyNzE4NDI5ZWEwNjIwYmQ=

data/lib/opt/option.rb

@@ -57,7 +57,7 @@ module Opt
         @switches = Set.new
         @name     = options.fetch(:name, definition).to_s.freeze
 
-        unless nargs.first > 0 || nargs.size > 1
+        unless nargs.first > 0 || nargs.last > 0
           raise 'A text option must consist of at least one argument.'
         end
       else
@@ -79,7 +79,8 @@ module Opt
     end
 
     def collide?(option)
-      name == option.name || !switches.disjoint?(option.switches)
+      name == option.name ||
+      switches.any?{|s1| option.switches.any?{|s2| s1.eql?(s2) }}
     end
 
     def parse!(argv, result)
@@ -109,7 +110,7 @@ module Opt
     end
 
     def parse_args!(argv, result)
-      if nargs.first == 0 && nargs.last == 0
+      if nargs == (0..0)
         result[name] = value
       else
         args = []
@@ -122,7 +123,7 @@ module Opt
         end
 
         if nargs.include?(args.size)
-          if nargs.first == 1 && nargs.last == 1
+          if nargs == (1..1)
             result[name] = args.first
           else
             result[name] = args

data/lib/opt/version.rb

@@ -1,3 +1,3 @@
 module Opt
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/opt/option_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 RSpec::Matchers.define :parse do |*expected|
@@ -112,6 +113,11 @@ describe Opt::Option do
       expect(option).to be_text
       expect(option.name).to eq 'file'
     end
+
+    it 'should raise error on invalid nargs on free-text' do
+      expect { described_class.new('file', nargs: 0) }.to \
+        raise_error(/A text option must consist of at least one argument/)
+    end
   end
 
   describe '#parse!' do

data/spec/opt/switch_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Opt::Switch do

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'rspec'
 
 if ENV['CI'] || ENV['COVERAGE']
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+
   require 'coveralls'
   Coveralls.wear! do
     add_filter 'spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jan Graichen
@@ -14,14 +14,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 description: An option parsing library. Optional.
@@ -58,12 +58,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -79,3 +79,4 @@ test_files:
 - spec/opt_spec.rb
 - spec/readme_spec.rb
 - spec/spec_helper.rb
+has_rdoc: