kennel 1.28.3 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e263461ba824bfa642b5a492fce10890c1b7a9386b3612e3a09a69a0e6024c
-  data.tar.gz: 2e2230b12e0ea88632081198c0940af261fcf0b790098b359e6380ba2b579d15
+  metadata.gz: 51c93416ef68f2df5993139565a6a2e1ff6c160e0af38ccb57c0928466ba985f
+  data.tar.gz: 252bd1d0fc890a1ca09fe53c7b2b5164dbc70f9632c88e35c26d33029c21dbac
 SHA512:
-  metadata.gz: 5e39237eaa132232d0c71fab0deaf8d75f5247a68d75a65fa072c60e4e754359f9e0a6324bcabacee444553ec919e577b23a9b95bc99bbf317a2e74e2f270c39
-  data.tar.gz: 44ec8988b73ed92298f71c0a05a98a62c3f0d0b9e7def8e3b11f3b895405eba354b791eb0c0b1f00b84d07d1c6b32793570cf1cce9557a84c5b8ef270d2cc596
+  metadata.gz: f9ec881520f6a8dc3198350c36de13a279514241def49f971a58c75ac2bd15bd5e61d9cbb7a24ef54795550ae0b80dcae95f9b49d8ac1ef704ef9c206ab2ff15
+  data.tar.gz: d00d5e206320f24cb7d5dc4e4410186b0d9d09940b98b587488b1b669bef8e4b059a41a23a7f50765d5649721fdb4067e92fa4e5e6501419216c4da9f4d9d900

data/lib/kennel/importer.rb

@@ -18,6 +18,7 @@ module Kennel
 
       data = @api.show(model.api_resource, id)
       data = data[resource.to_sym] || data
+      id = data.fetch(:id) # store numerical id returned from the api
       model.normalize({}, data)
       data[:id] = id
       data[:kennel_id] = "pick_something_descriptive"

data/lib/kennel/syncer.rb

@@ -180,9 +180,14 @@ module Kennel
 
     def block_irreversible_partial_updates
       return unless @project_filter
-      return if @update.none? { |_, e, _, diff| e.id && diff.any? { |_, field| TRACKING_FIELDS.include?(field.to_sym) } }
+      return if @update.none? do |_, e, _, diff|
+        e.id && diff.any? do |_, field, old, new = nil|
+          TRACKING_FIELDS.include?(field.to_sym) && tracking_value(old) != tracking_value(new)
+        end
+      end
       raise <<~TEXT
-        Updates with PROJECT= filter should not update #{TRACKING_FIELDS.join("/")} of resources with a set `id:`, since this makes them get deleted by a full update.
+        Updates with PROJECT= filter should not update tracking id in #{TRACKING_FIELDS.join("/")} of resources with a set `id:`,
+        since this makes them get deleted by a full update.
         Remove the `id:` to test them out, which will result in a copy being created and later deleted.
       TEXT
     end
@@ -207,7 +212,11 @@ module Kennel
     end
 
     def tracking_id(a)
-      a[tracking_field(a)].to_s[/-- Managed by kennel (\S+:\S+)/, 1]
+      tracking_value a[tracking_field(a)]
+    end
+
+    def tracking_value(content)
+      content.to_s[/-- Managed by kennel (\S+:\S+)/, 1]
     end
 
     def tracking_field(a)

data/lib/kennel/tasks.rb

@@ -53,7 +53,8 @@ namespace :kennel do
   desc "Covert existing resources to copy-pastable definitions to import existing resources RESOURCE=dash ID=1234"
   task import: :environment do
     resource = ENV["RESOURCE"] || abort("Call with RESOURCE=dash") # TODO: add others
-    id = Integer(ENV["ID"] || abort("Call with ID=1234"))
+    id = ENV["ID"] || abort("Call with ID=1234")
+    id = Integer(id) if id =~ /^\d+$/ # dashboards can have alphanumeric ids
     puts Kennel::Importer.new(Kennel.send(:api)).import(resource, id)
   end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.28.3
+  version: 1.29.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday