como 0.1.1 → 0.1.2

data/test/como_compatible

@@ -20,10 +20,7 @@ Spec.defineCheckHelp( "como_compatible", "Como Tester", "2013",
 
 Opt.each do |o|
     puts "Given \"#{o.name}\": #{o.given}"
-end
-
-Opt.each_given do |o|
-    puts "Value \"#{o.name}\": #{o.value}"
+    puts "Value \"#{o.name}\": #{o.value}" if o.given && o.value
 end
 
 Opt[ 'params' ].given( true ) do |o|

data/test/como_config

@@ -15,10 +15,11 @@ Spec.command( "como_config", "Como Tester", "2013",
     [ :multi, "dir", "-d", "Directory argument(s)." ],
     [ :default, "Leftovers." ],
   ], {
-                  :header => "Addition heading info.",
-                  :footer => "Addition footer info.",
+                  :header => "\nAdditional heading info.\n\n",
+                  :footer => "\nAdditional footer info.\n\n",
                   :subcheck => false,
                   :check_missing => false,
+                  :check_invalid => false,
                   :tab => 10,
                   :help_exit => false,
                   :error_exit => false,
@@ -27,10 +28,7 @@ Spec.command( "como_config", "Como Tester", "2013",
 
 Opt.each do |o|
     puts "Given \"#{o.name}\": #{o.given}"
-end
-
-Opt.each_given do |o|
-    puts "Value \"#{o.name}\": #{o.value}"
+    puts "Value \"#{o.name}\": #{o.value}" if o.given && o.value
 end
 
 Opt[ 'params' ].given( true ) do |o|

data/test/como_options

@@ -5,7 +5,7 @@ include Como
 
 Spec.command( "como_options", "Como Tester", "2013",
   [
-    [ :exclusive, "doc", nil, "Documentation." ],
+    [ :exclusive, "doc", nil, "Documentation for option\n\twith too much description\n\tfor one line." ],
     [ :single, "file", "-f", "File argument." ],
     [ :switch, "debug", nil, "Enable debugging." ],
     [ :opt_single, "mode", "-m", "Mode." ],
@@ -19,16 +19,7 @@ Spec.command( "como_options", "Como Tester", "2013",
 
 Opt.each do |o|
     puts "Given \"#{o.name}\": #{o.given}"
-end
-
-Opt.each_given do |o|
-    puts "Value \"#{o.name}\": #{o.value}"
-end
-
-Opt[ 'params' ].given( true ) do |o|
-    o.params.each do |k,v|
-        puts "Param #{k}: #{v}"
-    end
+    puts "Value \"#{o.name}\": #{o.value}" if o.given && o.value
 end
 
 if Opt.external

data/test/como_queries

@@ -15,10 +15,7 @@ Spec.command( "como_queries", "Como Tester", "2013",
 
 Opt.each do |o|
     puts "Given \"#{o.name}\": #{o.given}"
-end
-
-Opt.each_given do |o|
-    puts "Value \"#{o.name}\": #{o.value}"
+    puts "Value \"#{o.name}\": #{o.value}" if o.given && o.value
 end
 
 Opt.main.suball do |o|

data/test/como_subcmd

@@ -15,11 +15,6 @@ Spec.program( "Como Tester", "2013" ) do
        [ :subcmd,      "commit",    nil,  "Commit (pending) changes to repo." ],
       ], )
 
-    checkRule do
-        any( 'password', 'username' )
-    end
-
-
     subcmd( "add",
       [
        [ :switch,      "force",     "-fo", "Force operation." ],
@@ -27,18 +22,12 @@ Spec.program( "Como Tester", "2013" ) do
        [ :single,      "file",      "-f",  "File." ],
       ] )
 
-
-    checkRule do
-        one( 'file', 'username', inv( '-fo' ) )
-    end
-    
-
     subcmd( "rm",
       [
        [ :switch,      "force",     "-fo", "Force operation." ],
        [ :opt_single,  "file",      "-f",  "File." ],
       ] )
- 
+
     subcmd( "commit",
       [
        [ :switch,      "quiet",     "-q", "Quiet operation." ],
@@ -53,10 +42,7 @@ def displayOptions( opt )
 
     opt.each do |o|
         puts "  Given \"#{o.name}\": #{o.given}"
-    end
-
-    opt.each_given do |o|
-        puts "  Value \"#{o.name}\": #{o.value}"
+        puts "  Value \"#{o.name}\": #{o.value}" if o.given && o.value
     end
 
     sub = opt.givenSubcmd

data/test/como_subcmd_config

@@ -5,8 +5,8 @@ include Como
 
 Spec.program( "Como Tester", "2013",
               {
-                  :header => "Addition heading info.",
-                  :footer => "Addition footer info.",
+                  :header => "\nAdditional heading info.\n\n",
+                  :footer => "\nAdditional footer info.\n\n",
                   :subcheck => false,
                   :check_missing => false,
                   :tab => 10,
@@ -38,7 +38,7 @@ Spec.program( "Como Tester", "2013",
     checkRule do
         one( 'file', 'username', inv( '-fo' ) )
     end
-    
+
 
     subcmd( "rm", [
        [ :exclusive,   "help",      "-hm", "Help for me." ],
@@ -49,7 +49,7 @@ Spec.program( "Como Tester", "2013",
                 :header => nil,
                 :footer => nil,
             } )
- 
+
     subcmd( "commit", [
        [ :switch,      "quiet",     "-q", "Quiet operation." ],
        [ :opt_single,  "username",  "-u", "Username." ],
@@ -59,7 +59,7 @@ Spec.program( "Como Tester", "2013",
                 :help_exit => true,
                 :error_exit => false,
             } )
-    
+
 end
 
 
@@ -69,10 +69,7 @@ def displayOptions( opt )
 
     opt.each do |o|
         puts "  Given \"#{o.name}\": #{o.given}"
-    end
-
-    opt.each_given do |o|
-        puts "  Value \"#{o.name}\": #{o.value}"
+        puts "  Value \"#{o.name}\": #{o.value}" if o.given && o.value
     end
 
     sub = opt.givenSubcmd

data/test/como_subcmd_rule

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+
+require "../lib/como"
+include Como
+
+Spec.program( "Como Tester", "2013" ) do
+
+    subcmd( "como_subcmd",
+      [
+       [ :opt_single,  "password",  "-p", "User password." ],
+       [ :opt_multi,   "username",  "-u", "Username(s)." ],
+       [ :silent,      "terminator","-",  "Terminator." ],
+       [ :subcmd,      "add",       nil,  "Add file to repo." ],
+       [ :subcmd,      "rm",        nil,  "Remove file from repo." ],
+       [ :subcmd,      "commit",    nil,  "Commit (pending) changes to repo." ],
+      ], )
+
+    checkRule do
+        any( 'password', 'username' )
+    end
+
+
+    subcmd( "add",
+      [
+       [ :switch,      "force",     "-fo", "Force operation." ],
+       [ :opt_single,  "username",  "-u",  "Username." ],
+       [ :single,      "file",      "-f",  "File." ],
+      ] )
+
+
+    checkRule do
+        one( 'file', 'username', inv( '-fo' ) )
+    end
+
+
+    subcmd( "rm",
+      [
+       [ :switch,      "force",     "-fo", "Force operation." ],
+       [ :opt_single,  "file",      "-f",  "File." ],
+      ] )
+
+    subcmd( "commit",
+      [
+       [ :switch,      "quiet",     "-q", "Quiet operation." ],
+       [ :opt_single,  "username",  "-u", "Username." ],
+       [ :default,                        "File(s) to commit." ],
+      ] )
+end
+
+
+def displayOptions( opt )
+    puts "Options for: #{opt.name}"
+
+    opt.each do |o|
+        puts "  Given \"#{o.name}\": #{o.given}"
+        puts "  Value \"#{o.name}\": #{o.value}" if o.given && o.value
+    end
+
+    sub = opt.givenSubcmd
+    displayOptions( sub ) if sub
+
+end
+
+displayOptions( Opt.main )
+
+
+if Opt.external
+    puts "External: #{Opt.external}"
+end