kerbi 0.0.13 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca38a5f6ca920ab236cd405551a44dd3415b8ecc746798583aa6e2efe32d53d7
-  data.tar.gz: '008754026121c9e6e03b68d99da1df0d4a6b906839a4b9e56b7173369f5600b5'
+  metadata.gz: dae405be53b5c0a3505a43512bb4551985ae43b4f364a053b9cee99265d99c6d
+  data.tar.gz: 6e58d1cbc2945dba01584bf5d687c2be5a5ca01bc6e121f1b938224997114c7a
 SHA512:
-  metadata.gz: 0b307cbc7cde2f434fe6887ab6cc467a4b6b97cb9d5ca93a6cb4c776cccce8acefaf37dc30bbe8cf752d943f32c583a30664721ce33ae0c4898aa1e1dc5c039a
-  data.tar.gz: 0413fdd8e9276992b6802b24d32fb98ee4d21a2df82c33b4806b057d8feb2fea2fcde9f042aba1fd112deaf5f858e4d98adf5be8ec37783554b0a4c95d6ee1c5
+  metadata.gz: 33e9e9a0a34833dc0d0822ec2b1764fe3491c7ff616cf8c6d77a428f50010f84a23ea0d72e1f8a5802cf8979fa89eae7e2451625aa1e2fae016c6c7baf700373
+  data.tar.gz: 2ffc4c1428bb792432c71c34ba204faf27f1f5bca6f96b7e92165b264db4cb188c64238cd706dafaf3080341a64eef3512d2ef126ab1aedd77f50b49ad00d730

data/lib/cli/config_handler.rb

@@ -25,7 +25,9 @@ module Kerbi
 
       cmd_meta Kerbi::Consts::CommandSchemas::CONFIG_SHOW
       def show
-        echo_data(run_opts.options)
+        src = run_opts.options
+        hash = Hash[legal_keys.map { |k| [k, src[k]] }]
+        echo_data(hash)
       end
 
       cmd_meta Kerbi::Consts::CommandSchemas::CONFIG_RESET

data/lib/cli/root_handler.rb

@@ -2,9 +2,11 @@ module Kerbi
 
   class Console
     attr_reader :values
+    attr_reader :default_values
 
-    def initialize(values)
+    def initialize(values, default_values)
       @values = values
+      @default_values = default_values
     end
 
     def to_s
@@ -46,9 +48,11 @@ module Kerbi
       def console
         utils::Cli.load_kerbifile(run_opts.project_root)
         values = compile_values
+        default_values = compile_default_values
         ARGV.clear
         IRB.setup(eval("__FILE__"), argv: [])
-        workspace = IRB::WorkSpace.new(Console.new(values))
+        wrapper = Console.new(values, default_values)
+        workspace = IRB::WorkSpace.new(wrapper)
         IRB::Irb.new(workspace).run(IRB.conf)
       end
 

data/lib/config/cli_schema.rb

@@ -28,15 +28,15 @@ module Kerbi
       KUBE_ACCESS_TOKEN = "k8s-access-token"
       K8S_USERNAME = "k8s-username"
       K8S_PASSWORD = "k8s-password"
-      K8S_TOKEN = "k8s-access-token"
 
       LEGAL_CONFIG_FILE_KEYS = [
+        LOAD_DEFAULT_VALUES,
+        OUTPUT_FMT,
         STATE_BACKEND_TYPE,
         K8S_AUTH_TYPE,
+        KUBE_CONFIG_PATH,
         KUBE_CONFIG_CONTEXT,
-        K8S_USERNAME,
-        K8S_PASSWORD,
-        KUBE_ACCESS_TOKEN
+        KUBE_ACCESS_TOKEN,
       ]
     end
 
@@ -111,8 +111,8 @@ module Kerbi
         default: true
       }.freeze
 
-      K8S_TOKEN = {
-        key: OptionKeys::K8S_TOKEN,
+      KUBE_ACCESS_TOKEN = {
+        key: OptionKeys::KUBE_ACCESS_TOKEN,
         desc: "Kubernetes auth bearer token for token auth"
       }.freeze
 
@@ -199,7 +199,8 @@ module Kerbi
         WRITE_STATE,
         K8S_AUTH_TYPE,
         KUBE_CONFIG_PATH,
-        KUBE_CONFIG_CONTEXT
+        KUBE_CONFIG_CONTEXT,
+        KUBE_ACCESS_TOKEN
       ].freeze
 
       VALUES_OPTIONS = [
@@ -397,6 +398,7 @@ module Kerbi
         options: [
           OptionSchemas::OUTPUT_FMT,
           OptionSchemas::PROJECT_ROOT,
+          OptionSchemas::RELEASE_NAME,
           *OptionSchemas::VALUES_OPTIONS,
           *OptionSchemas::KUBERNETES_OPTIONS
         ]

data/lib/config/run_opts.rb

@@ -26,6 +26,10 @@ module Kerbi
       value || default
     end
 
+    def release_name
+      @release_name || options[consts::RELEASE_NAME]
+    end
+
     # @return [TrueClass, FalseClass]
     def output_yaml?
       self.output_format == 'yaml'
@@ -124,7 +128,7 @@ module Kerbi
 
     # @return [String]
     def k8s_auth_token
-      options[consts::K8S_TOKEN]
+      options[consts::KUBE_ACCESS_TOKEN]
     end
 
     # @return [String]

data/spec/cli/values_handler_spec.rb

@@ -12,5 +12,13 @@ RSpec.describe "$ kerbi values [COMMAND]" do
         exp_cli_eq_file(cmd, "values", "order-of-precedence", "yaml")
       end
     end
+
+    context "with state" do
+      it "parses RELEASE_NAME correctly" do
+        # base = "values show --release-name foo"
+        # puts cli(base)
+
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,13 @@
 require 'tempfile'
-require 'simplecov'
 
+require 'simplecov'
 SimpleCov.start
 
+if ENV['UPLOAD_CODECOV']
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
+
 require_relative './../lib/kerbi'
 
 def run_opts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kerbi
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.16
 platform: ruby
 authors:
 - Xavier Millot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http