kubes 0.4.6 → 0.6.1

data/lib/kubes/compiler/layering.rb

@@ -11,14 +11,26 @@ class Kubes::Compiler
         all = all.pluralize
       end
       layers = [
-        "#{all}#{ext}",
-        "#{all}/#{Kubes.env}#{ext}",
-        "#{kind}#{ext}",
-        "#{kind}/#{Kubes.env}#{ext}",
+        "#{all}",
+        "#{all}/#{Kubes.env}",
+        "#{kind}",
+        "#{kind}/#{Kubes.env}",
       ]
-      layers.map do |layer|
+      layers = add_exts(layers)
+      layers.map! do |layer|
         "#{Kubes.root}/.kubes/resources/base/#{layer}"
       end
+      layers.select { |layer| File.exist?(layer) }
+    end
+
+    def add_exts(layers)
+      layers.map do |layer|
+        [
+          "#{layer}.rb",
+          "#{layer}.yaml",
+          "#{layer}.yml",
+        ]
+      end.flatten
     end
 
     def post_layers
@@ -31,9 +43,11 @@ class Kubes::Compiler
         "base",
         Kubes.env.to_s
       ]
-      layers.map do |layer|
-        "#{kind_path}/#{layer}#{ext}"
+      layers = add_exts(layers)
+      layers.map! do |layer|
+        "#{kind_path}/#{layer}"
       end
+      layers.select { |layer| File.exist?(layer) }
     end
   end
 end

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

@@ -0,0 +1,38 @@
+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/helpers.rb

@@ -5,12 +5,21 @@ module Kubes::Compiler::Shared
     extend Kubes::Compiler::Dsl::Core::Fields
     fields "name"
 
-    def built_image
+    def docker_image
       return @options[:image] if @options[:image] # override
+      return Kubes.config.image if Kubes.config.image
+      built_image_helper
+    end
+
+    def built_image
+      Deprecated.new.built_image
+      built_image_helper
+    end
 
+    def built_image_helper
       path = Kubes.config.state.docker_image_path
       unless File.exist?(path)
-        raise "Missing file with docker image built by kubes: #{path}. Try first running: kubes docker build"
+        raise Kubes::MissingDockerImage.new("Missing file with docker image built by kubes: #{path}. Try first running: kubes docker build")
       end
       IO.read(path)
     end

data/lib/kubes/compiler/shared/helpers/deprecated.rb

@@ -0,0 +1,37 @@
+module Kubes::Compiler::Shared::Helpers
+  class Deprecated
+    def built_image
+      puts "DEPRECATED: built_image is deprecated, use docker_image helper instead.".color(:yellow)
+      print_source
+    end
+
+    def error_info
+      error_info = caller.find { |l| l.include?('.kubes/resources') }
+      path, line_number, _ = error_info.split(':')
+      {path: path, line_number: line_number}
+    end
+
+    def print_source
+      info = error_info
+      path = info[:path]
+      line_number = info[:line_number].to_i
+
+      pretty_path = path.sub("#{Kubes.root}/",'')
+      puts "Here's the line in #{pretty_path} that calls built_image:\n\n"
+
+      contents = IO.read(path)
+      content_lines = contents.split("\n")
+      context = 5 # lines of context
+      top, bottom = [line_number-context-1, 0].max, line_number+context-1
+      lpad = content_lines.size.to_s.size
+      content_lines[top..bottom].each_with_index do |line_content, index|
+        current_line = top+index+1
+        if current_line == line_number
+          printf("%#{lpad}d %s\n".color(:red), current_line, line_content)
+        else
+          printf("%#{lpad}d %s\n", current_line, line_content)
+        end
+      end
+    end
+  end
+end

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

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

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/strategy/base.rb

@@ -1,13 +1,70 @@
 class Kubes::Compiler::Strategy
   class Base
-    include Kubes::Logging
+    include Kubes::Compiler::Layering
+    include Kubes::Compiler::Util::Normalize
     include Kubes::Compiler::Util::SaveFile
-    include Kubes::Compiler::Shared::CustomHelpers
+    include Kubes::Logging
 
     def initialize(options={})
       @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/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/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/config.rb

@@ -32,7 +32,7 @@ module Kubes
 
       config.repo = nil # expected to be set by .kubes/config.rb
 
-      config.logger = Logger.new($stdout)
+      config.logger = Logger.new($stderr)
       config.logger.level = ENV['KUBES_LOG_LEVEL'] || :info
 
       config.skip = []

data/lib/kubes/core.rb

@@ -28,5 +28,11 @@ module Kubes
     def kustomize?
       Kubectl::Kustomize.detect?
     end
+
+    def check_project!
+      return if File.exist?("#{Kubes.root}/.kubes/config.rb")
+      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
   end
 end

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

@@ -30,7 +30,7 @@ module Kubes::Docker::Strategy
       return "tongueroo/demo-kubes:kubes-12345678" if ENV['TEST']
 
       unless File.exist?(image_state_path)
-        puts "Unable to find #{image_state_path} which contains the last docker image name built with kubes build.  Please run `kubes docker build` first."
+        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/lib/kubes/kubectl.rb

@@ -17,13 +17,11 @@ module Kubes
       params = args.flatten.join(' ')
       args = "#{@name} #{params}" # @name: apply or delete
 
-      switch_context do
-        run_hooks("kubectl.rb", name: @name, file: @options[:file]) do
-          if options[:capture]
-            self.class.capture(args, options) # already includes kubectl
-          else
-            self.class.execute(args, options)
-          end
+      run_hooks("kubectl.rb", name: @name, file: @options[:file]) do
+        if options[:capture]
+          self.class.capture(args, options) # already includes kubectl
+        else
+          self.class.execute(args, options)
         end
       end
     end
@@ -44,22 +42,6 @@ module Kubes
       Kubes.config.kubectl.exit_on_fail[@name]
     end
 
-    def switch_context(&block)
-      kubectl = Kubes.config.kubectl
-      context = kubectl.context
-      if context
-        previous_context = capture("kubectl config current-context")
-        sh("kubectl config use-context #{context}", mute: true)
-        result = block.call
-        if !previous_context.blank? && !kubectl.context_keep
-          sh("kubectl config use-context #{previous_context}", mute: true)
-        end
-        result
-      else
-        block.call
-      end
-    end
-
     def args
       # base at end in case of redirection. IE: command > /path
       custom.args + default.args

data/lib/kubes/kubectl/batch.rb

@@ -3,6 +3,7 @@ class Kubes::Kubectl
     include Kubes::Hooks::Concern
     include Kubes::Logging
     include Kubes::Util::Consider
+    include Kubes::Util::Sh
     include Ordering
 
     def initialize(name, options={})
@@ -12,48 +13,41 @@ class Kubes::Kubectl
     def run
       # @options[:preview] is really only used for kubectl delete
       logger.info "Will run:" if @options[:preview]
-      run_hooks("kubes.rb", name: @name) do
-        sorted_files.each do |file|
-          if @options[:preview]
-            logger.info "    kubectl #{@name} -f #{file}"
-          else
-            Kubes::Kubectl.run(@name, @options.merge(file: file))
+      switch_context do
+        run_hooks("kubes.rb", name: @name) do
+          sorted_files.each do |file|
+            if @options[:preview]
+              logger.info "    kubectl #{@name} -f #{file}"
+            else
+              Kubes::Kubectl.run(@name, @options.merge(file: file))
+            end
           end
         end
       end
     end
 
-    # kubes apply                   # {role: nil, resource: nil}
-    # kubes apply clock             # {role: "clock", resource: nil}
-    # kubes apply clock deployment  # {role: "clock", resource: "deployment"}
-    def search_expr
-      role, resource = @options[:role], @options[:resource]
-      if role && resource
-        "#{Kubes.root}/.kubes/output/#{role}/#{resource}.yaml"
-      elsif role
-        "#{Kubes.root}/.kubes/output/#{role}/*.yaml"
-      else
-        "#{Kubes.root}/.kubes/output/**/*.yaml"
-      end
-    end
+    def switch_context(&block)
+      kubectl = Kubes.config.kubectl
+      context = kubectl.context
 
-    def files
-      files = []
-      Dir.glob(search_expr).each do |path|
-        next unless process?(path)
-        file = path.sub("#{Kubes.root}/", '')
-        files << file
+      unless context
+        block.call
+        return
       end
-      files
-    end
 
-    def process?(path)
-      consider?(path) && two_levels_deep?(path)
-    end
+      previous_context = sh_capture("kubectl config current-context")
+      if previous_context == context
+        block.call
+        return
+      end
 
-    def two_levels_deep?(path)
-      rel_path = path.sub(%r{.*\.kubes/output/},'')
-      rel_path.split('/').size == 2
+      logger.debug "Switching kubectl context to: #{context}"
+      sh("kubectl config use-context #{context}", mute: true)
+      result = block.call
+      if !previous_context.blank? && !kubectl.context_keep
+        sh("kubectl config use-context #{previous_context}", mute: true)
+      end
+      result
     end
   end
 end