gli 2.13.4 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72425f3996eedb08a03af7c55d8fa50dc358659d
-  data.tar.gz: 41634461e71b54e34f156f59e85c02fab64e6410
+  metadata.gz: 71f12230a16a02ce456bc50cb4f3729797d3a21e
+  data.tar.gz: d24fb65d109f0454befb7a7d2f31c27cca91eb86
 SHA512:
-  metadata.gz: b3c97518e3500e9853f2d5240c08db8655b0c771b1de9f1e453478ce3cefa16612a2aef458febde8246cdabcfda409db43f8a5770113e80841c22f82666ed24b
-  data.tar.gz: 55df85338820f8b1ebb2d33e98009346641c382b34be7494de9688a90450702a910258fcbbd8a111bb444619db67e9754a62a001d50428113bc66e0ad21f9421
+  metadata.gz: 4abb85d5fc3cd970a6662f5c7f2da49c912e8874644537f9609b70f61969779f14f20525a1d4f12a7b071c90dc01ec489ead94378baefbbfc91d63044fd0bf9f
+  data.tar.gz: 8b5271a476e203d4e0fc06f8de8dd4b5228078a5a6b0f0702166982e10c5eb830999137f092ab4f460cc996b0d5744774e8330caaf210f096d36eb9b80d293a4

data/.travis.yml

@@ -3,10 +3,9 @@ notifications:
     on_success: always
 script: 'bundle exec rake test features'
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 branches:
   only:
     - 'gli-2'

data/README.rdoc

@@ -73,18 +73,15 @@ Get a more detailed walkthrough on the {main site}[http://davetron5000.github.co
 
 == Supported Platforms
 
-Known to work on
+Tests should be passing supported MRI Rubies (see +.travis.yml+ for specifics).
+
+Due to the vagaries of Travis, I can't keep the test suite running on unsupported Rubies, however GLI has been used on older ones, like:
 
 * 1.8.7
 * 1.9.2
 * 1.9.3
-* 2.0.0
-* 2.1.0
 * Ruby Enterprise Edition 1.8.7
-* Rubinius 1.0.1
-* JRuby 1.6.4 
-
-If you're interested in other versions of Ruby, let me know, and I'll add them to my test suite
+* JRuby 
 
 == Documentation
 

data/gli.gemspec

@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.rubyforge_project = 'gli'
   s.add_development_dependency('rake', '~> 0.9.2.2')
-  s.add_development_dependency('rdoc', '~> 3.11')
+  s.add_development_dependency('rdoc')
   s.add_development_dependency('rainbow', '~> 1.1.1')
   s.add_development_dependency('clean_test')
   s.add_development_dependency('cucumber')

data/lib/gli/commands/help_modules/options_formatter.rb

@@ -24,12 +24,10 @@ module GLI
 
         def description_with_default(option)
           if option.kind_of? Flag
-            required = if option.required?
-                         'required, '
-                       else
-                         ''
-                       end
-            String(option.description) + " (#{required}default: #{option.safe_default_value || 'none'})"
+            required = option.required? ? 'required, ' : ''
+            multiple = option.multiple? ? 'may be used more than once, ' : ''
+
+            String(option.description) + " (#{required}#{multiple}default: #{option.safe_default_value || 'none'})"
           else
             String(option.description) +  (option.default_value ?  " (default: enabled)" : "")
           end

data/lib/gli/dsl.rb

@@ -75,6 +75,7 @@ module GLI
     #           +:arg_name+:: the arg name, instead of using #arg_name
     #           +:must_match+:: A regexp that the flag's value must match or an array of allowable values
     #           +:type+:: A Class (or object you passed to GLI::App#accept) to trigger type coversion
+    #           +:multiple+:: if true, flag may be used multiple times and values are stored in an array
     #
     # Example:
     #

data/lib/gli/flag.rb

@@ -24,17 +24,18 @@ module GLI
     #           :must_match:: a regexp that the flag's value must match
     #           :type:: a class to convert the value to
     #           :required:: if true, this flag must be specified on the command line
+    #           :multiple:: if true, flag may be used multiple times and values are stored in an array
     #           :mask:: if true, the default value of this flag will not be output in the help.
     #                   This is useful for password flags where you might not want to show it
     #                   on the command-line.
     def initialize(names,options)
       super(names,options)
       @argument_name = options[:arg_name] || "arg"
-      @default_value = options[:default_value]
       @must_match = options[:must_match]
       @type = options[:type]
       @mask = options[:mask]
       @required = options[:required]
+      @multiple = options[:multiple]
     end
 
     # True if this flag is required on the command line
@@ -42,12 +43,32 @@ module GLI
       @required
     end
 
+    # True if the flag may be used multiple times.
+    def multiple?
+      @multiple
+    end
 
     def safe_default_value
       if @mask
         "********"
       else
-        default_value
+        # This uses @default_value instead of the `default_value` method because
+        # this method is only used for display, and for flags that may be passed
+        # multiple times, we want to display whatever is set in the code as the
+        # the default, or the string "none" rather than displaying an empty
+        # array.
+        @default_value
+      end
+    end
+
+    # The default value for this flag. Uses the value passed if one is set;
+    # otherwise uses `[]` if the flag support multiple arguments and `nil` if
+    # it does not.
+    def default_value
+      if @default_value
+        @default_value
+      elsif @multiple
+        []
       end
     end
 

data/lib/gli/option_parser_factory.rb

@@ -58,8 +58,15 @@ module GLI
       tokens.each do |ignore,token|
         opts.on(*token.arguments_for_option_parser) do |arg|
           token.names_and_aliases.each do |name|
-            options[name] = arg
-            options[name.to_sym] = arg
+            if token.kind_of?(Flag) && token.multiple?
+              options[name] ||= []
+              options[name.to_sym] ||= []
+              options[name] << arg
+              options[name.to_sym] << arg
+            else
+              options[name] = arg
+              options[name.to_sym] = arg
+            end
           end
         end
       end

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.13.4'
+    VERSION = '2.14.0'
   end
 end

data/test/tc_gli.rb

@@ -717,6 +717,48 @@ class TC_testGLI < Clean::Test::TestCase
     assert_equal 'crud',@baz.value
   end
 
+  def test_that_flags_can_be_used_multiple_times
+    @app.reset
+    @app.flag :flag, :multiple => true
+    @app.command :foo do |c|
+      c.action do |options, _, _|
+        @flag = options[:flag]
+      end
+    end
+
+    assert_equal 0,@app.run(%w(--flag 1 --flag=2 --flag 3 foo)),@fake_stderr.to_s
+
+    assert_equal ['1','2','3'],@flag
+  end
+
+  def test_that_multiple_use_flags_are_empty_arrays_by_default
+    @app.reset
+    @app.flag :flag, :multiple => true
+    @app.command :foo do |c|
+      c.action do |options, _, _|
+        @flag = options[:flag]
+      end
+    end
+
+    assert_equal 0,@app.run(['foo']),@fake_stderr.to_s
+
+    assert_equal [],@flag
+  end
+
+  def test_that_multiple_use_flags_can_take_other_defaults
+    @app.reset
+    @app.flag :flag, :multiple => true, :default_value => ['1']
+    @app.command :foo do |c|
+      c.action do |options, _, _|
+        @flag = options[:flag]
+      end
+    end
+
+    assert_equal 0,@app.run(['foo']),@fake_stderr.to_s
+
+    assert_equal ['1'],@flag
+  end
+
   def test_that_we_mutate_ARGV_by_default
     @app.reset
     @app.flag :f

data/test/tc_help.rb

@@ -302,20 +302,20 @@ private
         unless omit_options
           flags.each do |(description,arg,flag_names)|
             desc description
-          arg_name arg
-          flag flag_names
+            arg_name arg
+            flag flag_names
           end
 
           switches.each do |(description,switch_names)|
             desc description
-          switch switch_names
+            switch switch_names
           end
         end
 
         commands.each do |(description,command_names)|
           desc description
-          command command_names do |c| 
-            c.action {} 
+          command command_names do |c|
+            c.action {}
           end
         end
       end
@@ -363,7 +363,7 @@ private
   def any_option
     ('a'..'z').to_a[@option_index].tap { @option_index += 1 }
   end
-  
+
   def any_long_option
     Faker::Lorem.words(10)[rand(10)]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.13.4
+  version: 2.14.0
 platform: ruby
 authors:
 - David Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,16 +28,16 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gli
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build command-suite CLI apps that are awesome.