kubes 0.7.0 → 0.7.5

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

@@ -4,8 +4,8 @@ class Kubes::Compiler::Strategy
       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)
+        hash = Kubes.deep_merge!(pre_layer, main)
+        Kubes.deep_merge!(hash, post_layer)
       end
       Result.new(@save_file, data)
     end
@@ -52,7 +52,8 @@ class Kubes::Compiler::Strategy
 
     def merge_layers(layers)
       layers.inject({}) do |hash, layer|
-        render(layer)
+        data = render(layer)
+        hash.deep_merge!(data)
       end
     end
   end

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

@@ -5,18 +5,13 @@ 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)

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/core.rb

@@ -34,5 +34,11 @@ module Kubes
       logger.error "ERROR: It doesnt look like this is a kubes project. Are you sure you are in a kubes project?".color(:red)
       ENV['TS_TEST'] ? raise : exit(1)
     end
+
+    # wrapper to ensure we use the same deeper_merge options everywhere
+    def deep_merge!(a, b)
+      a.deeper_merge!(b, overwrite_arrays: true)
+      a
+    end
   end
 end

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.7.0"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2021-06-03 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
@@ -466,6 +472,11 @@ files:
 - docs/opal/sidebar.rb
 - docs/opal/sidebar/expander.rb
 - docs/reference.md
+- docs/search/data.json
+- docs/search/index.html
+- docs/search/lunr.js
+- docs/search/search.js
+- docs/search/tips.md
 - docs/support.md
 - docs/vendor/bootstrap/css/bootstrap-grid.css
 - docs/vendor/bootstrap/css/bootstrap-grid.css.map
@@ -609,11 +620,9 @@ 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/dispatcher.rb
@@ -782,7 +791,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: 'Kubernetes Deployment Tool: build docker image, compile Kubernetes YAML

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

@@ -1,17 +0,0 @@
-module Kubes::Compiler::Shared
-  module CustomHelpers
-    # Load custom helper methods from project
-    @@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
-        self.class.send :include, module_name.constantize
-      end
-      @@custom_helpers_loaded = true
-    end
-  end
-end

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

@@ -1,38 +0,0 @@
-module Kubes::Compiler::Shared
-  module CustomVariables
-    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/shared/plugin_helpers.rb

@@ -1,14 +0,0 @@
-module Kubes::Compiler::Shared
-  module PluginHelpers
-    # 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
-        self.class.send :include, helpers_class
-      end
-      @@plugin_helpers_loaded = true
-    end
-  end
-end