kubes 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26abdb16aa89e6a5c34aefee8430ee36e7444bb387b2bd85c4327d6f07afc038
-  data.tar.gz: 8513c5be9f224cf0081f70197390f5d55eda823c2d1b46d1c1f81d82d9e44460
+  metadata.gz: 9bfe400824a8ee2877643cba9abfbd10a5e57b058e88977313457836a490c7f0
+  data.tar.gz: 98bff5118293f84161ed5b10b9d0162df5181b75a6dbc09dc88ed2ecd5e7029e
 SHA512:
-  metadata.gz: 972853cd07d7a56344f8575c4c977f60cb72156a434b0589c99b311e3383f9ed30d218baf3caff7b83ee33881ae45eda496beb13935fae86c4b707bcf342de95
-  data.tar.gz: 7ada5c671ac68171034c83c56f0c535f0e33ca27aa63da9b8d96215670e7541416d4714d7151496f87cea17acc781c40ea62986d390456f7475e394f226871c6
+  metadata.gz: 0f3a2a36e27e2c64d5821f429368bd515c259045a26d24b8ee16713a356f53d6370938a2748bf1e65f95779936ea654547117f49bef8da2c0b435461f5456099
+  data.tar.gz: 9e603c401b2e9a56fc38cd1aec28d3ceaf9ff821d5add2b22bf9d8d2e5d209d7ab5609b9ab0116bd1189d5594a0e6ee00a071984605b235408ac6a0fffbeee1b

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.4.4]
+- #30 friendly message for rendered erb yaml and dsl errors
+- fix backtrace_reject pattern
+
 ## [0.4.3]
 - #29 fix edge case when user provides hook on option for non-kubectl hooks
 

data/docs/_includes/layering/layers.md

@@ -27,7 +27,7 @@ To explain the layering, here's the general processing order that Kubes takes.
 
 Note, both YAML and DSL forms support layering.
 
-Layering only combines resources definitions with the same form. For example, `base/all.rb` will not be combined with `web/deployment.yaml`.
+Layering only combines resources definitions with the same form. For example, the DSL form `base/all.rb` will not be combined with YAML form `web/deployment.yaml`.
 
 ## Full Layering
 

data/lib/kubes.rb

@@ -17,7 +17,7 @@ require "yaml"
 # core helper libraries
 require "kubes_google"
 
-DslEvaluator.backtrace_reject = ".kubes"
+DslEvaluator.backtrace_reject = "lib/kubes"
 
 require "kubes/autoloader"
 Kubes::Autoloader.setup

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

@@ -1,13 +1,12 @@
 class Kubes::Compiler::Strategy
   class Base
     include Kubes::Logging
+    include Kubes::Compiler::Util::SaveFile
 
     def initialize(options={})
       @options = options
       @path = options[:path]
-
-      @filename = @path.sub(%r{.*\.kubes/resources/},'') # IE: web/deployment.rb or web/deployment.yaml
-      @save_file = @filename.sub('.yml','.yaml').sub('.rb','.yaml')
+      @save_file = save_file(@path)
     end
   end
 end

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

@@ -17,7 +17,7 @@ class Kubes::Compiler::Strategy
     end
 
     def syntax_class
-      klass_name = normalize_kind(@filename)
+      klass_name = normalize_kind(@save_file)
       "Kubes::Compiler::Dsl::Syntax::#{klass_name}".constantize
     rescue NameError
       logger.debug "Using default resource for: #{klass_name}"
@@ -25,7 +25,7 @@ class Kubes::Compiler::Strategy
     end
 
     def block_form?
-      type = extract_type(@filename)
+      type = extract_type(@save_file)
       type.pluralize == type
     end
   end

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

@@ -32,11 +32,18 @@ class Kubes::Compiler::Strategy
     def render_result(path)
       if File.exist?(path)
         yaml = RenderMePretty.result(path, context: self)
-        result = YAML.load(yaml)
+        result = yaml_load(path, yaml)
         result.is_a?(Hash) ? result : {} # in case of blank yaml doc a Boolean false is returned
       else
         {}
       end
     end
+
+    def yaml_load(path, yaml)
+      YAML.load(yaml)
+    rescue Psych::SyntaxError
+      YamlError.new(path, yaml).show
+      exit 1
+    end
   end
 end

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

@@ -0,0 +1,60 @@
+class Kubes::Compiler::Strategy::Erb
+  class YamlError
+    include Kubes::Compiler::Util::SaveFile
+
+    def initialize(path, rendered_yaml)
+      @path, @rendered_yaml = path, rendered_yaml
+    end
+
+    def show
+      FileUtils.mkdir_p(File.dirname(dest))
+      IO.write(dest, @rendered_yaml)
+      show_error(dest)
+    end
+
+    def dest
+      save_file = save_file(@path)
+      "#{Kubes.root}/.kubes/output/#{save_file}"
+    end
+
+    def show_error(path)
+      text = IO.read(path)
+      begin
+        YAML.load(text)
+      rescue Psych::SyntaxError => e
+        handle_yaml_syntax_error(e, path)
+      end
+    end
+
+    def handle_yaml_syntax_error(e, path)
+      io = StringIO.new
+      io.puts "Invalid yaml. Output written for debugging: #{path}".color(:red)
+      io.puts "ERROR: #{e.message}".color(:red)
+
+      # Grab line info.  Example error:
+      #   ERROR: (<unknown>): could not find expected ':' while scanning a simple key at line 2 column 1
+      md = e.message.match(/at line (\d+) column (\d+)/)
+      line = md[1].to_i
+
+      lines = IO.read(path).split("\n")
+      context = 5 # lines of context
+      top, bottom = [line-context-1, 0].max, line+context-1
+      spacing = lines.size.to_s.size
+      lines[top..bottom].each_with_index do |line_content, index|
+        line_number = top+index+1
+        if line_number == line
+          io.printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
+        else
+          io.printf("%#{spacing}d %s\n", line_number, line_content)
+        end
+      end
+
+      if ENV['KUBES_TEST']
+        io.string
+      else
+        puts io.string
+        exit 1
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Kubes::Compiler::Util
     end
 
     def extract_type(path)
-      File.basename(path).sub('.rb','').sub(/-.*/,'')
+      File.basename(path).sub('.yaml','').sub('.yml','').sub('.rb','').sub(/-.*/,'')
     end
   end
 end

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

@@ -0,0 +1,8 @@
+module Kubes::Compiler::Util
+  module SaveFile
+    def save_file(path)
+      filename = path.sub(%r{.*\.kubes/resources/},'') # IE: web/deployment.rb or web/deployment.yaml
+      filename.sub('.yml','.yaml').sub('.rb','.yaml')
+    end
+  end
+end

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -540,9 +540,11 @@ files:
 - lib/kubes/compiler/strategy/base.rb
 - lib/kubes/compiler/strategy/dsl.rb
 - lib/kubes/compiler/strategy/erb.rb
+- lib/kubes/compiler/strategy/erb/yaml_error.rb
 - lib/kubes/compiler/strategy/pass.rb
 - lib/kubes/compiler/strategy/result.rb
 - lib/kubes/compiler/util/normalize.rb
+- lib/kubes/compiler/util/save_file.rb
 - lib/kubes/compiler/util/yaml_dump.rb
 - lib/kubes/completer.rb
 - lib/kubes/completer/script.rb