rubysl-getoptlong 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3536cc041a64d512b90faa69b462239d59a7d76c
-  data.tar.gz: 83ff9342026f92d5c9a5fc2ea5af625a1f6fc2b6
+  metadata.gz: 33eae63a1731a9502d501689c0f1d1ab36116bbe
+  data.tar.gz: 9e5df99b50bb9312fd49263c8047d4cf3fcf5152
 SHA512:
-  metadata.gz: a479f266722fef5c6415da317ac4bd1c2dec4eea7c5d5862bf58c370652b1326ff7d613b611ca18f88b8d3321e73548a1a2854018cf322c28bc6257891b8a099
-  data.tar.gz: c6a81a360957af20d366886f6691bcf784164e0aec3f8264c48f7848279b3d74156aa2e8461e982ac5da0f80b02ccce380dc34c1ff0d5210e315fc176c97c2b9
+  metadata.gz: 1e240bf44aef8bff5cc3826b00787062bd7d8467045af1ccabc7b783b5ce6addcace72bbf4d0d18ceb2ba20615f2f13645e8e910297010de42354f54cc61403e
+  data.tar.gz: d0118f759d0cceb310b673c2fb553fa54a12b6282582270f32953b4e7ea547554b3fcdd9ce258c6961ebd947332669c65e8ab813ef192e3db6e8153614ebc396

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
+env:
+  - RUBYLIB=lib
 script: bundle exec mspec spec
 rvm:
-  - rbx-nightly-18mode
+  - rbx-nightly-19mode

data/lib/rubysl/getoptlong/getoptlong.rb

@@ -12,10 +12,10 @@
 # found at http://www.sra.co.jp/people/m-kasahr/ruby/getoptlong/
 
 # The GetoptLong class allows you to parse command line options similarly to
-# the GNU getopt_long() C library call. Note, however, that GetoptLong is a 
+# the GNU getopt_long() C library call. Note, however, that GetoptLong is a
 # pure Ruby implementation.
 #
-# GetoptLong allows for POSIX-style options like <tt>--file</tt> as well 
+# GetoptLong allows for POSIX-style options like <tt>--file</tt> as well
 # as single letter options like <tt>-f</tt>
 #
 # The empty option <tt>--</tt> (two minus symbols) is used to end option
@@ -24,41 +24,34 @@
 #
 # Here is a simple example of usage:
 #
-#     # == Synopsis
-#     #
-#     # hello: greets user, demonstrates command line parsing
-#     #
-#     # == Usage
-#     #
-#     # hello [OPTION] ... DIR
-#     #
-#     # -h, --help:
-#     #    show help
-#     #
-#     # --repeat x, -n x:
-#     #    repeat x times
-#     #
-#     # --name [name]:
-#     #    greet user by name, if name not supplied default is John
-#     #
-#     # DIR: The directory in which to issue the greeting.
-#     
 #     require 'getoptlong'
-#     require 'rdoc/usage'
-#     
+#
 #     opts = GetoptLong.new(
 #       [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
 #       [ '--repeat', '-n', GetoptLong::REQUIRED_ARGUMENT ],
 #       [ '--name', GetoptLong::OPTIONAL_ARGUMENT ]
 #     )
-#     
+#
 #     dir = nil
 #     name = nil
 #     repetitions = 1
 #     opts.each do |opt, arg|
 #       case opt
 #         when '--help'
-#           RDoc::usage
+#           puts <<-EOF
+#     hello [OPTION] ... DIR
+#
+#     -h, --help:
+#        show help
+#
+#     --repeat x, -n x:
+#        repeat x times
+#
+#     --name [name]:
+#        greet user by name, if name not supplied default is John
+#
+#     DIR: The directory in which to issue the greeting.
+#           EOF
 #         when '--repeat'
 #           repetitions = arg.to_i
 #         when '--name'
@@ -69,14 +62,14 @@
 #           end
 #       end
 #     end
-#     
+#
 #     if ARGV.length != 1
 #       puts "Missing dir argument (try --help)"
 #       exit 0
 #     end
-#     
+#
 #     dir = ARGV.shift
-#     
+#
 #     Dir.chdir(dir)
 #     for i in (1..repetitions)
 #       print "Hello"
@@ -111,7 +104,7 @@ class GetoptLong
   # Error types.
   #
   class Error  < StandardError; end
-  class AmbigousOption   < Error; end
+  class AmbiguousOption   < Error; end
   class NeedlessArgument < Error; end
   class MissingArgument  < Error; end
   class InvalidOption    < Error; end
@@ -120,7 +113,7 @@ class GetoptLong
   # Set up option processing.
   #
   # The options to support are passed to new() as an array of arrays.
-  # Each sub-array contains any number of String option names which carry 
+  # Each sub-array contains any number of String option names which carry
   # the same meaning, and one of the following flags:
   #
   # GetoptLong::NO_ARGUMENT :: Option does not take an argument.
@@ -157,7 +150,7 @@ class GetoptLong
     @argument_flags = Hash.new
 
     #
-    # Whether error messages are output to $deferr.
+    # Whether error messages are output to $stderr.
     #
     @quiet = FALSE
 
@@ -200,23 +193,23 @@ class GetoptLong
   # the processing of options as follows:
   #
   # <b>REQUIRE_ORDER</b> :
-  # 
+  #
   # Options are required to occur before non-options.
   #
   # Processing of options ends as soon as a word is encountered that has not
   # been preceded by an appropriate option flag.
   #
   # For example, if -a and -b are options which do not take arguments,
-  # parsing command line arguments of '-a one -b two' would result in 
-  # 'one', '-b', 'two' being left in ARGV, and only ('-a', '') being 
+  # parsing command line arguments of '-a one -b two' would result in
+  # 'one', '-b', 'two' being left in ARGV, and only ('-a', '') being
   # processed as an option/arg pair.
   #
   # This is the default ordering, if the environment variable
   # POSIXLY_CORRECT is set. (This is for compatibility with GNU getopt_long.)
   #
   # <b>PERMUTE</b> :
-  #  
-  # Options can occur anywhere in the command line parsed. This is the 
+  #
+  # Options can occur anywhere in the command line parsed. This is the
   # default behavior.
   #
   # Every sequence of words which can be interpreted as an option (with or
@@ -233,7 +226,7 @@ class GetoptLong
   #
   # <b>RETURN_IN_ORDER</b> :
   #
-  # All words on the command line are processed as options. Words not 
+  # All words on the command line are processed as options. Words not
   # preceded by a short or long option flag are passed as arguments
   # with an option of '' (empty string).
   #
@@ -248,7 +241,7 @@ class GetoptLong
     if @status != STATUS_YET
       set_error(ArgumentError, "argument error")
       raise RuntimeError,
-	"invoke ordering=, but option processing has already started"
+        "invoke ordering=, but option processing has already started"
     end
 
     #
@@ -279,8 +272,8 @@ class GetoptLong
     # The method is failed if option processing has already started.
     #
     if @status != STATUS_YET
-      raise RuntimeError, 
-	"invoke set_options, but option processing has already started"
+      raise RuntimeError,
+        "invoke set_options, but option processing has already started"
     end
 
     #
@@ -290,11 +283,8 @@ class GetoptLong
     @argument_flags.clear
 
     arguments.each do |arg|
-      #
-      # Each argument must be an Array.
-      #
       if !arg.is_a?(Array)
-	raise ArgumentError, "the option list contains non-Array argument"
+       raise ArgumentError, "the option list contains non-Array argument"
       end
 
       #
@@ -302,43 +292,44 @@ class GetoptLong
       #
       argument_flag = nil
       arg.each do |i|
-	if ARGUMENT_FLAGS.include?(i)
-	  if argument_flag != nil
-	    raise ArgumentError, "too many argument-flags"
-	  end
-	  argument_flag = i
-	end
+        if ARGUMENT_FLAGS.include?(i)
+          if argument_flag != nil
+            raise ArgumentError, "too many argument-flags"
+          end
+          argument_flag = i
+        end
       end
+
       raise ArgumentError, "no argument-flag" if argument_flag == nil
 
       canonical_name = nil
       arg.each do |i|
-	#
-	# Check an option name.
-	#
-	next if i == argument_flag
-	begin
-	  if !i.is_a?(String) || i !~ /^-([^-]|-.+)$/
-	    raise ArgumentError, "an invalid option `#{i}'"
-	  end
-	  if (@canonical_names.include?(i))
-	    raise ArgumentError, "option redefined `#{i}'"
-	  end
-	rescue
-	  @canonical_names.clear
-	  @argument_flags.clear
-	  raise
-	end
-
-	#
-	# Register the option (`i') to the `@canonical_names' and 
-	# `@canonical_names' Hashes.
-	#
-	if canonical_name == nil
-	  canonical_name = i
-	end
-	@canonical_names[i] = canonical_name
-	@argument_flags[i] = argument_flag
+        #
+        # Check an option name.
+        #
+        next if i == argument_flag
+        begin
+          if !i.is_a?(String) || i !~ /^-([^-]|-.+)$/
+            raise ArgumentError, "an invalid option `#{i}'"
+          end
+          if (@canonical_names.include?(i))
+            raise ArgumentError, "option redefined `#{i}'"
+          end
+        rescue
+          @canonical_names.clear
+          @argument_flags.clear
+          raise
+        end
+
+        #
+        # Register the option (`i') to the `@canonical_names' and
+        # `@canonical_names' Hashes.
+        #
+        if canonical_name == nil
+          canonical_name = i
+        end
+        @canonical_names[i] = canonical_name
+        @argument_flags[i] = argument_flag
       end
       raise ArgumentError, "no option name" if canonical_name == nil
     end
@@ -388,10 +379,10 @@ class GetoptLong
   end
 
   #
-  # Set an error (protected).
+  # Set an error (a protected method).
   #
   def set_error(type, message)
-    $deferr.print("#{$0}: #{message}\n") if !@quiet
+    $stderr.print("#{$0}: #{message}\n") if !@quiet
 
     @error = type
     @error_message = message
@@ -456,17 +447,17 @@ class GetoptLong
       return nil
     elsif @ordering == PERMUTE
       while 0 < ARGV.length && ARGV[0] !~ /^-./
-	@non_option_arguments.push(ARGV.shift)
+        @non_option_arguments.push(ARGV.shift)
       end
       if ARGV.length == 0
-	terminate
-	return nil
+        terminate
+        return nil
       end
       argument = ARGV.shift
-    elsif @ordering == REQUIRE_ORDER 
+    elsif @ordering == REQUIRE_ORDER
       if (ARGV[0] !~ /^-./)
-	terminate
-	return nil
+        terminate
+        return nil
       end
       argument = ARGV.shift
     else
@@ -491,49 +482,49 @@ class GetoptLong
       #
       pattern = $1
       if @canonical_names.include?(pattern)
-	option_name = pattern
+        option_name = pattern
       else
-	#
-	# The option `option_name' is not registered in `@canonical_names'.
-	# It may be an abbreviated.
-	#
-	match_count = 0
-	@canonical_names.each_key do |key|
-	  if key.index(pattern) == 0
-	    option_name = key
-	    match_count += 1
-	  end
-	end
-	if 2 <= match_count
-	  set_error(AmbigousOption, "option `#{argument}' is ambiguous")
-	elsif match_count == 0
-	  set_error(InvalidOption, "unrecognized option `#{argument}'")
-	end
+        #
+        # The option `option_name' is not registered in `@canonical_names'.
+        # It may be an abbreviated.
+        #
+        matches = []
+        @canonical_names.each_key do |key|
+          if key.index(pattern) == 0
+            option_name = key
+            matches << key
+          end
+        end
+        if 2 <= matches.length
+          set_error(AmbiguousOption, "option `#{argument}' is ambiguous between #{matches.join(', ')}")
+        elsif matches.length == 0
+          set_error(InvalidOption, "unrecognized option `#{argument}'")
+        end
       end
 
       #
       # Check an argument to the option.
       #
       if @argument_flags[option_name] == REQUIRED_ARGUMENT
-	if argument =~ /=(.*)$/
-	  option_argument = $1
-	elsif 0 < ARGV.length
-	  option_argument = ARGV.shift
-	else
-	  set_error(MissingArgument,
-	            "option `#{argument}' requires an argument")
-	end
+        if argument =~ /=(.*)$/
+          option_argument = $1
+        elsif 0 < ARGV.length
+          option_argument = ARGV.shift
+        else
+          set_error(MissingArgument,
+                    "option `#{argument}' requires an argument")
+        end
       elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
-	if argument =~ /=(.*)$/
-	  option_argument = $1
-	elsif 0 < ARGV.length && ARGV[0] !~ /^-./
-	  option_argument = ARGV.shift
-	else
-	  option_argument = ''
-	end
+        if argument =~ /=(.*)$/
+          option_argument = $1
+        elsif 0 < ARGV.length && ARGV[0] !~ /^-./
+          option_argument = ARGV.shift
+        else
+          option_argument = ''
+        end
       elsif argument =~ /=(.*)$/
-	set_error(NeedlessArgument,
-		  "option `#{option_name}' doesn't allow an argument")
+        set_error(NeedlessArgument,
+                  "option `#{option_name}' doesn't allow an argument")
       end
 
     elsif argument =~ /^(-(.))(.*)/
@@ -545,40 +536,40 @@ class GetoptLong
       option_name, ch, @rest_singles = $1, $2, $3
 
       if @canonical_names.include?(option_name)
-	#
-	# The option `option_name' is found in `@canonical_names'.
-	# Check its argument.
-	#
-	if @argument_flags[option_name] == REQUIRED_ARGUMENT
-	  if 0 < @rest_singles.length
-	    option_argument = @rest_singles
-	    @rest_singles = ''
-	  elsif 0 < ARGV.length
-	    option_argument = ARGV.shift
-	  else
-	    # 1003.2 specifies the format of this message.
-	    set_error(MissingArgument, "option requires an argument -- #{ch}")
-	  end
-	elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
-	  if 0 < @rest_singles.length
-	    option_argument = @rest_singles
-	    @rest_singles = ''
-	  elsif 0 < ARGV.length && ARGV[0] !~ /^-./
-	    option_argument = ARGV.shift
-	  else
-	    option_argument = ''
-	  end
-	end
+        #
+        # The option `option_name' is found in `@canonical_names'.
+        # Check its argument.
+        #
+        if @argument_flags[option_name] == REQUIRED_ARGUMENT
+          if 0 < @rest_singles.length
+            option_argument = @rest_singles
+            @rest_singles = ''
+          elsif 0 < ARGV.length
+            option_argument = ARGV.shift
+          else
+            # 1003.2 specifies the format of this message.
+            set_error(MissingArgument, "option requires an argument -- #{ch}")
+          end
+        elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
+          if 0 < @rest_singles.length
+            option_argument = @rest_singles
+            @rest_singles = ''
+          elsif 0 < ARGV.length && ARGV[0] !~ /^-./
+            option_argument = ARGV.shift
+          else
+            option_argument = ''
+          end
+        end
       else
-	#
-	# This is an invalid option.
-	# 1003.2 specifies the format of this message.
-	#
-	if ENV.include?('POSIXLY_CORRECT')
-	  set_error(InvalidOption, "illegal option -- #{ch}")
-	else
-	  set_error(InvalidOption, "invalid option -- #{ch}")
-	end
+        #
+        # This is an invalid option.
+        # 1003.2 specifies the format of this message.
+        #
+        if ENV.include?('POSIXLY_CORRECT')
+          set_error(InvalidOption, "invalid option -- #{ch}")
+        else
+          set_error(InvalidOption, "invalid option -- #{ch}")
+        end
       end
     else
       #
@@ -600,7 +591,7 @@ class GetoptLong
   #
   # The block is called repeatedly with two arguments:
   # The first is the option name.
-  # The second is the argument which followed it (if any). 
+  # The second is the argument which followed it (if any).
   # Example: ('--opt', 'value')
   #
   # The option name is always converted to the first (preferred)

data/lib/rubysl/getoptlong/version.rb

@@ -1,5 +1,5 @@
 module RubySL
-  module GetoptLong
-    VERSION = "1.0.0"
+  class GetoptLong
+    VERSION = "2.0.0"
   end
 end

data/rubysl-getoptlong.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-getoptlong
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ruby standard library getoptlong.
 email:
 - brixen@gmail.com
@@ -133,3 +119,4 @@ test_files:
 - spec/shared/get.rb
 - spec/terminate_spec.rb
 - spec/terminated_spec.rb
+has_rdoc: