commander-openflighthpc 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f44f3e008d2afe4767d93545e1f96bee55eb972e1b8558f6ed214bf18290079
-  data.tar.gz: fc44c6aa1a350fe8be8d8ea1a79cd3841dc82b59fb5fab14040f4eaac2e199cd
+  metadata.gz: 3febc8843b2d974230cdb5b51f165e65cb268e2b42e193acbbb8de5bef54e107
+  data.tar.gz: eb05690fcc2789518b3bcb78720d863fcab1447ed38677022f86802f0d7a579c
 SHA512:
-  metadata.gz: 2b9a7db7d0cc5f8b08c8e2d894ace171c8a7d8527142c8117eb1705fc563d9504d92ddbe6abb56abc94526a9d2a3fb11f226191aa1f629a9a72a42bd95bc8c98
-  data.tar.gz: 55004b7e9ff3f42cbdc5a5d99281d24f9eb88f441bfbc8465fe2ea8792fc817ec8c06ada2a2f0dd66f6820264507fda8ff575941b265faacefa7ab2be32b96e0
+  metadata.gz: 4090ea8ea6a812911cf32fbe3a018a422abc3c8ca72117c09ff1583d114529fa61bde7681e979a6bd7c1a793a7766531e15ff18877dc323f28b7f5e7dd0d10fc
+  data.tar.gz: 3327644d36fba11879f83b62468d2ebb3dd9e35ef24c2996878eaa63347c099104860f8498cbc84d8bde3aefdccbcdb912956d6fe459ff9e91038fc4b40a8783

data/lib/commander/command.rb

@@ -2,7 +2,6 @@ require 'optparse'
 require 'commander/patches/implicit-short-tags'
 require 'commander/patches/decimal-integer'
 require 'commander/patches/validate_inputs'
-require 'commander/patches/option_defaults'
 require 'commander/patches/help_formatter_binding'
 require 'commander/patches/priority_sort'
 
@@ -122,17 +121,15 @@ module Commander
     #   c.option '--date [DATE]', Date
     #
 
-    # NOTE: This method is being patched to handle defaults differently
-    prepend Patches::OptionDefaults
-    def option(*args, &block)
+    def option(*args, default: nil, &block)
       switches, description = Runner.separate_switches_from_description(*args)
       proc = block || option_proc(switches)
       @options << {
         args: args,
         proc: proc,
         switches: switches,
-        description: description,
-      }
+        description: description
+      }.tap { |o| o[:default] = default unless default.nil? }
     end
 
     ##

data/lib/commander/version.rb

@@ -1,3 +1,3 @@
 module Commander
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander-openflighthpc
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Alces Flight Ltd
@@ -140,7 +140,6 @@ files:
 - lib/commander/patches/decimal-integer.rb
 - lib/commander/patches/help_formatter_binding.rb
 - lib/commander/patches/implicit-short-tags.rb
-- lib/commander/patches/option_defaults.rb
 - lib/commander/patches/priority_sort.rb
 - lib/commander/patches/validate_inputs.rb
 - lib/commander/platform.rb

data/lib/commander/patches/option_defaults.rb

@@ -1,23 +0,0 @@
-module Commander
-  module Patches
-    module OptionDefaults
-      # I can't remember what this patch does, but I found it in the code
-      # base. It is better if this magic is kept separate
-      def option(*args, &block)
-        default = nil
-        args.delete_if do |v|
-          if v.is_a?(Hash) && v.key?(:default)
-            default = v[:default]
-            true
-          else
-            false
-          end
-        end
-        opt = super
-        opt.tap do |h|
-          h.merge!( { default: default } ) unless default.nil?
-        end
-      end
-    end
-  end
-end