kennel 1.42.0 → 1.43.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/kennel/importer.rb +14 -2
- data/lib/kennel/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6af54a490e2bace86bb51b365a2d1bdfe48bd2949ed2a3a7d870acc41dba33a1
|
|
4
|
+
data.tar.gz: d2576aea2e2908a0f8c45af918d5a18f45efd2c05b4246ad9c53b31d9ade50af
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 258c7088f6e55629fb61e0b95701cd59cfc9615925e0b89753179fdf15289c9e309fba1bda9221b4c68d6519d228c03005b8535621881347f21bd8e5a884d5c7
|
|
7
|
+
data.tar.gz: 4dc69e5a620edbf36e65f8ae550e40a202c7b6e7aa47945e36eb2ab201e497daf4e32b0af038f7fa5b3039f025f301474d08c691c8c4b8f1f101760d3d5d698c
|
data/lib/kennel/importer.rb
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
module Kennel
|
|
4
4
|
class Importer
|
|
5
5
|
TITLES = [:name, :title].freeze
|
|
6
|
-
SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query,
|
|
6
|
+
SORT_ORDER = [*TITLES, :id, :kennel_id, :type, :tags, :query, *Syncer::TRACKING_FIELDS, :template_variables].freeze
|
|
7
7
|
|
|
8
8
|
def initialize(api)
|
|
9
9
|
@api = api
|
|
@@ -26,7 +26,19 @@ module Kennel
|
|
|
26
26
|
model.normalize({}, data) # removes id
|
|
27
27
|
data[:id] = id
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
title_field = TITLES.detect { |f| data[f] }
|
|
30
|
+
title = data.fetch(title_field)
|
|
31
|
+
title.tr!(Kennel::Models::Base::LOCK, "") # avoid double lock icon
|
|
32
|
+
|
|
33
|
+
# calculate or reuse kennel_id
|
|
34
|
+
# TODO: this is copy-pasted from syncer, need to find a nice way to reuse it
|
|
35
|
+
tracking_field = Syncer::TRACKING_FIELDS.detect { |f| data[f] }
|
|
36
|
+
data[:kennel_id] =
|
|
37
|
+
if tracking_field && data[tracking_field].sub!(/\n?-- Managed by kennel (\S+:\S+).*/, "")
|
|
38
|
+
$1.split(":").last
|
|
39
|
+
else
|
|
40
|
+
Kennel::Utils.parameterize(title)
|
|
41
|
+
end
|
|
30
42
|
|
|
31
43
|
if resource == "monitor"
|
|
32
44
|
# flatten monitor options so they are all on the base
|
data/lib/kennel/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kennel
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.43.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michael Grosser
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-06
|
|
11
|
+
date: 2019-07-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: faraday
|