biosphere 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88020767bf9108cca1476004ddf0341b5feafe88
-  data.tar.gz: 063cb05d2a0cba8246a49cccdf0d7c396e18ddcb
+  metadata.gz: aa6bf1b3024023b7f683aea94a5d9410fb3e5ea2
+  data.tar.gz: 2595a001d0345ef607f32a7966c577ddc91da16a
 SHA512:
-  metadata.gz: 97728c5ec497caa18604445a6bea2e2adb0cde5f0c906f98a24d97dd62eece20c28519acd4e7072dd8fbf9937594a43e970269e06d28e18b1a325e4a3f8348e9
-  data.tar.gz: e900d8d19297fe53e4d35d4b2c8b1135d99d4dd80b2174a0b1018e0b631693b8b77650965ac9878bdd4242e7ba12739357ca9939f7e6c672564ae20ad6ec971c
+  metadata.gz: 26671009ac8d5ecc2a8a30ca584532aefb447928f1363ee237f5611713d213998a6ea48c813621a9ab8578bc6aa7d69b959ee8809151198a96d9283dc8bf345e
+  data.tar.gz: 79c83f3259d51e817a70de605256c3cff2759d1d76d73928f0de10d0ee046d35093f9ea5eea767f9697e9ba203f27a87b266bd9a8c75acc1f0cc4ed87092cbcb

data/bin/biosphere

@@ -90,6 +90,7 @@ if options.src
         STDERR.puts "Loading suite from current directory (#{File.expand_path(options.src)}). Use --src to change the path"
     end
 
+    # We need to load the suite once so that we can find the Biosphere settings
     if suite.load_all(options.src) == 0 || suite.deployments.size == 0
         STDERR.puts "No files found. Are you in the right directory where your biosphere .rb files are?"
         exit -1

data/lib/biosphere/kube.rb

@@ -177,7 +177,33 @@ class Biosphere
         def self.load_resources(file, context={})
             resources = []
             #puts "Loading file #{File.absolute_path(file)}"
-            str = ERB.new(IO.read(file)).result(OpenStruct.new(context).instance_eval { binding })
+            data = IO.read(file)
+            begin
+                str = ERB.new(data).result(OpenStruct.new(context).instance_eval { binding })
+            rescue NoMethodError => e
+                puts "Error evaluating erb templating for #{file}. Error: #{e}"
+                m = /\(erb\):([0-9]+):/.match(e.backtrace.first)
+                if m
+                    puts "Error at line #{m[1]}. This is before ERB templating."
+                    linenumber = m[1].to_i
+                    if linenumber > 0 # Linenumbers seems to be off with 1 as the array is starting at zero
+                        linenumber = linenumber - 1
+                    end
+                    lines = data.split("\n")
+                    start_line = [0, linenumber - 3].max
+                    end_line = [lines.length - 1, linenumber + 3].min
+                    lines[start_line..end_line].each_with_index do |line, num|
+                        num += start_line
+                        if num == linenumber
+                            STDERR.printf("%04d>  %s\n".red, num, line)
+                        else
+                            STDERR.printf("%04d|  %s\n", num, line)
+                        end
+                    end
+                end
+                raise e
+            end
+
             begin
                 Psych.load_stream(str) do |document|
                     kind = document["kind"]
@@ -190,11 +216,16 @@ class Biosphere
                 STDERR.puts "Here are the relevant lines. Error '#{e.problem}' occured at line #{e.line}"
                 STDERR.puts "Notice that yaml is very picky about indentation when you have arrays and maps. Check those first."
                 lines = str.split("\n")
-                start_line = [0, e.line - 3].max
-                end_line = [lines.length - 1, e.line + 3].min
+                linenumber = e.line
+                if linenumber > 0 # Linenumbers seems to be off with 1 as the array is starting at zero
+                    linenumber = linenumber - 1
+                end
+                
+                start_line = [0, linenumber - 3].max
+                end_line = [lines.length - 1, linenumber + 3].min
                 lines[start_line..end_line].each_with_index do |line, num|
                     num += start_line
-                    if num == e.line
+                    if num == linenumber
                         STDERR.printf("%04d>  %s\n".red, num, line)
                     else
                         STDERR.printf("%04d|  %s\n", num, line)

data/lib/biosphere/state.rb

@@ -2,6 +2,7 @@ require 'pp'
 require 'ipaddress'
 require 'biosphere/node'
 require 'deep_merge'
+require 'deep_dup'
 
 class Biosphere
     class State
@@ -51,7 +52,34 @@ class Biosphere
 
         def load_from_structure!(structure)
             if @node
-                @node.data.deep_merge(structure.data)
+
+                # Objects which might get removed when building a new state need to be stored away before the merge
+                feature_manifests = {}
+                @node.data[:deployments].each do |name, deployment|
+                    if deployment[:feature_manifests]
+                        feature_manifests[name] = ::DeepDup.deep_dup(deployment[:feature_manifests])
+                    end
+                end
+
+                # Merge the structured state into the current state
+                @node.data.deep_merge(structure.data, {:overwrite_arrays => true})
+
+                # Now re-apply the stored objects on top of the merged state so that removes are handled correctly
+                @node.data[:deployments].each do |name, deployment|
+                    removed = {}
+                    if feature_manifests[name]
+                        feature_manifests[name].each do |section, manifests|
+                            diff = deployment[:feature_manifests][section] - manifests
+                            removed[section] = diff if diff.length > 0
+                        end
+                        deployment[:feature_manifests] = feature_manifests[name]
+                    end
+
+                    if removed.length > 0
+                        deployment[:removed_feature_manifests] = removed
+                    end
+                end
+
             else
                 @node = structure
             end

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.1.8"
+  Version = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec