kennel 1.42.0 → 1.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c6dc438fb91def5e1512131ebe5ee1e173494a6ae9baf46de466ade56289e81
-  data.tar.gz: 6f21ff61fb6045767be9b60eec26e3949bf2112a957cdd1cd6b965a55bbeb9b1
+  metadata.gz: 6af54a490e2bace86bb51b365a2d1bdfe48bd2949ed2a3a7d870acc41dba33a1
+  data.tar.gz: d2576aea2e2908a0f8c45af918d5a18f45efd2c05b4246ad9c53b31d9ade50af
 SHA512:
-  metadata.gz: b3c30cdd1e51494d9e7b9a49e2055339962950bff49e16d4ea58afa13f8114cae33bef3bd145da484dbd147c87f12f4403e1ac55472b2778cef689dffb9f5089
-  data.tar.gz: 1c1efa3f42d08d21234ba4f511c3eb957dd8fb3f32b3ca78bca540c2c6be9a8c7185d2fddda8388c25229752084b0e24162da14beaa6a273cefa99f82263d34e
+  metadata.gz: 258c7088f6e55629fb61e0b95701cd59cfc9615925e0b89753179fdf15289c9e309fba1bda9221b4c68d6519d228c03005b8535621881347f21bd8e5a884d5c7
+  data.tar.gz: 4dc69e5a620edbf36e65f8ae550e40a202c7b6e7aa47945e36eb2ab201e497daf4e32b0af038f7fa5b3039f025f301474d08c691c8c4b8f1f101760d3d5d698c

data/lib/kennel/importer.rb

@@ -3,7 +3,7 @@
 module Kennel
   class Importer
     TITLES = [:name, :title].freeze
-    SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, :message, :description, :template_variables].freeze
+    SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, *Syncer::TRACKING_FIELDS, :template_variables].freeze
 
     def initialize(api)
       @api = api
@@ -26,7 +26,19 @@ module Kennel
       model.normalize({}, data) # removes id
       data[:id] = id
 
-      data[:kennel_id] = Kennel::Utils.parameterize(data.fetch(TITLES.detect { |t| data[t] }))
+      title_field = TITLES.detect { |f| data[f] }
+      title = data.fetch(title_field)
+      title.tr!(Kennel::Models::Base::LOCK, "") # avoid double lock icon
+
+      # calculate or reuse kennel_id
+      # TODO: this is copy-pasted from syncer, need to find a nice way to reuse it
+      tracking_field = Syncer::TRACKING_FIELDS.detect { |f| data[f] }
+      data[:kennel_id] =
+        if tracking_field && data[tracking_field].sub!(/\n?-- Managed by kennel (\S+:\S+).*/, "")
+          $1.split(":").last
+        else
+          Kennel::Utils.parameterize(title)
+        end
 
       if resource == "monitor"
         # flatten monitor options so they are all on the base

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.42.0
+  version: 1.43.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday