Merge pull request #24 from at-grandpa/fix-version-macro

fix version macro
at-grandpa · Mar 17, 2018 · 8a5598b · 8a5598b
2 parents 31fc594 + 0d654ac
commit 8a5598b
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 1 deletion.
diff --git a/spec/clim/dsl_spec/main_command_spec.cr b/spec/clim/dsl_spec/main_command_spec.cr
@@ -338,6 +338,66 @@ spec(
 )
 {% end %}
 
+{% begin %}
+{%
+  main_help_message = <<-HELP_MESSAGE
+
+                        Main command with desc.
+
+                        Usage:
+
+                          main_command with usage [options] [arguments]
+
+                        Options:
+
+                          --help                           Show this help.
+                          --version                        Show version.
+
+
+                      HELP_MESSAGE
+%}
+
+spec(
+  spec_class_name: MainCommandWithVersionConst,
+  spec_dsl_lines: [
+    "version Clim::VERSION",
+    "desc \"Main command with desc.\"",
+    "usage \"main_command with usage [options] [arguments]\"",
+  ],
+  spec_desc: "main command,",
+  spec_cases: [
+    {
+      argv:        ["--help"],
+      expect_help: {{main_help_message}},
+    },
+    {
+      argv:        ["--help", "ignore-arg"],
+      expect_help: {{main_help_message}},
+    },
+    {
+      argv:        ["ignore-arg", "--help"],
+      expect_help: {{main_help_message}},
+    },
+    {
+      argv:          ["--version"],
+      expect_output: Clim::VERSION + "\n",
+    },
+    {
+      argv:          ["--version", "arg"],
+      expect_output: Clim::VERSION + "\n",
+    },
+    {
+      argv:          ["arg", "--version"],
+      expect_output: Clim::VERSION + "\n",
+    },
+    {
+      argv:              ["-v"],
+      exception_message: "Undefined option. \"-v\"",
+    },
+  ]
+)
+{% end %}
+
 {% begin %}
 {%
   main_help_message = <<-HELP_MESSAGE

diff --git a/src/clim/command.cr b/src/clim/command.cr
@@ -42,7 +42,7 @@ class Clim
 
     macro version(version_str, short = nil)
       def version_str : String
-        {{ version_str.id.stringify }}
+        {{ version_str }}
       end
 
       def define_version(parser)