Merge pull request #7 from at-grandpa/nilable

Nilable
at-grandpa · Jun 20, 2017 · bad598c · bad598c
2 parents c55e6c5 + 5ca6728
commit bad598c
Show file tree

Hide file tree

Showing 11 changed files with 310 additions and 283 deletions.
diff --git a/spec/clim/dsl_spec.cr b/spec/clim/dsl_spec.cr
@@ -1,13 +1,12 @@
 require "./../spec_helper"
 
 def create_values(
-                  string = {} of String => String,
-                  bool = {} of String => Bool,
-                  array = {} of String => Array(String))
+                  string : Hash(String, String | Nil) = {} of String => String | Nil,
+                  bool : Hash(String, Bool | Nil) = {} of String => Bool | Nil,
+                  array : Hash(String, Array(String) | Nil) = {} of String => Array(String) | Nil)
   values = Options::Values.new
-  values.string = string
-  values.bool = bool
-  values.array = array
+  values.string.merge!(string)
+  values.bool.merge!(bool)
+  values.array.merge!(array)
   values
 end
-
diff --git a/spec/clim/dsl_spec/array_spec.cr b/spec/clim/dsl_spec/array_spec.cr
@@ -40,7 +40,7 @@ describe "main command with array." do
             Options:
 
               -h, --help                       Show this help.
-              -a ARG, --array=ARG              Option description.  [default:[]]
+              -a ARG, --array=ARG              Option description.
 
 
           HELP_MESSAGE
@@ -50,6 +50,16 @@ describe "main command with array." do
   end
   describe "returns opts and args when passing argv." do
     [
+      {
+        argv:        %w(),
+        expect_opts: create_values(array: {"array" => nil}),
+        expect_args: [] of String,
+      },
+      {
+        argv:        %w(arg1),
+        expect_opts: create_values(array: {"array" => nil}),
+        expect_args: ["arg1"],
+      },
       {
         argv:        %w(-a array1),
         expect_opts: create_values(array: {"array" => ["array1"]}),
@@ -73,12 +83,12 @@ describe "main command with array." do
       {
         argv:        %w(-a array1 arg1),
         expect_opts: create_values(array: {"array" => ["array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(arg1 -a array1),
         expect_opts: create_values(array: {"array" => ["array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-array), # Unintended case.
@@ -102,14 +112,6 @@ describe "main command with array." do
   end
   describe "raises Exception when passing invalid argv." do
     [
-      {
-        argv:              %w(),
-        exception_message: "Please specify default value or required true. \"-a ARG\"",
-      },
-      {
-        argv:              %w(arg1),
-        exception_message: "Please specify default value or required true. \"-a ARG\"",
-      },
       {
         argv:              %w(-a),
         exception_message: "Option that requires an argument. \"-a\"",
@@ -176,7 +178,7 @@ describe "main command with array only short option." do
             Options:
 
               -h, --help                       Show this help.
-              -a ARG                           Option description.  [default:[]]
+              -a ARG                           Option description.
 
 
           HELP_MESSAGE
@@ -186,6 +188,16 @@ describe "main command with array only short option." do
   end
   describe "returns opts and args when passing argv." do
     [
+      {
+        argv:        %w(),
+        expect_opts: create_values(array: {"a" => nil}),
+        expect_args: [] of String,
+      },
+      {
+        argv:        %w(arg1),
+        expect_opts: create_values(array: {"a" => nil}),
+        expect_args: ["arg1"],
+      },
       {
         argv:        %w(-a array1),
         expect_opts: create_values(array: {"a" => ["array1"]}),
@@ -199,12 +211,12 @@ describe "main command with array only short option." do
       {
         argv:        %w(-a array1 arg1),
         expect_opts: create_values(array: {"a" => ["array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(arg1 -a array1),
         expect_opts: create_values(array: {"a" => ["array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-array), # Unintended case.
@@ -228,14 +240,6 @@ describe "main command with array only short option." do
   end
   describe "raises Exception when passing invalid argv." do
     [
-      {
-        argv:              %w(),
-        exception_message: "Please specify default value or required true. \"-a ARG\"",
-      },
-      {
-        argv:              %w(arg1),
-        exception_message: "Please specify default value or required true. \"-a ARG\"",
-      },
       {
         argv:              %w(-a),
         exception_message: "Option that requires an argument. \"-a\"",
@@ -310,7 +314,7 @@ describe "main command with array desc." do
             Options:
 
               -h, --help                       Show this help.
-              -a ARG, --array=ARG              Array option description.  [default:[]]
+              -a ARG, --array=ARG              Array option description.
 
 
           HELP_MESSAGE
@@ -378,7 +382,7 @@ describe "main command with array default." do
       {
         argv:        %w(arg1),
         expect_opts: create_values(array: {"array" => ["default value"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-a array1),
@@ -403,12 +407,12 @@ describe "main command with array default." do
       {
         argv:        %w(-a array1 arg1),
         expect_opts: create_values(array: {"array" => ["default value", "array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(arg1 -a array1),
         expect_opts: create_values(array: {"array" => ["default value", "array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-array), # Unintended case.
@@ -531,12 +535,12 @@ describe "main command with array required true and default exists." do
       {
         argv:        %w(-a array1 arg1),
         expect_opts: create_values(array: {"array" => ["default value", "array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(arg1 -a array1),
         expect_opts: create_values(array: {"array" => ["default value", "array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-array), # Unintended case.
@@ -634,7 +638,7 @@ describe "main command with array required true only." do
             Options:
 
               -h, --help                       Show this help.
-              -a ARG, --array=ARG              Array option description.  [default:[]]  [required]
+              -a ARG, --array=ARG              Array option description.  [required]
 
 
           HELP_MESSAGE
@@ -667,12 +671,12 @@ describe "main command with array required true only." do
       {
         argv:        %w(-a array1 arg1),
         expect_opts: create_values(array: {"array" => ["array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(arg1 -a array1),
         expect_opts: create_values(array: {"array" => ["array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-array), # Unintended case.
@@ -788,7 +792,7 @@ describe "main command with array required false and default exists." do
       {
         argv:        %w(arg1),
         expect_opts: create_values(array: {"array" => ["default value"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-a array1),
@@ -813,12 +817,12 @@ describe "main command with array required false and default exists." do
       {
         argv:        %w(-a array1 arg1),
         expect_opts: create_values(array: {"array" => ["default value", "array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(arg1 -a array1),
         expect_opts: create_values(array: {"array" => ["default value", "array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-array), # Unintended case.
@@ -908,7 +912,7 @@ describe "main command with array required false only." do
             Options:
 
               -h, --help                       Show this help.
-              -a ARG, --array=ARG              Array option description.  [default:[]]
+              -a ARG, --array=ARG              Array option description.
 
 
           HELP_MESSAGE
@@ -918,6 +922,16 @@ describe "main command with array required false only." do
   end
   describe "returns opts and args when passing argv." do
     [
+      {
+        argv:        %w(),
+        expect_opts: create_values(array: {"array" => nil}),
+        expect_args: [] of String,
+      },
+      {
+        argv:        %w(arg1),
+        expect_opts: create_values(array: {"array" => nil}),
+        expect_args: ["arg1"],
+      },
       {
         argv:        %w(-a array1),
         expect_opts: create_values(array: {"array" => ["array1"]}),
@@ -941,12 +955,12 @@ describe "main command with array required false only." do
       {
         argv:        %w(-a array1 arg1),
         expect_opts: create_values(array: {"array" => ["array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(arg1 -a array1),
         expect_opts: create_values(array: {"array" => ["array1"]}),
-        expect_args: ["arg1"] of String,
+        expect_args: ["arg1"],
       },
       {
         argv:        %w(-array), # Unintended case.
@@ -970,14 +984,6 @@ describe "main command with array required false only." do
   end
   describe "raises Exception when passing invalid argv." do
     [
-      {
-        argv:              %w(),
-        exception_message: "Please specify default value or required true. \"-a ARG\"",
-      },
-      {
-        argv:              %w(arg1),
-        exception_message: "Please specify default value or required true. \"-a ARG\"",
-      },
       {
         argv:              %w(-a),
         exception_message: "Option that requires an argument. \"-a\"",