kerbi 0.0.4 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc84c52b063114ccf2c33721e609959a91ae8be6feeab8ff8036d94570ec1b5a
-  data.tar.gz: c6f4c586035a79b8a6588383e644d67707425d0ad015ba36063ce107874ae200
+  metadata.gz: c54c442776af5f74fe8caac8eb74883a3e577f39077ea78972ee0fe0e19b5928
+  data.tar.gz: a7ad9356f2e18bc26d903f2e861a178efc41c6a468616db998dbf7041813eb71
 SHA512:
-  metadata.gz: f2f8e07c36cce67f6caf752ac710d696edfa470266b018300eb3d793587ab866d0fda628d9838f926021bc66905fac19d686149b6018297a9282a8124398c80b
-  data.tar.gz: f637456bafb649caf59af1859de97fed2f84604a3b62ab34bf804a0deb4147074467150466c4b2ea7a4cd774270f20386ec32124e506db39ea9a4c6ab0695649
+  metadata.gz: 04f5d11c0a023e23d294e41be06ca967ba61f7db97bff724b0c73ff37ec7c6f189988de7e8c57ba6993503403802cd69ee8188bd118ec90c65c1a34bd5f01cac
+  data.tar.gz: 6c5d3b70ccb829331666d581783a61c75b1d65de06cb4bd803ce1e5d60a7e44e4c2d797a9f1a27333e268acad2e0eb5d2b3e5aa4ed0f15dd47f3e19a16a453e4

data/lib/cli/base_handler.rb

@@ -15,8 +15,38 @@ module Kerbi
         @_state_backend ||= generate_state_backend(**opts)
       end
 
-      def mem_release_name(release_name)
-        self.run_opts.release_name = release_name
+      ##
+      # Sets two very commonly used variables in the run_opts
+      # object, available to all subclasses.
+      def mem_dna(release_name, project_uri=nil)
+        run_opts.release_name = release_name
+        run_opts.project_uri = project_uri
+      end
+
+      def perform_templating
+        if run_opts.local_engine?
+          perform_local_templating
+        else
+          perform_remote_templating
+        end
+      end
+
+      def perform_local_templating
+        Kerbi::Utils::Cli.run_mixers(
+          Kerbi::Globals.mixers,
+          compile_values,
+          run_opts.release_name
+        )
+      end
+
+      def perform_remote_templating
+        Kerbi::Revision::Fetcher.post_template(
+          remote_engine_root_url,
+          run_opts.revision_tag
+        )
+      end
+
+      def remote_engine_root_url
       end
 
       ##
@@ -84,6 +114,7 @@ module Kerbi
 
             fname_exprs = run_opts.fname_exprs
             fname_exprs = ["values", *fname_exprs] if run_opts.load_defaults?
+            fname_exprs = fname_exprs.reject{ |f| f.start_with?("r:") }
 
             file_values = utils.from_files(
               fname_exprs,

data/lib/cli/entry_serializers.rb

@@ -43,6 +43,8 @@ module Kerbi
 
       has_attributes(
         :tag,
+        :release,
+        :revision,
         :message,
         :created_at,
         :values,
@@ -54,6 +56,10 @@ module Kerbi
         #noinspection RubyResolve
         colored_tag.bold
       end
+
+      def release
+        object&.set&.release_name
+      end
     end
 
     class EntryRowSerializer < Kerbi::Cli::BaseSerializer
@@ -61,6 +67,7 @@ module Kerbi
 
       has_attributes(
         :tag,
+        :revision,
         :message,
         :assignments,
         :overrides,

data/lib/cli/release_handler.rb

@@ -5,7 +5,7 @@ module Kerbi
       cmd_meta Kerbi::Consts::CommandSchemas::INIT_RELEASE
       # @param [String] release_name refers to a Kubernetes namespace
       def init(release_name)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         state_backend.provision_missing_resources(verbose: run_opts.verbose?)
         ns_key = Kerbi::Consts::OptionSchemas::NAMESPACE
         Kerbi::ConfigFile.patch({ns_key => release_name})
@@ -13,7 +13,7 @@ module Kerbi
 
       cmd_meta Kerbi::Consts::CommandSchemas::RELEASE_STATUS
       def status(release_name)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         backend = state_backend
         backend.test_connection(verbose: run_opts.verbose?)
       end
@@ -29,7 +29,7 @@ module Kerbi
 
       cmd_meta Kerbi::Consts::CommandSchemas::RELEASE_DELETE
       def delete(release_name)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         backend = state_backend
         return unless user_confirmed?
         old_signature = backend.resource_signature

data/lib/cli/root_handler.rb

@@ -33,13 +33,12 @@ module Kerbi
 
       cmd_meta Kerbi::Consts::CommandSchemas::TEMPLATE
       # @param [String] release_name helm-like Kubernetes release name
-      def template(release_name)
-        mem_release_name(release_name)
+      # @param [String] project_uri local path like '.' or remote URI
+      def template(release_name, project_uri)
+        mem_dna(release_name, project_uri)
         utils::Cli.load_kerbifile(run_opts.project_root)
-        values = compile_values
+        res_dicts = perform_templating
         persist_compiled_values
-        mixer_classes = Kerbi::Globals.mixers
-        res_dicts = utils::Cli.run_mixers(mixer_classes, values, release_name)
         echo_data(res_dicts, coerce_type: "Array")
       end
 

data/lib/cli/state_handler.rb

@@ -4,7 +4,7 @@ module Kerbi
       cmd_meta Kerbi::Consts::CommandSchemas::LIST_STATE
       def list(release_name)
         prep_opts(Kerbi::Consts::OptionDefaults::LIST_STATE)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         echo_data(
           state_backend.entries,
           table_serializer: Kerbi::Cli::EntryRowSerializer,
@@ -16,7 +16,7 @@ module Kerbi
       # @param [String] tag_expr e.g 1.9.1, @latest
       def show(release_name, tag_expr)
         prep_opts(Kerbi::Consts::OptionDefaults::LIST_STATE)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         entry = find_readable_entry(tag_expr)
         echo_data(
           entry,
@@ -29,7 +29,7 @@ module Kerbi
       # @param [String] old_tag_expr e.g 1.9.1, @latest
       # @param [String] new_tag_expr e.g 1.9.1, @latest
       def retag(release_name, old_tag_expr, new_tag_expr)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         entry = find_readable_entry(old_tag_expr)
         old_tag = entry.retag(new_tag_expr)
         touch_and_save_entry(entry, tag: old_tag)
@@ -38,7 +38,7 @@ module Kerbi
       cmd_meta Kerbi::Consts::CommandSchemas::PROMOTE_STATE
       # @param [String] tag_expr e.g 1.9.1, @latest
       def promote(release_name, tag_expr)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         entry = find_readable_entry(tag_expr)
         old_name = entry.promote
         touch_and_save_entry(entry, tag: old_name)
@@ -47,7 +47,7 @@ module Kerbi
       cmd_meta Kerbi::Consts::CommandSchemas::DEMOTE_STATE
       # @param [String] tag_expr e.g 1.9.1, @latest
       def demote(release_name, tag_expr)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         entry = find_readable_entry(tag_expr)
         old_name = entry.demote
         touch_and_save_entry(entry, tag: old_name)
@@ -58,7 +58,7 @@ module Kerbi
       # @param [String] attr_name e.g message
       # @param [String] new_value e.g i am a new message
       def set(release_name, tag_expr, attr_name, new_value)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         entry = find_readable_entry(tag_expr)
         old_value = entry.assign_attr(attr_name, new_value)
         touch_and_save_entry(entry, attr_name => old_value)
@@ -67,7 +67,7 @@ module Kerbi
       cmd_meta Kerbi::Consts::CommandSchemas::DELETE_STATE
       # @param [String] tag_expr e.g 1.9.1, @latest
       def delete(release_name, tag_expr)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         entry = find_readable_entry(tag_expr)
         state_backend.delete_entry(entry)
         new_count = state_backend.entries.count
@@ -76,7 +76,7 @@ module Kerbi
 
       cmd_meta Kerbi::Consts::CommandSchemas::PRUNE_CANDIDATES_STATE
       def prune_candidates(release_name)
-        mem_release_name(release_name)
+        mem_dna(release_name)
         old_count = entry_set.entries.count
         entry_set.prune_candidates
         state_backend.save

data/lib/cli/values_handler.rb

@@ -4,7 +4,6 @@ module Kerbi
       cmd_meta Kerbi::Consts::CommandSchemas::SHOW_VALUES
       def show
         values = compile_values
-        persist_compiled_values
         echo_data(values, coerce_type: "Hash")
       end
     end

data/lib/code-gen/new-project/kerbifile.rb.erb

@@ -6,4 +6,5 @@ module <%= (module_name = data[:user_module_name]) %>
   end
 end
 
-Kerbi::Globals.mixers << <%= module_name %>::RootMixer
+Kerbi::Globals.mixers << <%= module_name %>::RootMixer
+Kerbi::Globals.revision = "0.0.1"

data/lib/config/cli_schema.rb

@@ -3,6 +3,8 @@ module Kerbi
 
     module OptionKeys
       PROJECT_ROOT = "project-root"
+      REVISION_TAG = "revision"
+      RELEASE_NAME = "release-name"
 
       OUTPUT_FMT = "output-format"
       INLINE_ASSIGNMENT = "inline-value"
@@ -66,22 +68,30 @@ module Kerbi
         aliases: "-p"
       }
 
+      REVISION_TAG = {
+        key: OptionKeys::REVISION_TAG,
+        desc: "Use this version of the Kerbi templating "\
+              "engine (given by [PROJECT_URI]).",
+        aliases: "-p"
+      }
+
       K8S_AUTH_TYPE = {
         key: OptionKeys::K8S_AUTH_TYPE,
-        desc: "Strategy for connecting to target cluster "\
-              "(defaults to kube-config)",
-        enum: %w[kube-config in-cluster basic token]
+        desc: "Kubernetes cluster authentication type. Uses " \
+              "kube-config if unspecified.",
+        enum: %w[kube-config in-cluster token]
       }.freeze
 
       KUBE_CONFIG_PATH = {
         key: OptionKeys::KUBE_CONFIG_PATH,
-        desc: "path to your kube-config file, defaults to ~/.kube/config"
+        desc: "Path to your kube-config file. Uses " \
+               "~/.kube/config if unspecified."
       }.freeze
 
       KUBE_CONFIG_CONTEXT = {
         key: OptionKeys::KUBE_CONFIG_CONTEXT,
-        desc: "context to use in your kube config,
-defaults to $(kubectl config current-context)"
+        desc: "Context to use in your kube config. "\
+              "Uses current context if unspecified."
       }.freeze
 
       K8S_USERNAME = {
@@ -96,7 +106,7 @@ defaults to $(kubectl config current-context)"
 
       LOAD_DEFAULT_VALUES = {
         key: OptionKeys::LOAD_DEFAULT_VALUES,
-        desc: "Automatically load values.yaml. Defaults to true.",
+        desc: "Whether or not to automatically load values.yaml.",
         type: "boolean",
         default: true
       }.freeze
@@ -106,31 +116,35 @@ defaults to $(kubectl config current-context)"
         desc: "Kubernetes auth bearer token for token auth"
       }.freeze
 
+      RELEASE_NAME = {
+        key: OptionKeys::RELEASE_NAME,
+        desc: "Release name for commands where state I/O is optional"
+      }
+
       STATE_BACKEND_TYPE = {
         key: OptionKeys::STATE_BACKEND_TYPE,
-        desc: "Persistent store to keep track of applied "\
-              "values (configmap, secret)",
+        desc: "Type of persistent store to read/write this release's state.",
         enum: %w[configmap secret]
       }.freeze
 
       OUTPUT_FMT = {
         key: OptionKeys::OUTPUT_FMT,
         aliases: "-o",
-        desc: "Specify YAML, JSON, or table",
+        desc: "In what format resulting data should be printed",
         enum: %w[yaml json table]
       }.freeze
 
       INLINE_ASSIGNMENT = {
         key: OptionKeys::INLINE_ASSIGNMENT,
         aliases: "--set",
-        desc: "An inline variable assignment, e.g --set x.y=foo "\
-              "--set x.z=bar",
+        desc: "Merge value from this assignment, "\
+              "e.g --set x.y=foo. Multiple --set are allowed.",
         repeatable: true
       }.freeze
 
       READ_STATE = {
         key: OptionKeys::READ_STATE,
-        desc: "Merge values from given state record into final values.",
+        desc: "Merge values from state with this tag.",
       }.freeze
 
       STRICT_READ_STATE = {
@@ -141,38 +155,41 @@ defaults to $(kubectl config current-context)"
 
       WRITE_STATE = {
         key: OptionKeys::WRITE_STATE,
-        desc: "write compiled values into given state record"
+        desc: "Write compiled values into new or existing state record" \
+              "with this tag."
       }.freeze
 
       NAMESPACE = {
         key: OptionKeys::NAMESPACE,
         aliases: "-n",
-        desc: "for state operations, tell kerbi that the state
-               configmap/secret is in this namespace"
+        desc: "Use this Kubernetes namespace instead of [RELEASE_NAME] "\
+              "for state I/O."
       }.freeze
 
       VALUE_FNAMES = {
         key: OptionKeys::VALUE_FNAMES,
         aliases: "-f",
-        desc: "Name of a values file to be loaded.",
+        desc: "Merge all values read from this file. Multiple " \
+              "-f are allowed.",
         repeatable: true
       }.freeze
 
       RUBY_VER = {
         key: OptionKeys::RUBY_VER,
-        desc: "Specify ruby version for Gemfile in a new project"
+        desc: "Ruby version semver for autogenerated " \
+              "Gemfile."
       }.freeze
 
       VERBOSE = {
         key: OptionKeys::VERBOSE,
         desc: "Run in verbose mode",
-        enum: %w[true false]
+        type: "boolean"
       }.freeze
 
       PRE_CONFIRM = {
         key: OptionKeys::PRE_CONFIRM,
-        desc: "Skip CLI confirmation",
-        enum: %w[true false]
+        desc: "Skip any CLI confirmation prompts",
+        type: "boolean"
       }.freeze
 
       KUBERNETES_OPTIONS = [
@@ -196,32 +213,32 @@ defaults to $(kubectl config current-context)"
 
       VALUES_SUPER = {
         name: "values",
-        desc: "Command group for values actions: show, get"
+        desc: "Command group for values actions (see $ kerbi values help)"
       }.freeze
 
       PROJECT_SUPER = {
         name: "project",
-        desc: "Command group for project actions: new, info"
+        desc: "Command group for project actions (see $ kerbi project help)"
       }.freeze
 
       STATE_SUPER = {
         name: "state",
-        desc: "Command group for state actions"
+        desc: "Command group for state actions (see $ kerbi state help)"
       }.freeze
 
       RELEASE_SUPER = {
         name: "release",
-        desc: "Command group for release actions"
+        desc: "Command group for release actions (see $ kerbi release help)"
       }.freeze
 
       CONFIG_SUPER = {
         name: "config",
-        desc: "Command group for config actions: set, get, show"
+        desc: "Command group for config actions (see $ kerbi config help)"
       }.freeze
 
       TEMPLATE = {
-        name: "template [KERBIFILE] [RELEASE_NAME]",
-        desc: "Runs mixers for RELEASE_NAME",
+        name: "template [RELEASE_NAME] [PROJECT_URI]",
+        desc: "Templates to YAML/JSON, using [RELEASE_NAME] for state I/O",
         options: [
           OptionSchemas::PROJECT_ROOT,
           OptionSchemas::OUTPUT_FMT,
@@ -257,8 +274,7 @@ defaults to $(kubectl config current-context)"
 
       RELEASE_STATUS = {
         name: "status [RELEASE_NAME]",
-        desc: "Verbosely assesses the readiness of your "\
-              "state-tracking backend.",
+        desc: "Check readiness of release's ConfigMap/Secret backend.",
         options: [
           *OptionSchemas::KUBERNETES_OPTIONS,
           OptionSchemas::VERBOSE
@@ -371,16 +387,16 @@ defaults to $(kubectl config current-context)"
 
       SHOW_VERSION = {
         name: "version",
-        desc: "Print kerbi version",
+        desc: "Print the kerbi gem's version.",
         options: []
       }.freeze
 
       SHOW_VALUES = {
         name: "show",
-        desc: "Print out loaded values as YAML",
+        desc: "Prints the final compiled values for the given sources",
         options: [
-          OptionSchemas::PROJECT_ROOT,
           OptionSchemas::OUTPUT_FMT,
+          OptionSchemas::PROJECT_ROOT,
           *OptionSchemas::VALUES_OPTIONS,
           *OptionSchemas::KUBERNETES_OPTIONS
         ]

data/lib/config/config_file.rb

@@ -3,7 +3,7 @@ module Kerbi
   module ConfigFile
 
     DIR_NAME = ".kerbi"
-    FILE_NAME = "config.yaml"
+    FILE_NAME = "config.json"
 
     def self.file_path
       "#{Dir.home}/#{DIR_NAME}/#{FILE_NAME}"
@@ -26,10 +26,11 @@ module Kerbi
     def self.read
       begin
         create_file_if_missing
-        contents = YAML.load_file(file_path)
-        contents.slice(*legal_keys)
+        contents = File.read(file_path)
+        dict = JSON.parse(contents)
+        dict.slice(*legal_keys)
       rescue StandardError => e
-        puts "[WARN] failed to read config #{file_path} (#{e})"
+        $stderr.puts "[WARN] failed to read config #{file_path} (#{e})"
         {}
       end
     end
@@ -38,7 +39,7 @@ module Kerbi
     def self.write(config, skip_check: false)
       create_file_if_missing unless skip_check
       config = config.deep_dup.stringify_keys.slice(*legal_keys)
-      File.write(file_path, YAML.dump(config))
+      File.write(file_path, JSON.dump(config))
     end
 
     # @param [Hash] config

data/lib/config/globals.rb

@@ -7,5 +7,13 @@ module Kerbi
     def self.reset
       $_mixers = []
     end
+
+    def self.revision=(val)
+      $_engine_revision = val
+    end
+
+    def self.revision
+      $_engine_revision || "0.0.0"
+    end
   end
 end

data/lib/config/run_opts.rb

@@ -8,6 +8,7 @@ module Kerbi
 
     attr_reader :options
     attr_accessor :release_name
+    attr_accessor :project_uri
 
     # @param [Hash{Symbol, Object}] cli_opts CLI args as a hash via Thor
     # @param [Hash{Symbol, Object}] defaults contextual defaults (per cmd)
@@ -90,11 +91,6 @@ module Kerbi
       write_state_to.present?
     end
 
-    # @return [String]
-    def k8s_auth_type
-      options[consts::K8S_AUTH_TYPE]
-    end
-
     # @return [String]
     def kube_config_path
       options[consts::KUBE_CONFIG_PATH]
@@ -138,12 +134,30 @@ module Kerbi
 
     # @return [String]
     def project_root
-      options[consts::PROJECT_ROOT].presence
+      options[consts::PROJECT_ROOT].presence || project_uri
+    end
+
+    # @return [?String]
+    def revision_tag
+      options[consts::REVISION_TAG].presence
+    end
+
+    def remote_engine?
+      revision_tag.present?
+    end
+
+    def local_engine?
+      !remote_engine?
+    end
+
+    # @return [String]
+    def k8s_auth_type
+      options[consts::K8S_AUTH_TYPE]
     end
 
     # @return [TrueClass, FalseClass]
     def in_cluster?
-      options[consts::K8S_AUTH_TYPE] == 'in-cluster'
+      k8s_auth_type == 'in-cluster'
     end
 
     # @return [TrueClass, FalseClass]

data/lib/config/state_consts.rb

@@ -4,8 +4,8 @@ module Kerbi
       CREATOR_ATTR = :creator
       CREATOR_VAL = "kerbi"
       ENTRIES_ATTR = :entries
-      RESOURCE_NAME = "kerbi-state-tracker"
-      CM_REGEX = /kerbi-(.*)-state-tracker/
+      RESOURCE_NAME = "kerbi-db"
+      CM_REGEX = /kerbi-(.*)-db/
     end
   end
 end

data/lib/kerbi.rb

@@ -58,6 +58,8 @@ require_relative './state/base_backend'
 require_relative './state/mixers'
 require_relative './state/config_map_backend'
 
+require_relative './revision/fetcher'
+
 require_relative './main/errors'
 require_relative './cli/base_handler'
 require_relative './cli/config_handler'

data/lib/main/mixer.rb

@@ -12,6 +12,11 @@ module Kerbi
     # @return [String] symbol-keyed hash
     attr_reader :release_name
 
+    ##
+    # Namespace (defaults to release_name) from CLI options
+    # @return [String] symbol-keyed hash
+    attr_reader :namespace
+
     ##
     # Array of res-hashes being aggregated
     # @return [Array<Hash>] list of hashes
@@ -27,12 +32,13 @@ module Kerbi
     # @param [Hash] values the values tree that will be accessible to the subclass
     def initialize(values, opts={})
       @output = []
-      @release_name = opts[:release_name] || "default"
+      @release_name = opts[:release_name]
+      @namespace = opts[:namespace] || @release_name
       @patch_stack = []
       @values = self.class.compute_own_values_subtree(
         values,
         opts[:overwrite_values_root]
-      )
+      ).freeze
     end
 
     ##
@@ -107,7 +113,7 @@ module Kerbi
     # @param [String] chart_id using format 'jetstack/cert-manager'
     # @param [Hash] opts filtering and other options for #dicts
     # @return [Array<Hash>] processed and filtered dicts
-    def chart(chart_id, **opts)
+    def helm_chart(chart_id, **opts)
       release = opts[:release] || release_name
       helm_output = Utils::Helm.template(release, chart_id, **opts)
       dicts(helm_output)
@@ -131,7 +137,7 @@ module Kerbi
     end
 
     ##
-    # Any x-to-dict statements (e.g #dicts, #dir, #chart) executed
+    # Any x-to-dict statements (e.g #dicts, #dir, #helm_chart) executed
     # in the &block passed to this method will have their return values
     # deep merged with the dict(s) passed.
     # @param [Array<Hash>|Hash] dict

data/lib/mixins/entry_tag_logic.rb

@@ -13,16 +13,19 @@ module Kerbi
       CANDIDATE_WORD = "candidate"
       NEW_CANDIDATE_WORD = "new-candidate"
       LATEST_WORD = "latest"
+      LATEST_PLUS_WORD = "latest+\\."
       OLDEST_WORD = "oldest"
       RANDOM_WORD = "random"
 
       SPECIAL_READ_WORDS = [
         CANDIDATE_WORD,
+        LATEST_PLUS_WORD,
         LATEST_WORD,
         OLDEST_WORD
       ]
 
       SPECIAL_WRITE_WORDS = [
+        LATEST_PLUS_WORD,
         LATEST_WORD,
         OLDEST_WORD,
         CANDIDATE_WORD,

data/lib/revision/fetcher.rb

@@ -0,0 +1,15 @@
+module Kerbi
+  module Revision
+    module Fetcher
+      # @return [Hash]
+      def get_values
+        {}
+      end
+
+      # @return [Array<Hash>]
+      def self.post_template(base_url, revision_tag)
+        [{}]
+      end
+    end
+  end
+end

data/lib/state/base_backend.rb

@@ -2,6 +2,14 @@ module Kerbi
   module State
     class BaseBackend
 
+      ##
+      # Made available to states, as a convenience
+      # @return [String] release name
+      attr_reader :release_name
+
+      ##
+      # Whether the last connection attempt succeeded or failed
+      # @return [TrueClass|FalseClass] list of hashes
       attr_reader :is_working
 
       def initialize(options={})
@@ -9,7 +17,10 @@ module Kerbi
 
       # @return [Kerbi::State::EntrySet]
       def entry_set
-        @_entry_set ||= EntrySet.new(read_entries)
+        @_entry_set ||= EntrySet.new(
+          read_entries,
+          release_name: release_name
+        )
       end
 
       # @return [Array<Kerbi::State::Entry>]