chieftain 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d74bd02b7ed73774461fd981d7480392694d3008ccbddb6af7e9d6a0a543f18
-  data.tar.gz: cb8ea0c65743b6c42026c7373dd0f5785fecc06ccb37967fe50073ca6ccc104c
+  metadata.gz: 99fe1b05ebefe5681b38008db8759fbed289cde52599fef2f142b98f54a40fdd
+  data.tar.gz: f088cfbed3b92ae1654f36c1f771bc600f9f73a17375cc9ac7ef8e6c6301505f
 SHA512:
-  metadata.gz: 72ad8421903cffbb40210de327ee8fde88df461f1412fd4c3b3c10566bc82bb825fa8ae1b19457f391d45311dc56457956f1f6ea903a285a9e5ddd842f2b6ca7
-  data.tar.gz: 753bbe2e2d1d5af55c99973b6c01cf60e255cba347130548b56de08f15ca620eba5ff1a322885760fbdfe893b8c9d1fb05c06318f2c408f39e66c866868f1a5c
+  metadata.gz: 2de2134328177e0692bf3c17b5f7910706c1f02eac305b924819ce05192c664b8bb47e88a879c581703defba79bbc27894bbab5693f6a6ed2b300b94a86ca9e8
+  data.tar.gz: 276ef574c8cda62b8dd1631391cd6337cb17b0ae561c58baf1cacc1061cea9e51e38279581777ba604fa1ee36a7a69dc5d94911002cad0bed89b1e9608069336

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chieftain (0.1.0)
+    chieftain (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/chieftain/command.rb

@@ -108,19 +108,33 @@ module Chieftain
           raise ParameterError.new("A value has not been provided for the '#{name}' parameter.", name)
         end
 
-        if settings[:required] || provided?(name)
-          value     = get_raw_parameter_value(name)
+        if settings[:required]
+          raw_value = get_raw_parameter_value(name)
           if settings[:type]
             convertor = get_convertor(settings.type)
-            if !convertor.convertible?(value)
+            if !convertor.convertible?(raw_value)
               raise ParameterError.new("The value of the '#{name}' parameter cannot be converted to the '#{settings.type}' type.", name)
             end
-            convertor.convert(value)
+            convertor.convert(raw_value)
           else
-            value
+            raw_value
           end
+
         else
-          settings[:default]
+          raw_value = (provided?(name) ? get_raw_parameter_value(name) : settings[:default])
+          if provided?(name)
+            if settings[:type]
+              convertor = get_convertor(settings.type)
+              if !convertor.convertible?(raw_value)
+                raise ParameterError.new("The value of the '#{name}' parameter cannot be converted to the '#{settings.type}' type.", name)
+              end
+              convertor.convert(raw_value)
+            else
+              raw_value
+            end
+          else
+            raw_value
+          end
         end
       else
         raise ParameterError.new("Unknown parameter '#{name}' requested from a '#{self.class.name}' command instance.")

data/lib/chieftain/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Chieftain
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chieftain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Peter Wood