kennel 1.116.2 → 1.117.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67342a80e2cd8dd1f0f2ad613cca326405bff85975ceb4253bc6180c856b03cc
-  data.tar.gz: 587fb9a0ca21bf084e71c496c411708cc132aa80f2f7ec3c34f56b5a3b1888b4
+  metadata.gz: 83531b8281e71f8a5f8e307320c81f2ecf4c320da617c27777b08325f1394ed1
+  data.tar.gz: 1d3bce11c52a35f07a48546d37147213a8ca407e7e30710a8efaedc59be8dcd5
 SHA512:
-  metadata.gz: 89fb1183eb9ee4db1f0a138c342a79b9f6f5b1aab962090e8f5e83d0e1c7fcbd38486106cbfd506e7da33a747a0391b3a0944c214efeffbe3a5f1854cc0d0fc4
-  data.tar.gz: 4b5de65ad6957b45309e8e1158c0a23ac7fb95242a264d2f292f74d156481a23af5737d13236f7761664954c1f77471d6327a2febf30d5489361b0a4988545f2
+  metadata.gz: fddea7652c95c90fb529520ab1422f8a8dca9d27f3fd05dd6d3abb0892e831c1fb91af4455b77eba748cd635f86537d19b473eacd2004721ce0717e342efc25d
+  data.tar.gz: 537d25042eb17f6a86a65edba83e57001f1da160eacad93478062aec665cdad2798040a946b21bab53818fec2bed6089d1f15b22ca5fddc15e85fc5f1aa0d036

data/lib/kennel/file_cache.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "tempfile"
+
 # cache that reads everything from a single file
 # - avoids doing multiple disk reads while iterating all definitions
 # - has a global expiry to not keep deleted resources forever
@@ -44,7 +46,11 @@ module Kennel
     def persist
       dir = File.dirname(@file)
       FileUtils.mkdir_p(dir) unless File.directory?(dir)
-      File.write(@file, Marshal.dump(@data))
+
+      Tempfile.create do |tmp|
+        Marshal.dump @data, tmp
+        File.rename tmp.path, @file
+      end
     end
 
     # keep the cache small to make loading it fast (5MB ~= 100ms)

data/lib/kennel/syncer.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+
+require "diff/lcs"
+
 module Kennel
   class Syncer
     DELETE_ORDER = ["dashboard", "slo", "monitor", "synthetics/tests"].freeze # dashboards references monitors + slos, slos reference monitors
@@ -196,16 +199,22 @@ module Kennel
 
     def print_diff(diff)
       diff.each do |type, field, old, new|
+        use_diff = false
         if type == "+"
           temp = Utils.pretty_inspect(new)
           new = Utils.pretty_inspect(old)
           old = temp
+        elsif old.is_a?(String) && new.is_a?(String) && (old.include?("\n") || new.include?("\n"))
+          use_diff = true
         else # ~ and -
           old = Utils.pretty_inspect(old)
           new = Utils.pretty_inspect(new)
         end
 
-        if (old + new).size > 100
+        if use_diff
+          Kennel.out.puts "  #{type}#{field}"
+          Kennel.out.puts(diff(old, new).map { |l| "    #{l}" })
+        elsif (old + new).size > 100
           Kennel.out.puts "  #{type}#{field}"
           Kennel.out.puts "    #{old} ->"
           Kennel.out.puts "    #{new}"
@@ -215,6 +224,26 @@ module Kennel
       end
     end
 
+    # display diff for multi-line strings
+    # must stay readable when color is off too
+    def diff(old, new)
+      Diff::LCS.sdiff(old.split("\n", -1), new.split("\n", -1)).flat_map do |diff|
+        case diff.action
+        when "-"
+          Utils.color(:red, "- #{diff.old_element}")
+        when "+"
+          Utils.color(:green, "+ #{diff.new_element}")
+        when "!"
+          [
+            Utils.color(:red, "- #{diff.old_element}"),
+            Utils.color(:green, "+ #{diff.new_element}")
+          ]
+        else
+          "  #{diff.old_element}"
+        end
+      end
+    end
+
     # We've already validated the desired objects ('generated') in isolation.
     # Now that we have made the plan, we can perform some more validation.
     def validate_plan

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.116.2"
+  VERSION = "1.117.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.116.2
+  version: 1.117.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement