opt 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2JlZjg3YjFkYzA5N2QzNjYwNWZmMWQ4ODkwZTc5NjRlZmZhOWNkYw==
+    NDY2ZTNiM2Q0MjhkYTMyMWU3MDA1MzFjY2M2YjhmNTIzNWY3OGQ4OA==
   data.tar.gz: !binary |-
-    MjE4NmNlNDMzYzhkNTQ5NDUxYWExNDU1ZGNkYTc4MmFkOGNlZmEwNA==
+    YzVmYjdmN2MwMDUxMGRmZTIyNzU4NGExOWIxM2E3NzI0ZGJjZGEwMw==
 SHA512:
   metadata.gz: !binary |-
-    ZGI2ZmRjODA3NjU5MmUxYzc1MTMwZTRlZGM4ZmY3YWZmN2YyMDFhNjA2ZmQ3
-    NTlhZTEwYTJiODM1NGJlN2VjMGQ3NTJmNzAxMjk0NjI2NmJmZmI4Zjg1NDdm
-    MjU3N2U0ODdjZDQxMTRiZmQzNGZiMmEyM2M1MTFmNmY2ODgxOGI=
+    ZDUzY2FhOWQ3ZTkzODM0ZDcyNGJlNDQyMjZkZjBmYTNlN2Y5NWU1MjA4Nzky
+    ODgzM2Y0N2UxMWNlY2YzMjBlNTM0YjQ4ZmUzODYzMmY0NjFjYzM5MDEzYjQ3
+    Y2M1MDBhNmFhNjU1YjViNTgzODgxY2I4YjlhM2M4MTgwYjE4MmM=
   data.tar.gz: !binary |-
-    Y2YzYmVkMzM1MWU4NzMwMDY2N2RiNjYzZmEzOGMyZGNhNDA0ZDQzYTNkY2Rj
-    MWRhNWNjZGIyOTI5NzJmYmExNzVmMzY4MThhZDk2OGJhNTA3OTMwZGZkZjRl
-    NzlmMmI1MWJhMDYyZTc1MzRhMWQ2MmYyNzE4NDI5ZWEwNjIwYmQ=
+    ZTA3ZjNkMzE1NTg4NGQxMGQ0ZGQ3MzA0YzkxMjAzODIxZjRhY2Q1MzE2Yjk0
+    MTIwOTNjZWIxODY1Y2FhYmZmZjg2MDBhNzI3NGYwM2IyZDE4NmRlMGQyYjlj
+    Mzc4NTU3ODJiNzEwMmUwMmY3ZTFiNmNjZmVmZDRlZjA2YWIzNmQ=

data/README.md

@@ -36,7 +36,7 @@ You can also specify subcommands, the number of arguments for a switch or a text
 opt = Opt.new
 opt.command 'merge' do |cmd|
   cmd.option '--out, -O', nargs: 1
-  cmd.option 'file', name: :files, nargs: '+'
+  cmd.option 'file', name: :files, nargs: 0..Opt::Infinity
 end
 
 result = opt.parse %w(merge --out out.txt file1.txt file2.txt)

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.last > 0
+        unless nargs.min > 0 || nargs.max > 0
           raise 'A text option must consist of at least one argument.'
         end
       else
@@ -115,7 +115,7 @@ module Opt
       else
         args = []
         if argv.any? && argv.first.text?
-          while argv.any? && argv.first.text? && args.size < nargs.last
+          while argv.any? && argv.first.text? && args.size < nargs.max
             args << argv.shift.value
           end
         elsif argv.any? && argv.first.short?
@@ -139,59 +139,22 @@ module Opt
       def parse_nargs(num)
         case num
           when Range
-            parse_nargs_range(num)
-          when Array
-            parse_nargs_array(num)
+            if num.min && num.max
+              if num.min >= 0
+                num
+              else
+                raise ArgumentError.new \
+                  'Argument number must not be less than zero.'
+              end
+            else
+              raise ArgumentError.new \
+                'Range must be ordered.'
+            end
+          when Numeric
+            parse_nargs num..num
           else
-            parse_nargs_obj(num)
-        end
-      end
-
-      def parse_nargs_obj(obj)
-        case obj.to_s.downcase
-          when '+'
-            1..Float::INFINITY
-          when '*', 'inf', 'infinity'
-            0..Float::INFINITY
-          else
-            i = Integer(obj.to_s)
-            parse_nargs_range i..i
-        end
-      end
-
-      def parse_nargs_range(range)
-        if range.first > range.last
-          if range.exclude_end?
-            range = Range.new(range.last + 1, range.first)
-          else
-            range = Range.new(range.last, range.first)
-          end
-        end
-
-        if range.first < 0
-          raise RuntimeError.new 'Argument number must not be less than zero.'
-        end
-
-        range
-      end
-
-      def parse_nargs_array(obj)
-        if obj.size == 2
-          parse_nargs_range Range.new(parse_nargs_array_obj(obj[0]),
-                                      parse_nargs_array_obj(obj[1]))
-        else
-
-          raise ArgumentError.new \
-            'Argument number array count must be exactly two.'
-        end
-      end
-
-      def parse_nargs_array_obj(obj)
-        case obj.to_s.downcase
-          when '*', 'inf', 'infinity'
-            Float::INFINITY
-          else
-            Integer(obj.to_s)
+            i = Integer(num.to_s)
+            parse_nargs i..i
         end
       end
     end

data/lib/opt/version.rb

@@ -1,3 +1,13 @@
 module Opt
-  VERSION = "0.1.1"
+  module VERSION
+    MAJOR = 0
+    MINOR = 2
+    PATCH = 0
+    STAGE = nil
+    STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
+
+    def self.to_s
+      STRING
+    end
+  end
 end

data/lib/opt.rb

@@ -9,6 +9,13 @@ module Opt
   def self.new
     Program.new.tap{|p| yield p if block_given? }
   end
+
+  module Constants
+    Inf      = 1.0 / 0.0
+    Infinity = 1.0 / 0.0
+  end
+
+  include Constants
 end
 
 #   #

data/spec/opt/option_spec.rb

@@ -44,41 +44,23 @@ describe Opt::Option do
     end
 
     it 'should parse range' do
-      expect(described_class.parse_nargs(2..6)).to eq 2..6
+      expect(described_class.parse_nargs(2..Opt::Inf)).to eq 2..Float::INFINITY
     end
 
     it 'should parse fixnum string' do
       expect(described_class.parse_nargs('12')).to eq 12..12
     end
 
-    it 'should parse special infinity string' do
-      expect(described_class.parse_nargs('*')).to eq 0..Float::INFINITY
-    end
-
-    it 'should parse special infinity symbol (I)' do
-      expect(described_class.parse_nargs(:inf)).to eq 0..Float::INFINITY
-    end
-
-    it 'should parse special infinity symbol (II)' do
-      expect(described_class.parse_nargs(:infinity)).to eq 0..Float::INFINITY
-    end
-
-    it 'should parse array (I)' do
-      expect(described_class.parse_nargs([3, :inf])).to eq 3..Float::INFINITY
-    end
-
-    it 'should parse array (II)' do
-      expect(described_class.parse_nargs([3, 100])).to eq 3..100
-    end
-
     it 'should reject invalid string' do
       expect do
         described_class.parse_nargs('a12')
       end.to raise_error(/invalid value for Integer/)
     end
 
-    it 'should flip negative range' do
-      expect(described_class.parse_nargs(6..2)).to eq 2..6
+    it 'should reject invalid range' do
+      expect do
+        described_class.parse_nargs(6..2)
+      end.to raise_error(/Range must be ordered./)
     end
 
     it 'should reject negative range' do

data/spec/opt_spec.rb

@@ -15,7 +15,7 @@ describe Opt do
 
   it 'should detect double-dash' do
     opt.option '-v', name: :version
-    opt.option 'rest', nargs: '+'
+    opt.option 'rest', nargs: 1..Opt::Inf
 
     result = opt.parse %w(-v -- -h)
     expect(result.version?).to be true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Graichen