lucie-lib 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f0e44f7eec657401b9a2c77468dc9c61f216c2
-  data.tar.gz: 97b29ace94517aeff18c3398c93dc8f4659dff4f
+  metadata.gz: 6ba29b920b702de3ef30c503fd5443bdb17556b3
+  data.tar.gz: 942edb65990bb556630bc172c1708c538143972f
 SHA512:
-  metadata.gz: aaaa30a83a84dce02f4025757df1d3f680a9496750fdd5d3343a8c75366c40bee0d8ec537db3361ad32b0339eec9554d300547088482f56f1e06f9536cc9ba46
-  data.tar.gz: 0f6700a31e0a14f325c12a6ad73b6cc43407c9204060ced25b199f98e909a37e16528d35b6c69d75601f39f6039816f062352acfae28efa661dc62d7e59bdb28
+  metadata.gz: 332c09f53af5787823467ef1b4c91a5b18645ba3aea03cce020c6910920e6085e68f71590214281617c8778c19a3d83fce760f97711ec69cfd2680206300c5ab
+  data.tar.gz: 43d194c86db40c664b6b2e19f8707af182524fe7ece3b5cd5fde1c4df9c654af2a96a7a63811e59eaf0ba6a9bf84bb23a25249fc0029191e0387c6cf22534138

data/lib/lucie/validators/mandatory_option.rb

@@ -7,7 +7,10 @@ module Lucie
 
       class Validator < Base
         def apply(params)
-          fail RequestError.new(self) unless params[:"#{short_option.gsub(/^-*/, '')}"]
+          if !params[:"#{short_option.gsub(/^-*/, '')}"] &&
+             !params[:"#{long_option.gsub(/^--*/, '')}"]
+            fail RequestError.new(self)
+          end
         end
       end
 

data/lib/lucie/version.rb

@@ -1,3 +1,3 @@
 module Lucie
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/lucie-lib.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest", "4.6"
   s.add_development_dependency "mini_shoulda", "0.4.0"
   s.add_development_dependency "sdoc"
+  s.add_development_dependency "m", "~> 1.3.1"
 end

data/test/fixtures/command_parser_fixtures.rb

@@ -26,16 +26,28 @@ class OptionalMandatoryController < Controller::Base
   end
 end
 
-class ParameterPairingController < Controller::Base
-  optional "-e", "--expression", "Search expression"
+class ParameterPairingMandatoryController < Controller::Base
+  mandatory "-e", "--expression", "Search expression"
 
   def search_short
-    print params[:expression]
+    print params[:e]
   end
 
   def search_long
+    print params[:expression]
+  end
+end
+
+class ParameterPairingOptionalController < Controller::Base
+  optional "-e", "--expression", "Search expression"
+
+  def search_short
     print params[:e]
   end
+
+  def search_long
+    print params[:expression]
+  end
 end
 
 class ExitValueController < Controller::Base
@@ -72,4 +84,5 @@ class MethodShouldBeRemovedController < Controller::Base
   def call_this_method
     print params[:args][0]
   end
-end
+end
+

data/test/functional/app_test.rb

@@ -41,9 +41,18 @@ describe App do
     end
   end
 
-  should "be able to pair parameters" do
-    assert_output("some_string", nil) { TestApp.run("parameter_pairing search_short -e some_string") }
-    assert_output("some_string", nil) { TestApp.run("parameter_pairing search_long --expression some_string") }
+  should "be able to pair optional parameters" do
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_optional search_short -e some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_optional search_long  -e some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_optional search_short --expression some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_optional search_long --expression some_string") }
+  end
+
+  should "be able to pair mandatory parameters" do
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory search_short -e some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory search_long  -e some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory search_short --expression some_string") }
+    assert_output("some_string", nil) { TestApp.run("parameter_pairing_mandatory search_long --expression some_string") }
   end
 
   should "write to stderr that no controller found when controller is missing" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucie-lib
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Nucc
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description: Command line utility framework
 email:
 - nucc@bteam.hu