kubes 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c708370f432e482b105a766bd174dd52f89c790256ea91063a8045af1d970f39
-  data.tar.gz: 3b4aef7f7450776cf35b9db54ff7d326a6444e948ab7cf81fac1a7659fca9649
+  metadata.gz: f5e5ce606ff32f7d8083b1c8d6bdff1745700ec971ce7bc0a13a72b5ab370e2a
+  data.tar.gz: 2ff9e9cee9c77e227157ffd701504baf4831b2ed66678db7a7b5248303bc02cb
 SHA512:
-  metadata.gz: f157bfaa51b24e2f23327ab02075abdeb331564c28cdcbe0710eeefb8ba2cd7910ea2719e28e1cdedb3b5b2873be902734c27254089ba5e1bc4083e13d33a10f
-  data.tar.gz: 48594a55badaba62e2ef7cfe436bc32640a5723221278f7d42c307144a00c300ca9a9c07d1501bc9a10204ff629929272171d8a4fc1cfe878b91bc951f46ba96
+  metadata.gz: 5af79490b1ce56d61a08fcbd2d4c05d442d0b965a030c9ef3a95b74b8276a368065b9d3d340344920e2b5a38e77161be904b11755c55a17e351ce04b891f7725
+  data.tar.gz: cd83c382860483bbbb9c3a4d462def4e8551dc80a8453d171918190bcd82f9cdd4bef351cbaa1a8222cd1dd3ad6e53d128d279a23cee03636142104b6b923192

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,7 @@
+Please fill out one of the templates on https://github.com/boltops-tools/kubes/issues/new/choose
+
+If you want to ask a question please do so on sites like StackOverflow.
+
+To be sensitive to everyone's time, we may close issues asking questions without comment. Here are some additional options also https://kubes.guru/support/ 👌
+
+Thank you!

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,84 @@
+---
+name: Reproducible Bug Report
+about: Is something not working as expected?
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+<!--
+Hi! Thanks for considering to file a bug with Kubes. Please take the time to
+answer the basic questions. Please try to be as detailed as possible.
+To be sensitive to everyone's time, if not enough details are provided, the
+issue may be closed without comment. If you repeatedly fail to provide enough
+details, you may be blocked from ever submitting issues to Kubes again.
+Please use your best judgment. 👍
+
+If you are unsure this is a bug in Kubes, please consider asking your question at sites like StackOverflow.
+
+Thanks!
+-->
+
+## Checklist
+
+<!--
+Make sure that you've done all of these.  To mark a checkbox done, replace [ ] with [x]. Or after you create the issue you can click the checkbox.
+-->
+
+- [ ] Upgrade Kubes: Are you using the latest version of Kubes? This allows Kubes to fix issues fast.
+- [ ] Reproducibility: Are you reporting a bug others will be able to reproduce and not asking a question. If you're unsure or want to ask a question, do so on StackOverflow.
+- [ ] Code sample: Have you put together a code sample to reproduce the issue and make it available?  Code samples help speed up fixes dramatically. If it's an easily reproducible issue, then code samples are not needed. If you're unsure, please include a code sample.
+
+## My Environment
+
+<!-- Please fill out the table below with debugging info to help: -->
+
+| Software         | Version |
+| ---------------- | ------- |
+| Operating System |         |
+| Kubes            |         |
+| kubectl          |         |
+| Ruby             |         |
+
+---
+
+## Expected Behaviour
+
+<!--
+What is it you expected to happen? This should be a description of how the functionality you tried to use is supposed to work. Try to keep this to one-paragraph.
+-->
+
+## Current Behavior
+
+<!--
+Describe the details of the bug.  Try to keep this to one-paragraph.
+-->
+
+## Step-by-step reproduction instructions
+
+<!--
+Be sure to include any steps you took for the problem to exist. This is likely the longest part of the report.
+
+Please include any logs you think relevant here. If the logs are long (more than 50 lines) please make a gist of the logs and link to it. https://gist.github.com
+
+With long logs, you can also use the <details> tag to keep the report readable. Example:
+
+<details>
+ <summary>Summary Goes Here</summary>
+
+ ...this is hidden, collapsable content. start with a blank line to get terminal output to format right...
+</details>
+-->
+
+## Code Sample
+
+<!--
+Please provide a code repository, gist, code snippet or sample files to reproduce the issue.
+-->
+
+## Solution Suggestion
+
+<!--
+Please provide possible solutions. If you can't think of anything, feel free to omit. Please be kind and add helpful possible solutions.  For example, "Fix it!" is not a helpful solution suggestion. We are mere mortals. Please be constructive.
+-->

data/.github/ISSUE_TEMPLATE/documentation.md

@@ -0,0 +1,12 @@
+---
+name: Documentation
+about: Found a typo or something that isn't crystal clear in the docs?
+title: ''
+labels: docs
+assignees: ''
+
+---
+
+The Kubes Docs are in the [kubes repo](https://github.com/boltops-tools/kubes/tree/master/docs). Please submit a PR there. Thanks!
+
+For documentation changes to the kubes code base itself, like code comments. Please submit a PR here. Thanks!

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,64 @@
+---
+name: New Feature Suggestion
+about: Want to add a feature to Kubes?
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+<!--
+Hi! Thanks for considering to file a feature request with Kubes. Please take the time to answer the basic questions. Please try to be as detailed as possible.
+
+Thanks!
+-->
+
+## Summary
+
+<!--
+A one-paragraph explanation of the feature.
+-->
+
+## Motivation
+
+<!--
+Why do you want to see this feature in Kubes? What use cases does it support?
+
+How the feature would be relevant to 80% or more of Kubes users.
+-->
+
+## Guide-level explanation
+
+<!--
+Explain the proposal as if it was already included in the project and you were teaching it to another programmer. That generally means:
+
+- Introducing new named concepts.
+- Explaining the feature largely in terms of examples.
+- If applicable, provide sample error messages, deprecation warnings, or upgrade guidance.
+
+If this is a small feature, you may omit this section.
+-->
+
+## Reference-level explanation
+
+<!--
+This is the technical portion of the feature request. Explain the design in sufficient detail that:
+
+- Its interaction with other features is clear.
+- It is reasonably clear how the feature would be implemented.
+- Corner cases are dissected by example.
+
+If you do not know how to answer this, you can omit it. No worries!
+-->
+
+## Drawbacks
+
+<!--
+Why should we *not* do this?
+-->
+
+## Unresolved Questions
+
+<!--
+What related issues do you consider out of scope for this feature that could be addressed in the future independently of the solution that comes out of this feature?
+-->

data/.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,14 @@
+---
+name: Question
+about: Have any questions about how Kubes works?
+title: ''
+labels: 'question'
+assignees: ''
+
+---
+
+The Kubes issue tracker IS NOT for usage questions! Please post your question at sites like StackOverflow.
+
+To be sensitive to everyone's time, we may close issues asking questions without comment. If you repeatedly post questions in the issues tracker, you may be blocked from ever submitting issues to Kubes again. Please use your best judgment. 👍
+
+Here are some additional options also https://kubes.guru/support/ 😁

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,50 @@
+<!--
+Thanks for creating a Pull Request! Before you submit, please make sure you've done the following:
+
+- I read the contributing document at https://kubes.guru/docs/contributing/
+-->
+
+<!--
+Make our lives easier! Choose one of the following by uncommenting it:
+-->
+
+<!-- This is a 🐞 bug fix. -->
+<!-- This is a 🙋‍♂️ feature or enhancement. -->
+<!-- This is a 🧐 documentation change. -->
+
+<!--
+Before you submit this pull request, make sure to have a look at the following checklist. To mark a checkbox done, replace [ ] with [x]. Or after you create the issue you can click the checkbox.
+
+If you don't know how to do some of these, that's fine!  Submit your pull request and we will help you out on the way.
+-->
+
+- [ ] I've added tests (if it's a bug, feature or enhancement)
+- [ ] I've adjusted the documentation (if it's a feature or enhancement)
+- [ ] The test suite passes (run `bundle exec rspec` to verify this)
+
+## Summary
+
+<!--
+Provide a description of what your pull request changes.
+-->
+
+## Context
+
+<!--
+Is this related to any GitHub issue(s) or another relevant link?
+-->
+
+## How to Test
+
+<!--
+Please provide instructions on how to test the fix. This speeds up reviewing the PR. If testing requires a demo Kubes project, please provide an example repo.
+-->
+
+
+## Version Changes
+
+<!--
+Which semantic version change would you recommend?
+If you don't know, feel free to omit it.
+-->
+

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.7.1] - 2020-11-16
+- [#42](https://github.com/boltops-tools/kubes/pull/42) load helpers for dsl properly
+- fix merge layer
+
 ## [0.7.0] - 2020-11-16
 - [#41](https://github.com/boltops-tools/kubes/pull/41) multiple resources yaml support
 

data/docs/_docs/dsl/multiple-resources.md

@@ -4,11 +4,10 @@ title: DSL Multiple Resources
 
 Kubes encourages a structure with files that matches the resource kind. Example:
 
-    .kubes
-    └── resources
-        └── web
-            ├── deployment.rb
-            └── service.rb
+    .kubes/resources
+    └── web
+        ├── deployment.rb
+        └── service.rb
 
 This structure is nicely organized and covers 80% of use cases. An astute user may point out that this struture assumes one resource of each kind.
 
@@ -18,13 +17,12 @@ Next, we'll cover different ways to create multiple resource of the same kinds.
 
 You can create multiple resources of same kind by appending a dash followed by anything. Example:
 
-    .kubes
-    └── resources
-        └── web
-            ├── deployment-1.rb
-            ├── deployment-2.rb
-            ├── service-1.rb
-            └── service-2.rb
+    .kubes/resources
+    └── web
+        ├── deployment-1.rb
+        ├── deployment-2.rb
+        ├── service-1.rb
+        └── service-2.rb
 
 Only words before the dash are used to infer the resource kind.
 
@@ -43,9 +41,8 @@ You can also use a block form to create multiple resources.  The multiple resour
 
 You name the resource files with plural names. An example helps explain:
 
-    .kubes
-    └── resources
-        └── deployments.rb
+    .kubes/resources
+    └── deployments.rb
 
 .kubes/resources/web/deployments.rb
 
@@ -86,8 +83,8 @@ You can declare deployment, service, and other resource kinds multiple times.
 
 Layering works for both simple and block form. Just create a folder with the corresponding name.
 
-* The layering definitions for the prelayers are in singular form.
-* The layering definitions for the post layers are in a folder with plural form.
+* The layering definitions for the pre layers are in singular form.
+* The layering definitions for the post layers are in a folder with plural form, but the overrides are defined in singular form still.
 * Resources in the main "middle" layer are the only ones that are allowed multiple resource definitions.
 
 Simple form layering:

data/docs/_docs/intro/concepts.md

@@ -6,15 +6,14 @@ title: Kubes Concepts
 
 The `.kubes/resources` where you organized Kubernetes resources. Different subfolders within the resources folder represent your app. Example:
 
-    .kubes
-    └── resources
-        ├── clock
-        │   └── deployment.yaml
-        ├── worker
-        │   └── deployment.yaml
-        └── web
-            ├── deployment.yaml
-            └── service.yaml
+    .kubes/resources
+    ├── clock
+    │   └── deployment.yaml
+    ├── worker
+    │   └── deployment.yaml
+    └── web
+        ├── deployment.yaml
+        └── service.yaml
 
 Each folder contains your Kubernetes deployment definition, either in [YAML]({% link _docs/yaml.md %}) or [DSL]({% link _docs/dsl.md %}) form. Both can be used together.
 

data/docs/_docs/intro/ordering.md

@@ -37,16 +37,15 @@ Kubes will delete in the reverse order.
 
 Resources in the `shared` folder will be applied first.  Example:
 
-    .kubes
-    └── resources
-        ├── clock
-        │   └── deployment.yaml
-        ├── web
-        │   ├── deployment.yaml
-        │   └── service.yaml
-        └── shared
-            ├── config_map.yaml
-            └── secret.yaml
+    .kubes/resources
+    ├── clock
+    │   └── deployment.yaml
+    ├── web
+    │   ├── deployment.yaml
+    │   └── service.yaml
+    └── shared
+        ├── config_map.yaml
+        └── secret.yaml
 
 Results in:
 

data/docs/_docs/resources/role.md

@@ -8,15 +8,14 @@ Role-based resources are your main project's resources.  Kubes groups resources
 
 Here's an example structure to help explain how role-based resources work.
 
-    .kubes
-    └── resources
-        ├── clock
-        │   └── deployment.yaml
-        ├── web
-        │   ├── deployment.yaml
-        │   └── service.yaml
-        └── worker
-            └── deployment.yaml
+    .kubes/resources
+    ├── clock
+    │   └── deployment.yaml
+    ├── web
+    │   ├── deployment.yaml
+    │   └── service.yaml
+    └── worker
+        └── deployment.yaml
 
 ## Resource Roles
 

data/docs/_docs/yaml.md

@@ -4,11 +4,10 @@ title: Kubes YAML
 
 You can write your Kubernetes resources in YAML format.
 
-    .kubes
-    └── resources
-        └── web
-            ├── deployment.yaml
-            └── service.yaml
+    .kubes/resources
+    └── web
+        ├── deployment.yaml
+        └── service.yaml
 
 ## YAML and Templating
 

data/docs/_docs/yaml/multiple-files.md

@@ -4,13 +4,12 @@ title: YAML Multiple Resources with Multiple Files
 
 You can also create multiple resources of same kind by appending a dash followed by anything. Example:
 
-    .kubes
-    └── resources
-        └── web
-            ├── deployment-1.yaml
-            ├── deployment-2.yaml
-            ├── service-1.yaml
-            └── service-2.yaml
+    .kubes/resources
+    └── web
+        ├── deployment-1.yaml
+        ├── deployment-2.yaml
+        ├── service-1.yaml
+        └── service-2.yaml
 
 Only words before the dash are used to infer the resource kind.
 

data/docs/_docs/yaml/multiple-resources.md

@@ -4,11 +4,10 @@ title: YAML Multiple Resources
 
 Kubes encourages a structure with files that matches the resource kind. Example:
 
-    .kubes
-    └── resources
-        └── web
-            ├── deployment.yaml
-            └── service.yaml
+    .kubes/resources
+    └── web
+        ├── deployment.yaml
+        └── service.yaml
 
 This structure is nicely organized and covers 80% of use cases. An astute user may point out that this struture assumes one resource of each kind.
 
@@ -18,8 +17,8 @@ Next, we'll cover how to create multiple resource of the same kinds.
 
 You can simply define multiple resources in th same YAML file. Conventionally, you should name the resource files with plural names. An example helps explain:
 
-    .kubes
-    └── resources
+    .kubes/resources
+    └── web
         └── deployments.yaml
 
 .kubes/resources/web/deployments.yaml
@@ -72,19 +71,19 @@ Layering works just fine with multiple resource definitions. The layering is pro
 Notes:
 
 * The layering definitions for the pre layers must be in singular form.
-* The layering definitions for the post layers must be in a folder with plural form, but define a singlar resource override.
+* The layering definitions for the post layers must be in a folder with plural form, but define a singular resource override.
 * Resources in the main "middle" layer is the only one that allows for multiple resource definitions.
 
 Multiple resources layering structure.
 
     .kubes/resources/
     ├── base
-    │   ├── all.rb
+    │   ├── all.rb         # SINGULAR
     │   └── deployment.rb  # SINGULAR
     └── web
         ├── deployments    # PLURAL
-        │   ├── dev.rb
-        │   └── prod.rb
+        │   ├── dev.rb     # SINGULAR
+        │   └── prod.rb    # SINGULAR
         └── deployments.rb # PLURAL
 
 The main difference is the pluralized filenames.

data/docs/_includes/commands.html

@@ -30,15 +30,14 @@ kubes delete -y
               <h3>Structure</h3>
               <div class="commands">
 {% highlight sh %}
-.kubes
-└── resources
-    ├── clock
-    │   └── deployment.yaml
-    ├── worker
-    │   └── deployment.yaml
-    └── web
-        ├── deployment.yaml
-        └── service.yaml
+.kubes/resources
+├── clock
+│   └── deployment.yaml
+├── worker
+│   └── deployment.yaml
+└── web
+    ├── deployment.yaml
+    └── service.yaml
 {% endhighlight %}
               </div>
             </div>

data/docs/_includes/vs/kubes/structure.md

@@ -2,19 +2,18 @@
 
 On the other hand, Kubes defines a conventional project structure. Here's a project directory example:
 
-    .kubes
-    └── resources
-        ├── base
-        │   ├── all.yaml
-        │   └── deployment.yaml
-        ├── shared
-        │   └── namespace.yaml
-        └── web
-            ├── deployment
-            │   ├── dev.yaml
-            │   └── prod.yaml
-            ├── deployment.yaml
-            └── service.yaml
+    .kubes/resources
+    ├── base
+    │   ├── all.yaml
+    │   └── deployment.yaml
+    ├── shared
+    │   └── namespace.yaml
+    └── web
+        ├── deployment
+        │   ├── dev.yaml
+        │   └── prod.yaml
+        ├── deployment.yaml
+        └── service.yaml
 
 A Kubes project structure also supports introduces a role concept or folder. The folder structure only shows a web role for simplicity. You can always add more roles.  For example:
 

data/lib/kubes/compiler/dsl/core/base.rb

@@ -3,17 +3,13 @@ module Kubes::Compiler::Dsl::Core
     extend Fields
     include DslEvaluator
     include Helpers
-    include Kubes::Compiler::Shared::CustomHelpers
-    include Kubes::Compiler::Shared::CustomVariables
-    include Kubes::Compiler::Shared::PluginHelpers
+    include Kubes::Compiler::Shared::RuntimeHelpers
 
     def initialize(options={})
       @options = options
       @name = options[:name]
       @path = options[:path]
-      load_plugin_helpers
-      load_custom_variables
-      load_custom_helpers
+      load_runtime_helpers
     end
 
     def run

data/lib/kubes/compiler/dsl/syntax/resource.rb

@@ -1,7 +1,6 @@
 module Kubes::Compiler::Dsl::Syntax
   class Resource < Kubes::Compiler::Dsl::Core::Base
     include Kubes::Compiler::Util::Normalize
-    include Kubes::Compiler::Shared::Helpers
 
     fields :apiVersion,  # <string>
            :kind,        # <string>

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

@@ -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/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Tung Nguyen
@@ -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
@@ -609,11 +615,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

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