kubes 0.5.1 → 0.6.0

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

@@ -1,33 +1,4 @@
 class Kubes::Compiler::Strategy
   class Dsl < Base
-    include Kubes::Compiler::Util::Normalize
-
-    def run
-      load_custom_helpers
-      dsl = dsl_class.new(@options) # Deployment, Service, etc
-      data = dsl.run
-      Result.new(@save_file, data)
-    end
-
-    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)
-      "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/erb.rb

@@ -4,31 +4,19 @@ class Kubes::Compiler::Strategy
   class Erb < Base
     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::Layering
-
-    def run
+    include Kubes::Compiler::Shared::PluginHelpers
+
+    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
-      @data = {}
-
-      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|
-        render(path)
-      end
-    end
-
-    # render and merge
-    def render(path)
-      result = render_result(path)
-      @data.deeper_merge!(result)
     end
 
     def render_result(path)

data/lib/kubes/compiler/strategy.rb

@@ -16,12 +16,13 @@ class Kubes::Compiler
     end
 
     def strategy_class
-      ext = File.extname(@path)
-      case ext
-      when '.rb'   then Dsl
-      when '.yaml','.yml' then Erb
-      else Pass
-      end
+      ext = File.extname(@path).sub('.','').to_sym
+      map = {
+        rb: Dsl,
+        yaml: Erb,
+        yml: Erb,
+      }
+      map[ext]
     end
   end
 end

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

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

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

@@ -4,12 +4,12 @@ require "yaml"
 module Kubes::Compiler::Util
   module YamlDump
     def yaml_dump(data)
-      if data.is_a?(Kubes::Compiler::Dsl::Core::Blocks)
-        items = data.results.map { |k,v| standardize_yaml(v) }
-        items.map(&:to_yaml).join("")
-      else
+      if data.key?("kind")  # 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/plugin.rb

@@ -0,0 +1,14 @@
+module Kubes
+  module Plugin
+    @@plugins = []
+    def plugins
+      @@plugins
+    end
+
+    def register(klass)
+      @@plugins << klass
+    end
+
+    extend self
+  end
+end

data/lib/kubes/util/sh.rb

@@ -32,7 +32,7 @@ module Kubes::Util
 
     def sh_capture(command, options={})
       exit_on_fail = options[:exit_on_fail].nil? ? true : options[:exit_on_fail]
-      logger.info "=> #{command}" if options[:show_command]
+      logger.debug "=> #{command}"
       out = `#{command}`.strip
       unless $?.success?
         logger.error "ERROR: running #{command}".color(:red)

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/kubes.rb

@@ -1,6 +1,10 @@
 $stdout.sync = true unless ENV["KUBES_STDOUT_SYNC"] == "0"
 
 $:.unshift(File.expand_path("../", __FILE__))
+
+require "kubes/autoloader"
+Kubes::Autoloader.setup
+
 require "active_support/core_ext/class"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/string"
@@ -20,9 +24,6 @@ require "kubes_google"
 
 DslEvaluator.backtrace_reject = "lib/kubes"
 
-require "kubes/autoloader"
-Kubes::Autoloader.setup
-
 module Kubes
   class Error < StandardError; end
   class MissingDockerImage < Error; end

data/lib/templates/new/helper/file.rb

@@ -0,0 +1,2 @@
+module <%= underscored_name.camelize %>
+end

data/lib/templates/new/variable/file.rb

@@ -0,0 +1 @@
+@example = "<%= Kubes.env %>-value"

data/spec/fixtures/project/.kubes/resources/{service.rb → web/service.rb}

@@ -1,3 +1,3 @@
 name "demo-web"
 port 80
-target_port 3000
+targetPort 3000

data/spec/kubes/compiler/strategy/dsl_spec.rb

@@ -3,7 +3,7 @@ describe Kubes::Compiler::Strategy::Dsl do
   let(:options) { {path: fixture(resource) } }
 
   context "standard" do
-    let(:resource) { "project/.kubes/resources/deployment" }
+    let(:resource) { "project/.kubes/resources/web/deployment" }
     it "run" do
       result = dsl.run
       expect(dsl.dsl_class).to eq(Kubes::Compiler::Dsl::Syntax::Deployment)
@@ -25,7 +25,7 @@ describe Kubes::Compiler::Strategy::Dsl do
   end
 
   context "multiple files" do
-    let(:resource) { "multiple-files/deployment-1" }
+    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)

data/spec/kubes/compiler_spec.rb

@@ -4,7 +4,7 @@ describe Kubes::Compiler do
     allow(compiler).to receive(:write_full)
     compiler
   end
-  let(:options) { {path: "spec/fixtures/project/.kubes/deployment.rb" } }
+  let(:options) { {path: "spec/fixtures/project/.kubes/resources/web/deployment.rb" } }
 
   describe "compiler" do
     it "run" do

data/spec/kubes/dsl/network_policy_spec.rb

@@ -1,6 +1,6 @@
 describe Kubes::Compiler::Dsl::Syntax::NetworkPolicy do
   let(:evaluator) { described_class.new(options) }
-  let(:options) { {path: fixture("syntax/network_policy") } }
+  let(:options) { {path: fixture("syntax/.kubes/resources/web/network_policy") } }
 
   context "network_policy" do
     it "run" do

data/spec/kubes/dsl/pod_spec.rb

@@ -1,6 +1,6 @@
 describe Kubes::Compiler::Dsl::Syntax::Pod do
   let(:evaluator) { described_class.new(options) }
-  let(:options) { {path: fixture("syntax/pod") } }
+  let(:options) { {path: fixture("syntax/.kubes/resources/web/pod") } }
 
   context "pod" do
     it "run" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -302,11 +302,16 @@ files:
 - docs/_docs/generators.md
 - docs/_docs/helpers.md
 - docs/_docs/helpers/aws.md
+- docs/_docs/helpers/aws/advanced.md
+- docs/_docs/helpers/aws/advanced/secrets.md
+- docs/_docs/helpers/aws/advanced/ssm.md
 - docs/_docs/helpers/aws/iam-role.md
 - docs/_docs/helpers/aws/secrets.md
 - docs/_docs/helpers/aws/ssm.md
 - docs/_docs/helpers/custom.md
 - docs/_docs/helpers/google.md
+- docs/_docs/helpers/google/advanced.md
+- docs/_docs/helpers/google/advanced/secrets.md
 - docs/_docs/helpers/google/secrets.md
 - docs/_docs/helpers/google/service-account.md
 - docs/_docs/intro.md
@@ -320,6 +325,7 @@ files:
 - docs/_docs/layering.md
 - docs/_docs/layering/dsl.md
 - docs/_docs/layering/merge.md
+- docs/_docs/layering/mix.md
 - docs/_docs/layering/yaml.md
 - docs/_docs/learn/dsl.md
 - docs/_docs/learn/dsl/change.md
@@ -348,11 +354,19 @@ files:
 - docs/_docs/patterns.md
 - docs/_docs/patterns/clock-web-worker.md
 - docs/_docs/patterns/migrations.md
+- docs/_docs/patterns/multiple-envs.md
 - docs/_docs/patterns/secrets.md
 - docs/_docs/resources.md
 - docs/_docs/resources/base.md
 - docs/_docs/resources/role.md
 - docs/_docs/resources/shared.md
+- docs/_docs/variables.md
+- docs/_docs/variables/advanced.md
+- docs/_docs/variables/basic.md
+- docs/_docs/vs.md
+- docs/_docs/vs/custom.md
+- docs/_docs/vs/helm.md
+- docs/_docs/vs/kustomize.md
 - docs/_docs/yaml.md
 - docs/_includes/commands.html
 - docs/_includes/config/hooks/options.md
@@ -365,6 +379,7 @@ files:
 - docs/_includes/google_analytics.html
 - docs/_includes/header.html
 - docs/_includes/helpers/base64.md
+- docs/_includes/intro/features.md
 - docs/_includes/intro/install.md
 - docs/_includes/js.html
 - docs/_includes/kubes-steps.md
@@ -377,6 +392,9 @@ files:
 - docs/_includes/learn/start.md
 - docs/_includes/reference.md
 - docs/_includes/sidebar.html
+- docs/_includes/vs/article.md
+- docs/_includes/vs/kubes/layering.md
+- docs/_includes/vs/kubes/structure.md
 - docs/_layouts/default.html
 - docs/_reference/kubes-apply.md
 - docs/_reference/kubes-clean.md
@@ -394,6 +412,10 @@ files:
 - docs/_reference/kubes-get.md
 - docs/_reference/kubes-init.md
 - docs/_reference/kubes-logs.md
+- docs/_reference/kubes-new-help.md
+- docs/_reference/kubes-new-helper.md
+- docs/_reference/kubes-new-resource.md
+- docs/_reference/kubes-new-variable.md
 - docs/_reference/kubes-new.md
 - docs/_reference/kubes-prune.md
 - docs/_reference/kubes-version.md
@@ -507,7 +529,9 @@ files:
 - lib/kubes/args/custom.rb
 - lib/kubes/args/dsl.rb
 - lib/kubes/auth.rb
+- lib/kubes/auth/base.rb
 - lib/kubes/auth/ecr.rb
+- lib/kubes/auth/gcr.rb
 - lib/kubes/autoloader.rb
 - lib/kubes/aws_services.rb
 - lib/kubes/cli.rb
@@ -527,10 +551,14 @@ files:
 - lib/kubes/cli/help/completion_script.md
 - lib/kubes/cli/help/deploy.md
 - lib/kubes/cli/help/exec.md
-- lib/kubes/cli/help/new.md
+- lib/kubes/cli/help/new/helper.md
+- lib/kubes/cli/help/new/resource.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/resource.rb
+- lib/kubes/cli/new/variable.rb
 - lib/kubes/cli/prune.rb
 - lib/kubes/cli/sequence.rb
 - lib/kubes/command.rb
@@ -567,8 +595,10 @@ files:
 - 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/strategy.rb
 - lib/kubes/compiler/strategy/base.rb
 - lib/kubes/compiler/strategy/dsl.rb
@@ -611,6 +641,7 @@ files:
 - lib/kubes/kubectl/ordering.rb
 - lib/kubes/logger.rb
 - lib/kubes/logging.rb
+- lib/kubes/plugin.rb
 - lib/kubes/util/consider.rb
 - lib/kubes/util/sh.rb
 - lib/kubes/util/sure.rb
@@ -626,36 +657,38 @@ files:
 - lib/templates/dsl/.kubes/resources/web/deployment/dev.rb
 - lib/templates/dsl/.kubes/resources/web/deployment/prod.rb
 - lib/templates/dsl/.kubes/resources/web/service.rb
-- lib/templates/new/dsl/backend_config.rb
-- lib/templates/new/dsl/config_map.rb
-- lib/templates/new/dsl/daemon_set.rb
-- lib/templates/new/dsl/deployment.rb
-- lib/templates/new/dsl/ingress.rb
-- lib/templates/new/dsl/job.rb
-- lib/templates/new/dsl/managed_certificate.rb
-- lib/templates/new/dsl/namespace.rb
-- lib/templates/new/dsl/network_policy.rb
-- lib/templates/new/dsl/pod.rb
-- lib/templates/new/dsl/role.rb
-- lib/templates/new/dsl/role_binding.rb
-- lib/templates/new/dsl/secret.rb
-- lib/templates/new/dsl/service.rb
-- lib/templates/new/dsl/service_account.rb
-- lib/templates/new/yaml/backend_config.yaml
-- lib/templates/new/yaml/config_map.yaml
-- lib/templates/new/yaml/daemon_set.yaml
-- lib/templates/new/yaml/deployment.yaml
-- lib/templates/new/yaml/ingress.yaml
-- lib/templates/new/yaml/job.yaml
-- lib/templates/new/yaml/managed_certificate.yaml
-- lib/templates/new/yaml/namespace.yaml
-- lib/templates/new/yaml/network_policy.yaml
-- lib/templates/new/yaml/pod.yaml
-- lib/templates/new/yaml/role.yaml
-- lib/templates/new/yaml/role_binding.yaml
-- lib/templates/new/yaml/secret.yaml
-- lib/templates/new/yaml/service.yaml
-- lib/templates/new/yaml/service_account.yaml
+- lib/templates/new/helper/file.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
+- lib/templates/new/resource/dsl/deployment.rb
+- lib/templates/new/resource/dsl/ingress.rb
+- lib/templates/new/resource/dsl/job.rb
+- lib/templates/new/resource/dsl/managed_certificate.rb
+- lib/templates/new/resource/dsl/namespace.rb
+- lib/templates/new/resource/dsl/network_policy.rb
+- lib/templates/new/resource/dsl/pod.rb
+- lib/templates/new/resource/dsl/role.rb
+- lib/templates/new/resource/dsl/role_binding.rb
+- lib/templates/new/resource/dsl/secret.rb
+- lib/templates/new/resource/dsl/service.rb
+- lib/templates/new/resource/dsl/service_account.rb
+- lib/templates/new/resource/yaml/backend_config.yaml
+- 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/ingress.yaml
+- lib/templates/new/resource/yaml/job.yaml
+- lib/templates/new/resource/yaml/managed_certificate.yaml
+- lib/templates/new/resource/yaml/namespace.yaml
+- lib/templates/new/resource/yaml/network_policy.yaml
+- lib/templates/new/resource/yaml/pod.yaml
+- lib/templates/new/resource/yaml/role.yaml
+- lib/templates/new/resource/yaml/role_binding.yaml
+- lib/templates/new/resource/yaml/secret.yaml
+- lib/templates/new/resource/yaml/service.yaml
+- lib/templates/new/resource/yaml/service_account.yaml
+- lib/templates/new/variable/file.rb
 - lib/templates/yaml/.kubes/resources/base/all.yaml.tt
 - lib/templates/yaml/.kubes/resources/base/deployment.yaml.tt
 - lib/templates/yaml/.kubes/resources/shared/namespace.yaml.tt
@@ -689,17 +722,17 @@ files:
 - spec/fixtures/deployments/setter/metadata.rb
 - spec/fixtures/deployments/setter/sidecar.rb
 - spec/fixtures/deployments/setter/spec.rb
-- spec/fixtures/multiple-files/deployment-1.rb
-- spec/fixtures/multiple-files/deployment-2.rb
+- spec/fixtures/multiple-files/.kubes/resources/web/deployment-1.rb
+- spec/fixtures/multiple-files/.kubes/resources/web/deployment-2.rb
 - spec/fixtures/project/.gitignore
-- spec/fixtures/project/.kubes/resources/deployment.rb
-- spec/fixtures/project/.kubes/resources/foobar.rb
-- spec/fixtures/project/.kubes/resources/service.rb
+- spec/fixtures/project/.kubes/resources/web/deployment.rb
+- spec/fixtures/project/.kubes/resources/web/empty.rb
+- spec/fixtures/project/.kubes/resources/web/service.rb
 - spec/fixtures/prune/capture.yaml
 - spec/fixtures/prune/fetch_items.yaml
 - spec/fixtures/services/minimum.rb
-- spec/fixtures/syntax/network_policy.rb
-- spec/fixtures/syntax/pod.rb
+- spec/fixtures/syntax/.kubes/resources/web/network_policy.rb
+- spec/fixtures/syntax/.kubes/resources/web/pod.rb
 - spec/kubes/cli/prune_spec.rb
 - spec/kubes/compiler/decorator/post/deployment_spec.rb
 - spec/kubes/compiler/decorator/post/pod_spec.rb
@@ -732,7 +765,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: 'Kubernetes Deployment Tool: build docker image, compile Kubernetes YAML
@@ -764,17 +797,17 @@ test_files:
 - spec/fixtures/deployments/setter/metadata.rb
 - spec/fixtures/deployments/setter/sidecar.rb
 - spec/fixtures/deployments/setter/spec.rb
-- spec/fixtures/multiple-files/deployment-1.rb
-- spec/fixtures/multiple-files/deployment-2.rb
+- spec/fixtures/multiple-files/.kubes/resources/web/deployment-1.rb
+- spec/fixtures/multiple-files/.kubes/resources/web/deployment-2.rb
 - spec/fixtures/project/.gitignore
-- spec/fixtures/project/.kubes/resources/deployment.rb
-- spec/fixtures/project/.kubes/resources/foobar.rb
-- spec/fixtures/project/.kubes/resources/service.rb
+- spec/fixtures/project/.kubes/resources/web/deployment.rb
+- spec/fixtures/project/.kubes/resources/web/empty.rb
+- spec/fixtures/project/.kubes/resources/web/service.rb
 - spec/fixtures/prune/capture.yaml
 - spec/fixtures/prune/fetch_items.yaml
 - spec/fixtures/services/minimum.rb
-- spec/fixtures/syntax/network_policy.rb
-- spec/fixtures/syntax/pod.rb
+- spec/fixtures/syntax/.kubes/resources/web/network_policy.rb
+- spec/fixtures/syntax/.kubes/resources/web/pod.rb
 - spec/kubes/cli/prune_spec.rb
 - spec/kubes/compiler/decorator/post/deployment_spec.rb
 - spec/kubes/compiler/decorator/post/pod_spec.rb