kubes 0.7.8 → 0.8.1

data/lib/kubes/compiler/shared/runtime_helpers.rb

@@ -3,9 +3,9 @@ module Kubes::Compiler::Shared
     include Kubes::Compiler::Shared::Helpers
 
     def load_runtime_helpers
-      load_custom_variables # also load custom variables
       load_plugin_helpers
       load_custom_helpers
+      load_custom_variables # also load custom variables
     end
 
     @@custom_helpers_loaded = false
@@ -68,6 +68,13 @@ module Kubes::Compiler::Shared
         "#{role}/#{kind}/base.rb",
         "#{role}/#{kind}/#{Kubes.env}.rb",
       ]
+      if Kubes.app
+        app_layers = ["#{Kubes.app}.rb"]
+        app_layers += layers.map do |path|
+          "#{Kubes.app}/#{path}"
+        end
+        layers += app_layers
+      end
 
       layers.each do |layer|
         path = "#{Kubes.root}/.kubes/variables/#{layer}"

data/lib/kubes/compiler/strategy/erb/comment.rb

@@ -0,0 +1,46 @@
+# Processes the ERB files and looks for comments like
+#
+#     #ERB if @testvar
+#     - "some yaml"
+#     #ERB end
+#
+class Kubes::Compiler::Strategy::Erb
+  class Comment
+    extend Memoist
+
+    def initialize(path)
+      @path = path
+    end
+
+    def lines
+      IO.readlines(@path)
+    end
+    memoize :lines
+
+    def process?
+      !!lines.detect { |l| l.include?('#ERB') }
+    end
+
+    def process
+      new_lines = lines.map do |line|
+        md = line.match(/(.*)#ERB(.*)/)
+        if md
+          "#{md[1]}<%#{md[2]} %>\n"
+        else
+          line
+        end
+      end
+      content = new_lines.join('')
+      IO.write(erb_path, content)
+      erb_path
+    end
+
+    def clean
+      FileUtils.rm_f(erb_path) unless ENV['KUBES_KEEP_ERB']
+    end
+
+    def erb_path
+      "#{@path}.erb"
+    end
+  end
+end

data/lib/kubes/compiler/strategy/erb.rb

@@ -17,7 +17,11 @@ class Kubes::Compiler::Strategy
     def render_result(path)
       return unless File.exist?(path)
 
+      comment = Comment.new(path)
+      path = comment.process if comment.process?
       yaml = RenderMePretty.result(path, context: self)
+      comment.clean if comment.process?
+
       result = yaml_load(path, yaml)
       # in case of blank yaml doc a Boolean false is returned. else Hash or Array is returned
       %w[Array Hash].include?(result.class.to_s) ? result : {}

data/lib/kubes/compiler/strategy/result.rb

@@ -21,8 +21,20 @@ class Kubes::Compiler::Strategy
     end
 
     def content
-      result = @data.size == 1 ? @data.first : @data
+      data = filter_skip(@data)
+      return if data.empty?
+      result = data.size == 1 ? data.first : data
       yaml_dump(result)
     end
+
+    def skip?
+      content.nil?
+    end
+
+    def filter_skip(data)
+      data.reject do |item|
+        item.dig('kubes', 'skip')
+      end
+    end
   end
 end

data/lib/kubes/compiler.rb

@@ -38,6 +38,8 @@ module Kubes
     end
 
     def write(result)
+      return if config_skip?(result.filename)
+      return if result.skip?
       result.decorate!(:post)
       filename, content = result.filename, result.content
       dest = "#{Kubes.root}/.kubes/output/#{filename}"

data/lib/kubes/config.rb

@@ -18,7 +18,7 @@ module Kubes
       # Auto-switching options
       config.kubectl = ActiveSupport::OrderedOptions.new
       config.kubectl.context = nil
-      config.kubectl.context_keep = true # after switching context keep it
+      config.kubectl.context_keep = false # after switching context keep it
 
       # whether or not continue if the kubectl command fails
       config.kubectl.exit_on_fail = ActiveSupport::OrderedOptions.new
@@ -39,7 +39,7 @@ module Kubes
       config.skip = []
 
       config.state = ActiveSupport::OrderedOptions.new
-      config.state.path = "#{Kubes.root}/.kubes/state/#{Kubes.env}/data.json"
+      config.state.path = ["#{Kubes.root}/.kubes/tmp/state", Kubes.app, "#{Kubes.env}/data.json"].compact.join('/')
 
       config.suffix_hash = true # append suffix hash to ConfigMap and Secret
 
@@ -95,6 +95,10 @@ module Kubes
     def load_configs
       evaluate_file(".kubes/config.rb")
       evaluate_file(".kubes/config/env/#{Kubes.env}.rb")
+      if Kubes.app
+        evaluate_file(".kubes/config/env/#{Kubes.app}.rb")
+        evaluate_file(".kubes/config/env/#{Kubes.app}/#{Kubes.env}.rb")
+      end
       Kubes::Plugin.plugins.each do |klass|
         # klass: IE: KubesAws, KubesGoogle
         name = klass.to_s.underscore.sub('kubes_','') # kubes_google => google

data/lib/kubes/core.rb

@@ -2,6 +2,10 @@ module Kubes
   module Core
     extend Memoist
 
+    def app
+      ENV['KUBES_APP']
+    end
+
     def env
       ENV['KUBES_ENV'] || "dev"
     end

data/lib/kubes/kubectl/ordering.rb

@@ -13,20 +13,23 @@ class Kubes::Kubectl
         "#{role_i}/#{kind_i}"
       end
 
-      sorted = filter_files(sorted)
+      sorted = filter_skip(sorted)
 
       @name == "delete" ? sorted.reverse : sorted
     end
 
-    def filter_files(sorted)
-      skip = Kubes.config.skip
-      skip += ENV['KUBES_SKIP'].split(' ') if ENV['KUBES_SKIP']
-      return sorted if skip.empty?
+    def filter_skip(sorted)
       sorted.reject do |file|
-        skip.detect { |text| file.include?(text) }
+        config_skip?(file)
       end
     end
 
+    def config_skip?(file)
+      skip = Kubes.config.skip
+      skip += ENV['KUBES_SKIP'].split(' ') if ENV['KUBES_SKIP']
+      !!skip.detect { |pattern| file.include?(pattern) }
+    end
+
     # type: kinds or roles
     # value: Examples: kind: deployment, role: web
     def index_for(type, value)

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.7.8"
+  VERSION = "0.8.1"
 end

data/lib/kubes.rb

@@ -5,6 +5,7 @@ $:.unshift(File.expand_path("../", __FILE__))
 require "kubes/autoloader"
 Kubes::Autoloader.setup
 
+require "active_support"
 require "active_support/core_ext/class"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/string"
@@ -30,3 +31,5 @@ module Kubes
   class MissingDockerImage < Error; end
   extend Core
 end
+
+Kubes::Booter.boot

data/lib/templates/new/hooks/docker.rb

@@ -0,0 +1,9 @@
+# Docs: https://kubes.guru/docs/config/hooks/docker/
+
+before("build",
+  execute: "echo 'docker build before hook'",
+)
+
+after("build",
+  execute: "echo 'docker build after hook'",
+)

data/lib/templates/new/hooks/kubectl.rb

@@ -0,0 +1,11 @@
+# Docs: https://kubes.guru/docs/config/hooks/kubectl/
+
+before("apply",
+  on: "web/deployment",
+  execute: "echo 'before apply hook test'",
+)
+
+after("delete",
+  on: "web/deployment",
+  execute: "echo 'after delete hook test'",
+)

data/lib/templates/new/hooks/kubes.rb

@@ -0,0 +1,9 @@
+# Docs: https://kubes.guru/docs/config/hooks/kubes/
+
+before("apply",
+  execute: "echo 'kubes before apply hook'",
+)
+
+after("apply",
+  execute: "echo 'kubes after apply hook'",
+)

data/lib/templates/yaml/.kubes/resources/base/deployment.yaml.tt

@@ -2,7 +2,9 @@ spec:
   selector:
     matchLabels:
       app: <%= app %>
+      env: <%= Kubes.env %>
   template:
     metadata:
       labels:
         app: <%= app %>
+        env: <%= Kubes.env %>

data/spec/kubes/compiler/decorator/post/deployment_spec.rb

@@ -137,7 +137,7 @@ describe Kubes::Compiler::Decorator::Post do
   end
 
   context "order" do
-    # spec to fix issue TODO: add issue number
+    # spec to fix issue https://github.com/boltops-tools/kubes/issues/49
     describe "name first" do
       let(:data) { fixture("configMap/volumes-name-first") }
       it "run" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2022-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -273,14 +287,17 @@ files:
 - docs/_config.yml
 - docs/_docs/ci/cloudbuild.md
 - docs/_docs/config.md
+- docs/_docs/config/app-overrides.md
 - docs/_docs/config/args.md
 - docs/_docs/config/args/docker.md
 - docs/_docs/config/args/kubectl.md
+- docs/_docs/config/boot.md
 - docs/_docs/config/builder.md
 - docs/_docs/config/docker.md
 - docs/_docs/config/env.md
 - docs/_docs/config/hooks.md
 - docs/_docs/config/hooks/docker.md
+- docs/_docs/config/hooks/generator.md
 - docs/_docs/config/hooks/kubectl.md
 - docs/_docs/config/hooks/kubes.md
 - docs/_docs/config/hooks/ruby.md
@@ -326,11 +343,20 @@ files:
 - docs/_docs/helpers/google/gke.md
 - docs/_docs/helpers/google/secrets.md
 - docs/_docs/helpers/google/service-account.md
+- docs/_docs/install.md
+- docs/_docs/install/dependencies.md
+- docs/_docs/install/gem.md
+- docs/_docs/install/standalone.md
+- docs/_docs/install/standalone/centos.md
+- docs/_docs/install/standalone/details.md
+- docs/_docs/install/standalone/details/permissions.md
+- docs/_docs/install/standalone/details/uninstall.md
+- docs/_docs/install/standalone/macosx.md
+- docs/_docs/install/standalone/ubuntu.md
 - docs/_docs/intro.md
 - docs/_docs/intro/concepts.md
 - docs/_docs/intro/docker-image.md
 - docs/_docs/intro/how-kubes-works.md
-- docs/_docs/intro/install.md
 - docs/_docs/intro/ordering.md
 - docs/_docs/intro/ordering/custom.md
 - docs/_docs/intro/structure.md
@@ -365,6 +391,7 @@ files:
 - docs/_docs/misc/separate-steps.md
 - docs/_docs/next-steps.md
 - docs/_docs/patterns.md
+- docs/_docs/patterns/central-deployer.md
 - docs/_docs/patterns/clock-web-worker.md
 - docs/_docs/patterns/migrations.md
 - docs/_docs/patterns/multiple-envs.md
@@ -384,9 +411,14 @@ files:
 - docs/_docs/vs/helm.md
 - docs/_docs/vs/kustomize.md
 - docs/_docs/yaml.md
+- docs/_docs/yaml/erb-comment.md
 - docs/_docs/yaml/multiple-files.md
 - docs/_docs/yaml/multiple-resources.md
+- docs/_includes/banner/foot.html
+- docs/_includes/banner/head.html
 - docs/_includes/commands.html
+- docs/_includes/config/app-overrides-cheatsheet.md
+- docs/_includes/config/hooks/generator.md
 - docs/_includes/config/hooks/options.md
 - docs/_includes/content.html
 - docs/_includes/dsl/methods.md
@@ -398,8 +430,9 @@ files:
 - docs/_includes/header.html
 - docs/_includes/helpers/base64.md
 - docs/_includes/helpers/generator.md
+- docs/_includes/install/gem.md
+- docs/_includes/install/wrapper.md
 - docs/_includes/intro/features.md
-- docs/_includes/intro/install.md
 - docs/_includes/js.html
 - docs/_includes/kubes-steps.md
 - docs/_includes/layering/layers.md
@@ -413,6 +446,9 @@ files:
 - docs/_includes/reference.md
 - docs/_includes/sidebar.html
 - docs/_includes/variables/generator.md
+- docs/_includes/videos/learn.md
+- docs/_includes/videos/learn/vs.md
+- docs/_includes/videos/youtube.md
 - docs/_includes/vs/article.md
 - docs/_includes/vs/kubes/layering.md
 - docs/_includes/vs/kubes/structure.md
@@ -435,6 +471,7 @@ files:
 - docs/_reference/kubes-logs.md
 - docs/_reference/kubes-new-help.md
 - docs/_reference/kubes-new-helper.md
+- docs/_reference/kubes-new-hook.md
 - docs/_reference/kubes-new-resource.md
 - docs/_reference/kubes-new-variable.md
 - docs/_reference/kubes-new.md
@@ -468,6 +505,7 @@ files:
 - docs/img/logos/kubes-white.png
 - docs/index.html
 - docs/js/app.js
+- docs/js/scripts.js
 - docs/opal/app.rb
 - docs/opal/pager.rb
 - docs/opal/sidebar.rb
@@ -560,6 +598,7 @@ files:
 - lib/kubes/auth/gcr.rb
 - lib/kubes/autoloader.rb
 - lib/kubes/aws_services.rb
+- lib/kubes/booter.rb
 - lib/kubes/cli.rb
 - lib/kubes/cli/apply.rb
 - lib/kubes/cli/base.rb
@@ -578,11 +617,14 @@ files:
 - lib/kubes/cli/help/deploy.md
 - lib/kubes/cli/help/exec.md
 - lib/kubes/cli/help/new/helper.md
+- lib/kubes/cli/help/new/hook.md
 - lib/kubes/cli/help/new/resource.md
+- lib/kubes/cli/help/new/variable.md
 - lib/kubes/cli/init.rb
 - lib/kubes/cli/logs.rb
 - lib/kubes/cli/new.rb
 - lib/kubes/cli/new/helper.rb
+- lib/kubes/cli/new/hook.rb
 - lib/kubes/cli/new/resource.rb
 - lib/kubes/cli/new/variable.rb
 - lib/kubes/cli/prune.rb
@@ -628,6 +670,7 @@ files:
 - lib/kubes/compiler/strategy/base.rb
 - lib/kubes/compiler/strategy/dispatcher.rb
 - lib/kubes/compiler/strategy/erb.rb
+- lib/kubes/compiler/strategy/erb/comment.rb
 - lib/kubes/compiler/strategy/erb/yaml_error.rb
 - lib/kubes/compiler/strategy/pass.rb
 - lib/kubes/compiler/strategy/result.rb
@@ -683,6 +726,9 @@ files:
 - lib/templates/dsl/.kubes/resources/web/deployment/prod.rb
 - lib/templates/dsl/.kubes/resources/web/service.rb
 - lib/templates/new/helper/file.rb
+- lib/templates/new/hooks/docker.rb
+- lib/templates/new/hooks/kubectl.rb
+- lib/templates/new/hooks/kubes.rb
 - lib/templates/new/resource/dsl/backend_config.rb
 - lib/templates/new/resource/dsl/config_map.rb
 - lib/templates/new/resource/dsl/daemon_set.rb
@@ -796,7 +842,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: 'Kubernetes Deployment Tool: build docker image, compile Kubernetes YAML

data/docs/_docs/intro/install.md

@@ -1,6 +0,0 @@
----
-title: Installation
----
-
-{% include intro/install.md %}
-

data/docs/_includes/intro/install.md

@@ -1,19 +0,0 @@
-## RubyGems
-
-Install kubes via RubyGems.
-
-    gem install kubes
-
-Ruby 2.7 and above is recommended.
-
-## kubectl
-
-Kubes calls kubectl. Kubes has been tested with kubectl v1.15+. Generally, it should work with most versions of kubectl.
-
-## docker
-
-Kubes calls docker. Kubes has been tested with docker 18.x-ce+. Generally, it should work with most versions of docker.
-
-## gcloud
-
-If you are using the [gcloud builder](% link _docs/config/builder.md %), set up and configure the [gcloud cli](https://cloud.google.com/sdk/install).