cri 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5285c76db1bf769830b9258e04e041ae4ce35110
-  data.tar.gz: a4a34c4114ef34eb00deb31b62a60e7a39111086
+  metadata.gz: a4071cb78d426c77cba1c810c77e618098fd0ff5
+  data.tar.gz: d1d4bc176390cbbceab6b6f79ce12c907e27ae37
 SHA512:
-  metadata.gz: 0546e56bded0584b797f35771344ef9057f903322b61e2fa94d17471250bcb92bda6cc77f7a4086526c9acd45e04221ffc773f1b17d8ff37d1add1d36fcce661
-  data.tar.gz: 9c94286223b03f5bd3621ef51659a3239e70ef130aa4874156cf66db2650e527c15c74e40729706e83e10a466bdab12623cbc8ab0daf9ad136ff58d5fcfd3c4f
+  metadata.gz: f5a100be8c1fab79a67893e7e8ee63eccb3258159526fb9624292d8d713e7a4ed05b21c7074056c4eadb71106044a006ff931a2aaec14749c33acf94f844733f
+  data.tar.gz: ae2e7d5e146c463344c8a445977a949b0f676a88bcc993a663d5d6add5083fee76bf2015a8a10e7d5c77b4b46e158fa4976bdcb99307d7115e4578e97efba3f2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cri (2.9.0)
+    cri (2.9.1)
       colored (~> 1.2)
 
 GEM

data/NEWS.md

@@ -1,6 +1,12 @@
 Cri News
 ========
 
+## 2.9.1
+
+Fixes:
+
+* Made default values be always returned, even when not explicitly specified (#57, #58)
+
 ## 2.9.0
 
 Features:

data/lib/cri/command_dsl.rb

@@ -127,8 +127,8 @@ module Cri
         raise ArgumentError, 'short and long options cannot both be nil'
       end
 
-      if default && requiredness != :optional
-        raise ArgumentError, "a default value cannot be specified for options with #{requiredness} values"
+      if default && requiredness == :forbidden
+        raise ArgumentError, 'a default value cannot be specified for flag options'
       end
 
       @command.option_definitions << {

data/lib/cri/option_parser.rb

@@ -173,6 +173,9 @@ module Cri
           add_argument(e)
         end
       end
+
+      add_defaults
+
       self
     ensure
       @running = false
@@ -180,6 +183,10 @@ module Cri
 
     private
 
+    def add_defaults
+      @definitions.each { |d| add_default_option(d) }
+    end
+
     def handle_dashdash(e)
       add_argument(e)
       @no_more_options = true
@@ -252,7 +259,8 @@ module Cri
     end
 
     def add_option(definition, value)
-      key = (definition[:long] || definition[:short]).to_sym
+      key = key_for(definition)
+
       if definition[:multiple]
         options[key] ||= []
         options[key] << value
@@ -263,6 +271,25 @@ module Cri
       delegate.option_added(key, value, self) unless delegate.nil?
     end
 
+    def add_default_option(definition)
+      key = key_for(definition)
+      return if options.key?(key)
+
+      value = definition[:default]
+      return unless value
+
+      if definition[:multiple]
+        options[key] ||= []
+        options[key] << value
+      else
+        options[key] = value
+      end
+    end
+
+    def key_for(definition)
+      (definition[:long] || definition[:short]).to_sym
+    end
+
     def add_argument(value)
       @raw_arguments << value
 

data/lib/cri/version.rb

@@ -1,4 +1,4 @@
 module Cri
   # The current Cri version.
-  VERSION = '2.9.0'.freeze
+  VERSION = '2.9.1'.freeze
 end

data/test/test_command_dsl.rb

@@ -161,15 +161,12 @@ module Cri
       end
     end
 
-    def test_default_value_errors_when_requiredness_is_required
+    def test_default_value_with_equiredness_is_required
       dsl = Cri::CommandDSL.new
 
-      err = assert_raises ArgumentError do
-        dsl.instance_eval do
-          required 'a', 'animal', 'Specify animal', default: 'giraffe'
-        end
+      dsl.instance_eval do
+        required 'a', 'animal', 'Specify animal', default: 'giraffe'
       end
-      assert_equal('a default value cannot be specified for options with required values', err.message)
     end
 
     def test_default_value_errors_when_requiredness_is_forbidden
@@ -180,7 +177,7 @@ module Cri
           flag 'a', 'animal', 'Allow animal', default: 'giraffe'
         end
       end
-      assert_equal('a default value cannot be specified for options with forbidden values', err.message)
+      assert_equal('a default value cannot be specified for flag options', err.message)
     end
 
     def test_subcommand

data/test/test_option_parser.rb

@@ -282,6 +282,18 @@ module Cri
       assert_equal(3, parser.options[:verbose].size)
     end
 
+    def test_parse_with_default_required_unspecified
+      input       = %w[foo]
+      definitions = [
+        { long: 'animal', short: 'a', argument: :required, default: 'donkey' },
+      ]
+
+      parser = Cri::OptionParser.parse(input, definitions)
+
+      assert_equal({ animal: 'donkey' }, parser.options)
+      assert_equal(['foo'], parser.arguments)
+    end
+
     def test_parse_with_default_required_no_value
       input       = %w[foo -a]
       definitions = [
@@ -305,6 +317,18 @@ module Cri
       assert_equal(['foo'], parser.arguments)
     end
 
+    def test_parse_with_default_optional_unspecified
+      input       = %w[foo]
+      definitions = [
+        { long: 'animal', short: 'a', argument: :optional, default: 'donkey' },
+      ]
+
+      parser = Cri::OptionParser.parse(input, definitions)
+
+      assert_equal({ animal: 'donkey' }, parser.options)
+      assert_equal(['foo'], parser.arguments)
+    end
+
     def test_parse_with_default_optional_no_value
       input       = %w[foo -a]
       definitions = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cri
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Denis Defreyne