lucie-lib 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80a65f6ee5a45b19bd5c771cbb51f29d457cd9d2
-  data.tar.gz: b800eca212e9572e9ef879597fcd1e6b1b233d0a
+  metadata.gz: 1890f2620b8a2908f72efb4e841822847679a68f
+  data.tar.gz: 705bbd9a083d306440ddf60220ced2b1aabb274a
 SHA512:
-  metadata.gz: 16490b1dabaf91a42fd7c18c666030e85525cfe7d932c36aab09be8bbeb00e777aa9f9f03fd086857b84628308ff6e513c0467999b2410d7b21ee0133574fd99
-  data.tar.gz: 0d81b701679534c0773baf3e2f11467109100b91185e5a5c0a7b032bc7233e31a9efab351c27de3a9a4d4676417585c68e60df14274933dbf82e0a57042a2198
+  metadata.gz: 6819bc30b5ff2246bada46b20d4b999b3cb5d9603e1dc1776028a6633c6720b6d81c4c708e0afc07734b796008e4a9a4db04fdb5655efa6d0bfc928c99048b76
+  data.tar.gz: 5cf81228f808c387659d9b8150bcc979f0b6bf7c187df8a0ea4afab184f6b9aca93a27cd202c92affe1706465613673ae0cb446985f588ce28918d1c4a9ae6ab

data/lib/lucie/validators/mandatory_option.rb

@@ -17,6 +17,7 @@ module Lucie
       def mandatory(*args)
         v = Validator.new(args)
         v.apply(params)
+        params.pair(v.short_option, v.long_option)
       end
 
       def self.included(base)

data/lib/lucie/validators/optional.rb

@@ -11,6 +11,11 @@ module Lucie
         base.extend(ClassMethods)
       end
 
+      def optional(*args)
+        v = Validator.new(args)
+        params.pair(v.short_option, v.long_option)
+      end
+
       module ClassMethods
         def optional(*args)
           self.validators << Validator.new(args)

data/lib/lucie/version.rb

@@ -1,5 +1,5 @@
 module Lucie
   unless defined?(VERSION)
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/test/fixtures/command_parser_fixtures.rb

@@ -38,6 +38,18 @@ class ParameterPairingMandatoryController < Controller::Base
   end
 end
 
+class ParameterPairingMandatoryNestedController < Controller::Base
+  def nested_short
+    mandatory "-e", "--expression", "Search expression"
+    print params[:e]
+  end
+
+  def nested_long
+    mandatory "-e", "--expression", "Search expression"
+    print params[:expression]
+  end
+end
+
 class ParameterPairingOptionalController < Controller::Base
   optional "-e", "--expression", "Search expression"
 
@@ -50,6 +62,18 @@ class ParameterPairingOptionalController < Controller::Base
   end
 end
 
+class ParameterPairingOptionalNestedController < Controller::Base
+  def nested_short
+    optional "-e", "--expression", "Search expression"
+    print params[:e]
+  end
+
+  def nested_long
+    optional "-e", "--expression", "Search expression"
+    print params[:expression]
+  end
+end
+
 class ExitValueController < Controller::Base
   def method1
     exit 1

data/test/functional/app_test.rb

@@ -55,6 +55,20 @@ describe App do
     assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory search_long --expression some_string") }
   end
 
+  should "be able to pair nested mandatory parameters" do
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory_nested nested_short -e some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory_nested nested_long -e some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory_nested nested_short --expression some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory_nested nested_long --expression some_string") }
+  end
+
+  should "be able to pair nested optional parameters" do
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_optional_nested nested_short -e some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_optional_nested nested_long -e some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_optional_nested nested_short --expression some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_optional_nested nested_long --expression some_string") }
+  end
+
   should "write to stderr that no controller found when controller is missing" do
     assert_output "", "Controller is not found for no_controller." do
       TestApp.run("no_controller")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucie-lib
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nucc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake