kubes 0.6.7 → 0.7.3

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

@@ -0,0 +1,78 @@
+module Kubes::Compiler::Shared
+  module RuntimeHelpers
+    include Kubes::Compiler::Shared::Helpers
+
+    def load_runtime_helpers
+      load_custom_variables # also load custom variables
+      load_plugin_helpers
+      load_custom_helpers
+    end
+
+    @@custom_helpers_loaded = false
+    def load_custom_helpers
+      return if @@custom_helpers_loaded
+      paths = Dir.glob("#{Kubes.root}/.kubes/helpers/**/*.rb")
+      paths.sort_by! { |p| p.size } # so namespaces are loaded first
+
+      paths.each do |path|
+        filename = path.sub(%r{.*.kubes/helpers/},'').sub('.rb','')
+        module_name = filename.camelize
+        base_class_for_helper.send :include, module_name.constantize
+      end
+      @@custom_helpers_loaded = true
+    end
+
+    # Load plugin helper methods from project
+    @@plugin_helpers_loaded = false
+    def load_plugin_helpers
+      return if @@plugin_helpers_loaded
+      Kubes::Plugin.plugins.each do |klass|
+        helpers_class = "#{klass}::Helpers".constantize # IE: KubesAws::Helpers
+        base_class_for_helper.send :include, helpers_class
+      end
+      @@plugin_helpers_loaded = true
+    end
+
+    def base_class_for_helper
+      if self.is_a?(Kubes::Compiler::Strategy::Erb)
+        Kubes::Compiler::Strategy::Erb
+      else
+        Kubes::Compiler::Dsl::Core::Base
+      end
+    end
+
+    include DslEvaluator
+    # Load custom variables from project
+    @@custom_variables_loaded = false
+    def load_custom_variables
+      return if Kubes.kustomize?
+
+      ext = File.extname(@path)
+      role = @path.sub(%r{.*\.kubes/resources/},'').sub(ext,'').split('/').first # IE: web
+      kind = File.basename(@path).sub(ext,'') # IE: deployment
+      all = "all"
+      if @block_form
+        kind = kind.pluralize
+        all = all.pluralize
+      end
+
+      layers = [
+        "base.rb",
+        "#{Kubes.env}.rb",
+        "base/all.rb",
+        "base/all/#{Kubes.env}.rb",
+        "base/#{kind}.rb",
+        "base/#{kind}/base.rb",
+        "base/#{kind}/#{Kubes.env}.rb",
+        "#{role}/#{kind}.rb",
+        "#{role}/#{kind}/base.rb",
+        "#{role}/#{kind}/#{Kubes.env}.rb",
+      ]
+
+      layers.each do |layer|
+        path = "#{Kubes.root}/.kubes/variables/#{layer}"
+        evaluate_file(path)
+      end
+    end
+  end
+end

data/lib/kubes/compiler/strategy.rb

@@ -6,23 +6,9 @@ class Kubes::Compiler
     end
 
     def compile
-      klass = strategy_class
-      return false unless klass
-
-      strategy = klass.new(@options.merge(path: @path)) # Dsl or Erb
-      result = strategy.run
+      result = Dispatcher.new(@options.merge(path: @path)).dispatch
       result.decorate!(:pre) # compile pre phase decoration
       result
     end
-
-    def strategy_class
-      ext = File.extname(@path).sub('.','').to_sym
-      map = {
-        rb: Dsl,
-        yaml: Erb,
-        yml: Erb,
-      }
-      map[ext]
-    end
   end
 end

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

@@ -9,62 +9,6 @@ class Kubes::Compiler::Strategy
       @options = options
       @path = options[:path]
       @save_file = save_file(@path)
-      @data = @options[:data] || {}
-    end
-
-    def run
-      render_files(pre_layers)
-      render(@path) # main resource definition
-      render_files(post_layers)
-
-      Result.new(@save_file, @data)
-    end
-
-    def render_files(paths)
-      paths.each do |path|
-        next unless File.exist?(path) # layers may not exist
-        render(path)
-      end
-    end
-
-    # render and merge
-    def render(path)
-      result = render_strategy(path)
-      if result.is_a?(Kubes::Compiler::Dsl::Core::Blocks)
-        result = result.results
-      end
-      @data.deeper_merge!(result)
-    end
-
-    # Delegate to Dsl or Erb strategy again and pass @data down to allow rendering of a mix of yaml and rb files.
-    def render_strategy(path)
-      if path.include?('.rb')
-        dsl_class.new(@options.merge(path: path, data: @data)).run
-      else
-        Erb.new(@options.merge(data: @data)).render_result(path)
-      end
-    end
-
-    # Must be defined here in case coming from Kubes::Compiler::Strategy::Erb#render_strategy
-    def dsl_class
-      if block_form?
-        Kubes::Compiler::Dsl::Core::Blocks
-      else
-        syntax_class
-      end
-    end
-
-    def syntax_class
-      klass_name = normalize_kind(@save_file) # IE: @save_file: web/service.yaml
-      "Kubes::Compiler::Dsl::Syntax::#{klass_name}".constantize
-    rescue NameError
-      logger.debug "Using default resource for: #{klass_name}"
-      Kubes::Compiler::Dsl::Syntax::Resource # default
-    end
-
-    def block_form?
-      type = extract_type(@save_file)
-      type.pluralize == type
     end
   end
 end

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

@@ -0,0 +1,60 @@
+class Kubes::Compiler::Strategy
+  class Dispatcher < Base
+    def dispatch
+      result = render(@path) # main
+      results = [result].flatten # ensure array
+      data = results.map! do |main|
+        hash = pre_layer.deeper_merge!(main) # need the ! or deep_merge returns original hash
+        hash.deeper_merge!(post_layer)
+      end
+      Result.new(@save_file, data)
+    end
+
+    # Render via to Erb or one of the DSL syntax classes or Core/Blocks class
+    def render(path)
+      if path.include?('.rb')
+        klass = dsl_class(path) # IE: Kubes::Compiler::Dsl::Syntax::Deployment or Kubes::Compiler::Dsl::Core::Blocks
+        klass.new(@options.merge(path: path, data: @data)).run
+      else
+        Erb.new(@options.merge(data: @data)).render_result(path)
+      end
+    end
+
+    # Must be defined here in case coming from Kubes::Compiler::Strategy::Erb#render
+    def dsl_class(path)
+      if block_form?(path)
+        Kubes::Compiler::Dsl::Core::Blocks
+      else
+        syntax_class
+      end
+    end
+
+    def syntax_class
+      klass_name = normalize_kind(@save_file) # IE: @save_file: web/service.yaml
+      "Kubes::Compiler::Dsl::Syntax::#{klass_name}".constantize
+    rescue NameError
+      logger.debug "Using default resource for: #{klass_name}"
+      Kubes::Compiler::Dsl::Syntax::Resource # default
+    end
+
+    def block_form?(path)
+      type = extract_type(path)
+      type.pluralize == type
+    end
+
+    def pre_layer
+      merge_layers(pre_layers)
+    end
+
+    def post_layer
+      merge_layers(post_layers)
+    end
+
+    def merge_layers(layers)
+      layers.inject({}) do |hash, layer|
+        data = render(layer)
+        hash.deep_merge!(data)
+      end
+    end
+  end
+end

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

@@ -5,28 +5,22 @@ class Kubes::Compiler::Strategy
     extend Kubes::Compiler::Dsl::Core::Fields
     include Kubes::Compiler::Dsl::Core::Helpers
     include Kubes::Compiler::Layering
-    include Kubes::Compiler::Shared::CustomHelpers
-    include Kubes::Compiler::Shared::CustomVariables
-    include Kubes::Compiler::Shared::Helpers
-    include Kubes::Compiler::Shared::PluginHelpers
+    include Kubes::Compiler::Shared::RuntimeHelpers
 
     def initialize(options={})
       super
       # For ERB scope is in this same Strategy::Erb class
       # For DSL scope is within the each for the Resource classes. IE: kubes/compile/dsl/core/base.rb
-      load_plugin_helpers
-      load_custom_variables
-      load_custom_helpers
+      load_runtime_helpers
     end
 
     def render_result(path)
-      if File.exist?(path)
-        yaml = RenderMePretty.result(path, context: self)
-        result = yaml_load(path, yaml)
-        result.is_a?(Hash) ? result : {} # in case of blank yaml doc a Boolean false is returned
-      else
-        {}
-      end
+      return unless File.exist?(path)
+
+      yaml = RenderMePretty.result(path, context: self)
+      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 : {}
     end
 
     def yaml_load(path, yaml)

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

@@ -14,11 +14,15 @@ class Kubes::Compiler::Strategy
     # decorate(:pre) or decorate(:post)
     def decorate!(phase)
       klass = "Kubes::Compiler::Decorator::#{phase.to_s.camelize}".constantize
-      @data = klass.new(@data).result
+      results = [@data].flatten
+      results.map! do |r|
+        klass.new(r).result
+      end
     end
 
     def content
-      yaml_dump(@data)
+      result = @data.size == 1 ? @data.first : @data
+      yaml_dump(result)
     end
   end
 end

data/lib/kubes/compiler/util/normalize.rb

@@ -1,12 +1,12 @@
 module Kubes::Compiler::Util
   module Normalize
     def normalize_kind(path)
-      info = path.sub(%r{.*/.kubes/resources/}, '')
-      extract_type(info).underscore.camelize # Deployment, Service, Ingress, ManagedCertificate, etc
+      extract_type(path).underscore.camelize # Deployment, Service, Ingress, ManagedCertificate, etc
     end
 
     # info: web/service.yaml
     def extract_type(info)
+      info = info.sub(%r{.*/.kubes/resources/}, '')
       _, kind = info.split('/')
       kind.sub('.yaml','').sub('.yml','').sub('.rb','').sub(/-.*/,'')
     end

data/lib/kubes/compiler/util/yaml_dump.rb

@@ -4,12 +4,15 @@ require "yaml"
 module Kubes::Compiler::Util
   module YamlDump
     def yaml_dump(data)
-      if data.key?("kind")  # single resource in YAML
+      case data
+      when Array
+        items = data.map do |i|
+          standardize_yaml(i)
+        end
+        items.map(&:to_yaml).join("")
+      else # single resource in YAML
         data = standardize_yaml(data)
         data.to_yaml
-      else
-        items = data.map { |k,v| standardize_yaml(v) }
-        items.map(&:to_yaml).join("")
       end
     end
 

data/lib/kubes/config.rb

@@ -39,7 +39,7 @@ module Kubes
       config.skip = []
 
       config.state = ActiveSupport::OrderedOptions.new
-      config.state.docker_image_path = "#{Kubes.root}/.kubes/state/docker_image.txt"
+      config.state.path = "#{Kubes.root}/.kubes/state/#{Kubes.env}/data.json"
 
       config.suffix_hash = true # append suffix hash to ConfigMap and Secret
 

data/lib/kubes/docker/strategy/image_name.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module Kubes::Docker::Strategy
   module ImageName
     extend Memoist
@@ -13,12 +15,13 @@ module Kubes::Docker::Strategy
     # Only when a new docker build command gets run will the image name state be updated.
     def store_image_name
       FileUtils.mkdir_p(File.dirname(image_state_path))
-      IO.write(image_state_path, @@image_name)
+      text = JSON.pretty_generate(image: @@image_name)
+      IO.write(image_state_path, text)
     end
 
     # output can get entirely wiped so dont use that folder
     def image_state_path
-      Kubes.config.state.docker_image_path
+      Kubes.config.state.path
     end
 
     # full_image - Includes the tag. Examples:
@@ -33,7 +36,8 @@ module Kubes::Docker::Strategy
         logger.error "ERROR: Unable to find #{image_state_path} which contains the last docker image name built with kubes build.  Please run `kubes docker build` first."
         exit 1
       end
-      IO.read(image_state_path).strip
+      data = JSON.load(IO.read(image_state_path))
+      data['image']
     end
 
     @@timestamp = Time.now.strftime('%Y-%m-%dT%H-%M-%S')

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.6.7"
+  VERSION = "0.7.3"
 end

data/lib/templates/new/resource/dsl/endpoint.rb

@@ -0,0 +1,3 @@
+name "<%= app %>"
+addresses(["1.1.1.1"])
+ports(["80"])

data/lib/templates/new/resource/yaml/endpoint.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Endpoints
+metadata:
+  name: <%= app %>
+subsets:
+  - addresses:
+      - ip: 192.0.2.42
+    ports:
+      - port: 9376

data/spec/kubes/compiler/strategy/{dsl_spec.rb → dispatcher_spec.rb}

@@ -1,12 +1,13 @@
-describe Kubes::Compiler::Strategy::Dsl do
-  let(:dsl) { described_class.new(options) }
-  let(:options) { {path: fixture(resource) } }
+describe Kubes::Compiler::Strategy::Dispatcher do
+  let(:dispatcher) { described_class.new(options) }
+  let(:options) { {path: path } }
+  let(:path) { fixture(resource) }
 
   context "standard" do
     let(:resource) { "project/.kubes/resources/web/deployment" }
     it "run" do
-      result = dsl.run
-      expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
+      result = dispatcher.dispatch
+      expect(dispatcher.dsl_class(path)).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
       data = YAML.load(result.content)
       expect(data['kind']).to eq "Deployment"
     end
@@ -15,8 +16,8 @@ describe Kubes::Compiler::Strategy::Dsl do
   context "blocks" do
     let(:resource) { "blocks/deployments" }
     it "run" do
-      result = dsl.run
-      expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Core::Blocks)
+      result = dispatcher.dispatch
+      expect(dispatcher.dsl_class(path)).to eq(Kubes::Compiler::Dsl::Core::Blocks)
       resource = result.content.split('---').last
       data = YAML.load(resource)
       expect(data['kind']).to eq "Deployment"
@@ -27,8 +28,8 @@ describe Kubes::Compiler::Strategy::Dsl do
   context "multiple files" do
     let(:resource) { "multiple-files/.kubes/resources/web/deployment-1" }
     it "run" do
-      result = dsl.run
-      expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
+      result = dispatcher.dispatch
+      expect(dispatcher.dsl_class(path)).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
       data = YAML.load(result.content)
       expect(data['kind']).to eq "Deployment"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -244,6 +244,12 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".gcloudignore"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/documentation.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/ISSUE_TEMPLATE/question.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -377,6 +383,8 @@ files:
 - docs/_docs/vs/helm.md
 - docs/_docs/vs/kustomize.md
 - docs/_docs/yaml.md
+- docs/_docs/yaml/multiple-files.md
+- docs/_docs/yaml/multiple-resources.md
 - docs/_includes/commands.html
 - docs/_includes/config/hooks/options.md
 - docs/_includes/content.html
@@ -593,6 +601,7 @@ files:
 - lib/kubes/compiler/dsl/syntax/config_map.rb
 - lib/kubes/compiler/dsl/syntax/daemon_set.rb
 - lib/kubes/compiler/dsl/syntax/deployment.rb
+- lib/kubes/compiler/dsl/syntax/endpoint.rb
 - lib/kubes/compiler/dsl/syntax/ingress.rb
 - lib/kubes/compiler/dsl/syntax/job.rb
 - lib/kubes/compiler/dsl/syntax/managed_certificate.rb
@@ -606,14 +615,12 @@ files:
 - lib/kubes/compiler/dsl/syntax/service.rb
 - lib/kubes/compiler/dsl/syntax/service_account.rb
 - lib/kubes/compiler/layering.rb
-- lib/kubes/compiler/shared/custom_helpers.rb
-- lib/kubes/compiler/shared/custom_variables.rb
 - lib/kubes/compiler/shared/helpers.rb
 - lib/kubes/compiler/shared/helpers/deprecated.rb
-- lib/kubes/compiler/shared/plugin_helpers.rb
+- lib/kubes/compiler/shared/runtime_helpers.rb
 - lib/kubes/compiler/strategy.rb
 - lib/kubes/compiler/strategy/base.rb
-- lib/kubes/compiler/strategy/dsl.rb
+- lib/kubes/compiler/strategy/dispatcher.rb
 - lib/kubes/compiler/strategy/erb.rb
 - lib/kubes/compiler/strategy/erb/yaml_error.rb
 - lib/kubes/compiler/strategy/pass.rb
@@ -674,6 +681,7 @@ files:
 - lib/templates/new/resource/dsl/config_map.rb
 - lib/templates/new/resource/dsl/daemon_set.rb
 - lib/templates/new/resource/dsl/deployment.rb
+- lib/templates/new/resource/dsl/endpoint.rb
 - lib/templates/new/resource/dsl/ingress.rb
 - lib/templates/new/resource/dsl/job.rb
 - lib/templates/new/resource/dsl/managed_certificate.rb
@@ -689,6 +697,7 @@ files:
 - lib/templates/new/resource/yaml/config_map.yaml
 - lib/templates/new/resource/yaml/daemon_set.yaml
 - lib/templates/new/resource/yaml/deployment.yaml
+- lib/templates/new/resource/yaml/endpoint.yaml
 - lib/templates/new/resource/yaml/ingress.yaml
 - lib/templates/new/resource/yaml/job.yaml
 - lib/templates/new/resource/yaml/managed_certificate.yaml
@@ -748,7 +757,7 @@ files:
 - spec/kubes/cli/prune_spec.rb
 - spec/kubes/compiler/decorator/post/deployment_spec.rb
 - spec/kubes/compiler/decorator/post/pod_spec.rb
-- spec/kubes/compiler/strategy/dsl_spec.rb
+- spec/kubes/compiler/strategy/dispatcher_spec.rb
 - spec/kubes/compiler_spec.rb
 - spec/kubes/dsl/daemon_set.rb
 - spec/kubes/dsl/deployment_spec.rb
@@ -823,7 +832,7 @@ test_files:
 - spec/kubes/cli/prune_spec.rb
 - spec/kubes/compiler/decorator/post/deployment_spec.rb
 - spec/kubes/compiler/decorator/post/pod_spec.rb
-- spec/kubes/compiler/strategy/dsl_spec.rb
+- spec/kubes/compiler/strategy/dispatcher_spec.rb
 - spec/kubes/compiler_spec.rb
 - spec/kubes/dsl/daemon_set.rb
 - spec/kubes/dsl/deployment_spec.rb