kennel 1.92.3 → 1.94.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3460bf3995d61817a7d7db0ad209012cb6cd51b1d5ba6767f4d20bc1766243f
-  data.tar.gz: 6a70c8e91c2bbf3e67db5f157e3c7f85d4025d2494d04026f9e7dc2007635217
+  metadata.gz: 794c9eb35b6b3b66294b4a927ba39e9fd8b52a3aad324704799128b1b1818567
+  data.tar.gz: 2f653b0669dfbfe8972cdad38c96c016f13c2d2d29d332cc53883e879ec9e766
 SHA512:
-  metadata.gz: 6d3554ec738b404eb6ef6ff6e32120b86d3e65d399c7a5c0ff9c828e3beecf066fb441d941f077b9537c50347b1c5694b54d94e1c4f1d1ba19bacb5afcb1af57
-  data.tar.gz: d3eb584c0b15e04e38021324ce5e861740c2660f978cf9f413635a6a76fc8a4f82bba09a07343e12b0821f4b56f098fe39a8387013ffbb287065281b54bbeca5
+  metadata.gz: 1591fab84de0bfbdb77621ef7a449c9f764f5391d73f3135288eb661da84e503109b5305f82e68a4249feee5fbf0a4d8d1abf9a872e25f501b4f5b1b5b3b3d9d
+  data.tar.gz: 571579849c0726f80efdd90ff04e61dc5f897163c0d0f4d2b87572769339e475e0f5a7b01f58ee025be29011241109527d2c3c55763590d053f64748ad275cde

data/lib/kennel/importer.rb

@@ -132,8 +132,9 @@ module Kennel
               .gsub(": null", ": nil")
               .gsub(/(^\s*)"([a-zA-Z][a-zA-Z\d_]*)":/, "\\1\\2:") # "foo": 1 -> foo: 1
               .gsub(/: \[\n\s+\]/, ": []") # empty arrays on a single line
-              .gsub(/^/, "    ") # indent
               .gsub('q: "metadata"', "q: :metadata") # bring symbols back
+              .gsub(/^/, "    ") # indent
+            pretty = convert_strings_to_heredoc(pretty)
 
             "\n#{pretty}\n  "
           elsif k == :message
@@ -147,6 +148,16 @@ module Kennel
       end.join(",\n")
     end
 
+    def convert_strings_to_heredoc(text)
+      text.gsub(/^( *)([^" ]+ *)"([^"]+\\n[^"]+)"(,)?\n/) do
+        indent = $1
+        prefix = $2
+        string = $3
+        comma = $4
+        "#{indent}#{prefix}<<~TXT#{comma}\n#{indent}  #{string.gsub("\\n", "\n#{indent}  ").rstrip}\n#{indent}TXT\n"
+      end
+    end
+
     # sort dashboard widgets + nesting
     def sort_widgets(outer)
       outer[:widgets]&.each do |widgets|

data/lib/kennel/models/dashboard.rb

@@ -6,7 +6,7 @@ module Kennel
       include OptionalValidations
 
       READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
-        :author_handle, :author_name, :modified_at, :url, :is_read_only, :notify_list
+        :author_handle, :author_name, :modified_at, :url, :is_read_only, :notify_list, :restricted_roles
       ]
       TRACKING_FIELD = :description
       REQUEST_DEFAULTS = {

data/lib/kennel/syncer.rb

@@ -160,6 +160,7 @@ module Kennel
         ensure_all_ids_found
         @create = @expected.map { |e| [nil, e] }
         @delete.sort_by! { |_, _, a| DELETE_ORDER.index a.fetch(:klass).api_resource }
+        @update.sort_by! { |_, e, _| DELETE_ORDER.index e.class.api_resource } # slo needs to come before slo alert
       end
     end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.92.3
+  version: 1.94.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday