eac_cli 0.22.2 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: addf1296db61bf83db37d4fd1b11b57df5b7f8ef9d9160c768a7137a551c5431
-  data.tar.gz: 7d6ade217a69e6401e52b626851f1182868b10140c76e4bbaff20145ca281e85
+  metadata.gz: 732a1f8ce5e5dc0a0866646c056d9beadb0792d6fa5d49d778b2781d415e3894
+  data.tar.gz: a3a6c28a58b3547fc4f6d79e613612e7d39cb08c3b693c6195509a65aabb2625
 SHA512:
-  metadata.gz: 74e1b0ee301de2feed32bb3917d31ee01743a3058ed0ea46e3dfbf12ad4dc38fcde0798c74d3b65252421f952b2502065f8fcbd813cd921651610300628b60ed
-  data.tar.gz: 439240ffac23cc174d47d37ab9ce97ce5529275c26813430f93655bb568094112448b253fcd6065bfd47955d08ac09044885bc4c2c5672d4f84a87392217ec6b
+  metadata.gz: e4a49116714b16d94950d8535fb5e120ad35bb3bc2729e5b35e65b1e33ada05ae46fb92b41034379a8fe8e90e15217328f950153c4758c9df2269295e53f3ed2
+  data.tar.gz: 0aa191f78fa604940d4584d04a081a5739d821b9b13a23bbf6ba4638b2786ef637432aca43f10ef53b01c14b3e4e1e9284a13371ac36ed39d52d1a10a6cc59e6

data/lib/eac_cli/config.rb

@@ -3,16 +3,19 @@
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
-  class Config
+  class Config < ::SimpleDelegator
     require_sub __FILE__
-    attr_reader :sub
 
     def initialize(sub_node)
-      @sub = sub_node
+      super(sub_node)
     end
 
     def entry(path, options = {})
       ::EacCli::Config::Entry.new(self, path, options)
     end
+
+    def sub
+      __getobj__
+    end
   end
 end

data/lib/eac_cli/definition/argument_option.rb

@@ -13,7 +13,7 @@ module EacCli
         repeat? ? previous_value + [new_value] : new_value
       end
 
-      def default_value
+      def default_default_value
         repeat? ? [] : nil
       end
     end

data/lib/eac_cli/definition/base_option.rb

@@ -18,7 +18,7 @@ module EacCli
 
       enable_listable
       enable_abstract_methods :build_value, :default_value
-      lists.add_symbol :option, :optional, :usage, :repeat, :required
+      lists.add_symbol :option, :default, :optional, :usage, :repeat, :required
       common_constructor :short, :long, :description, :options, default: [{}] do
         raise 'Nor short neither long selector was set' if short.blank? && long.blank?
 
@@ -27,6 +27,14 @@ module EacCli
         )
       end
 
+      def default_value
+        default_value? ? options[OPTION_DEFAULT] : default_default_value
+      end
+
+      def default_value?
+        options.key?(OPTION_DEFAULT)
+      end
+
       def identifier
         [long, short].each do |v|
           v.to_s.if_present { |vv| return vv.variableize.to_sym }

data/lib/eac_cli/definition/boolean_option.rb

@@ -14,6 +14,12 @@ module EacCli
       end
 
       def default_value
+        return super unless default_value?
+
+        raise "Unallowed default value for boolean options (Option: #{self})"
+      end
+
+      def default_default_value
         repeat? ? 0 : false
       end
     end

data/lib/eac_cli/enum.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/enum'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  # A [EacRubyUtils::Enum] which each value is associated with one console color.
+  class Enum < ::EacRubyUtils::Enum
+    # Foreground color used in [to_bg_label]
+    TO_BG_LABEL_FG_COLOR = :light_white
+
+    attr_reader :color
+
+    def initialize(key, color)
+      super(key)
+      @color = color
+    end
+
+    delegate :to_s, to: :key
+
+    # @return [String]
+    def to_label
+      to_fg_label
+    end
+
+    # @return [String]
+    def to_fg_label
+      to_fg_bg_label(color)
+    end
+
+    # @return [String]
+    def to_bg_label
+      to_fg_bg_label(TO_BG_LABEL_FG_COLOR, color)
+    end
+
+    private
+
+    # @return [String]
+    def to_fg_bg_label(fg_color, bg_color = nil)
+      colors = { color: fg_color }
+      bg_color.if_present { |v| colors[:background] = v }
+      ::ColorizedString[to_s].colorize(colors)
+    end
+  end
+end

data/lib/eac_cli/runner_with/help/builder.rb

@@ -36,9 +36,9 @@ module EacCli
         end
 
         def option_definition(option)
-          self.class.option_usage_full(option) + option.description.if_present('') do |v|
-            OPTION_DESC_SEP + v
-          end
+          [self.class.option_usage_full(option), option.description,
+           option.default_value? ? "[Default: \"#{option.default_value}\"]" : nil]
+            .reject(&:blank?).join(OPTION_DESC_SEP)
         end
 
         def section(header, include_header = true)

data/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.22.2'
+  VERSION = '0.24.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.24.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -33,7 +33,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,21 +43,21 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.80'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,7 @@ files:
 - lib/eac_cli/definition/boolean_option.rb
 - lib/eac_cli/definition/help_formatter.rb
 - lib/eac_cli/definition/positional_argument.rb
+- lib/eac_cli/enum.rb
 - lib/eac_cli/old_configs.rb
 - lib/eac_cli/old_configs/entry_reader.rb
 - lib/eac_cli/old_configs/password_entry_reader.rb