mixlib-cli 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d8c52004fea1ccbbacc8cc9eb27c90319169a7
-  data.tar.gz: 02c491e6efbd0311e961fabdfa5104cac182f906
+  metadata.gz: 3a5fa5c9380ff647b7d3fa3be1bff7e2103c9f94
+  data.tar.gz: d384bc4569b4577a90bc20d06d9d2f9b5564178d
 SHA512:
-  metadata.gz: f0ebca3acd4ff265dc86b78ad542b2400260167345d6d05334359e2e4e575160d26ccaa905e42cc36e8eaecf373ed5f7b6eafc6d0f0e72c8dd9541d6749e4cda
-  data.tar.gz: 08c9482a936d10feea1f968effa75beba3f7f0911fa63dbf16755da7d0f674df9f64622f2941050ea7a16ed71efd4b963b7715956b819f67362469668b0d7d71
+  metadata.gz: ea74cdb6f6afc9758a24a143c0d1702423e87a3fcce4749c61e3c83da4b289967a47a1473513b8f695a9d2e66d0aad188f1fdf1f6aae91648e4ce30f5c33b6ea
+  data.tar.gz: 62421ca5582e801d8e3112bbef7e55f16cdff8bf77c5520f7539bffa36e7602644ef2ac4aaee2733dda90db95156d58e06dfd2e7d0e1ddfae6856704b5c5b323

data/lib/mixlib/cli.rb

@@ -281,7 +281,18 @@ module Mixlib
 
           parse_block =
             Proc.new() do |c|
-              config[opt_key] = (opt_val[:proc] && opt_val[:proc].call(c)) || c
+              config[opt_key] = if opt_val[:proc]
+                                  if opt_val[:proc].arity == 2
+                                    # New hotness to allow for reducer-style procs.
+                                    opt_val[:proc].call(c, config[opt_key])
+                                  else
+                                    # Older single-argument proc.
+                                    opt_val[:proc].call(c)
+                                  end
+                                else
+                                  # No proc.
+                                  c
+                                end
               puts opts if opt_val[:show_options]
               exit opt_val[:exit] if opt_val[:exit]
             end

data/lib/mixlib/cli/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   module CLI
-    VERSION = "1.6.0"
+    VERSION = "1.7.0"
   end
 end

data/spec/mixlib/cli_spec.rb

@@ -149,6 +149,16 @@ describe Mixlib::CLI do
         @cli.config[:number].should == 4
       end
 
+      it "should pass the existing value to two-argument procs" do
+        TestCLI.option(:number,
+          :short => "-n NUMBER",
+          :proc => Proc.new { |value, existing| existing ||= []; existing << value; existing }
+        )
+        @cli = TestCLI.new
+        @cli.parse_options([ "-n", "2", "-n", "3" ])
+        @cli.config[:number].should == %w{2 3}
+      end
+
       it "should set the corresponding config value to true for boolean arguments" do
         TestCLI.option(:i_am_boolean, :short => "-i", :boolean => true)
         @cli = TestCLI.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake