kennel 1.111.0 → 1.112.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc8b3b6c87887c18c48a47ef287b7d96a79a12b11f3e76122b95733dfcb53bc
-  data.tar.gz: 335c63f8cb7b01437286a0d5a1e2bfdcc409af5ff98d3743cb485e06c4d63963
+  metadata.gz: 4afd2070d0b8c2097b1e67b0ad6b1f72928058370066d463da37f4b3340d903a
+  data.tar.gz: b11721c83b65f8af2749faef9a967691fafe235e85214fa15163b4341b00d928
 SHA512:
-  metadata.gz: 8805038348b44ad5a9615642b6862d6a99dea7d630dd4bc2a2d93448d59d394bf23f714ef46a159c0150f34105b4a8553c4ea09d63b0a0fdc811ac6919a6de04
-  data.tar.gz: 93a9924e1c1d575d110e4e90b10124f7157a18f384284fb190af267ca19580d93e33b9816708429804195450b4865918e63a507dc65e1fcb84885c2b94122e23
+  metadata.gz: 8d75553fdb2b17fc63e4cac6f7b56290d25756848109b4bc015125e1369cfbb624c270d46f108f502c2dca6c55de64bc2d63c606d8b259f3f97fe7bba7b7700f
+  data.tar.gz: f63b3f9d0a4d273f189ae55d50e4e477bf7a7ca4a88474a97771592ede2080b6a4ab3aa815a76def48951d43b092db5eb880dd64acce0de69bcb51aa1c1d0e32

data/lib/kennel/models/record.rb

@@ -8,6 +8,9 @@ module Kennel
         :deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at,
         :klass, :tracking_id # added by syncer.rb
       ].freeze
+      ALLOWED_KENNEL_ID_CHARS = "a-zA-Z_\\d.-"
+      ALLOWED_KENNEL_ID_FULL = "[#{ALLOWED_KENNEL_ID_CHARS}]+:[#{ALLOWED_KENNEL_ID_CHARS}]+"
+      ALLOWED_KENNEL_ID_REGEX = /\A#{ALLOWED_KENNEL_ID_FULL}\z/.freeze
 
       settings :id, :kennel_id
 
@@ -25,7 +28,7 @@ module Kennel
         end
 
         def parse_tracking_id(a)
-          a[self::TRACKING_FIELD].to_s[/-- Managed by kennel (\S+:\S+)/, 1]
+          a[self::TRACKING_FIELD].to_s[/-- Managed by kennel (#{ALLOWED_KENNEL_ID_FULL})/, 1]
         end
 
         # TODO: combine with parse into a single method or a single regex
@@ -76,7 +79,9 @@ module Kennel
       def tracking_id
         @tracking_id ||= begin
           id = "#{project.kennel_id}:#{kennel_id}"
-          raise ValidationError, "#{id} kennel_id cannot include whitespace" if id.match?(/\s/) # <-> parse_tracking_id
+          unless id.match?(ALLOWED_KENNEL_ID_REGEX) # <-> parse_tracking_id
+            raise ValidationError, "#{id} must match #{ALLOWED_KENNEL_ID_REGEX}"
+          end
           id
         end
       end

data/lib/kennel/models/synthetic_test.rb

@@ -53,11 +53,11 @@ module Kennel
         super
 
         # tags come in a semi-random order and order is never updated
-        expected[:tags]&.sort!
-        actual[:tags]&.sort!
+        expected[:tags] = expected[:tags]&.sort
+        actual[:tags] = actual[:tags]&.sort
 
-        expected[:locations]&.sort!
-        actual[:locations]&.sort!
+        expected[:locations] = expected[:locations]&.sort
+        actual[:locations] = actual[:locations]&.sort
 
         ignore_default(expected, actual, DEFAULTS)
       end

data/lib/kennel/utils.rb

@@ -149,7 +149,7 @@ module Kennel
       # TODO: use awesome-print or similar, but it has too many monkey-patches
       # https://github.com/amazing-print/amazing_print/issues/36
       def pretty_inspect(object)
-        string = object.inspect
+        string = object.inspect.dup
         string.gsub!(/:([a-z_]+)=>/, "\\1: ")
         10.times do
           string.gsub!(/{(\S.*?\S)}/, "{ \\1 }") || break

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.111.0
+  version: 1.112.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Keep datadog monitors/dashboards/etc in version control, avoid chaotic management