kennel 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4b3405787bca44e16c573912811165eaaa78b2389c4b847695a80089c8a158d
-  data.tar.gz: 6d1e508699b35bd4ba4bf534c3cdfc89e4755e8a17668bcfe0cf98e509dd7747
+  metadata.gz: 7114ffae96587ada9ea64441476daf3caf82f1149c877e9529a598651f25eece
+  data.tar.gz: 57986d14b955e2b392f68742e40b2284d8a3d36e67a8bce8d71c57ee35842145
 SHA512:
-  metadata.gz: d5bdbb129ac49aa4d651a87877170f33ddca80ef3065b5eae312da15911020df020aa409e5345f43a1ffdf88728e6577cd7dcd354db5a72c4278d6ef57e44307
-  data.tar.gz: 7ca44d43b7c5dc9df34cdd20489889db9c74bd0a50133936a15f3d7d5680aa03eb393c9a14ffad1ae477398ed7b729ac927323fe01d0e19ea6ff401915f230b5
+  metadata.gz: 0f205bdb359a2ce62a6d4564e89b9e13ebc7faed6ce3e7ec41fdff29a03ea86b9017c8cfcfe1c347ce4f77d7ed895fd5606f6373638cad92a30b5e49d5e5425e
+  data.tar.gz: 6619e5a232fe196deabcf5ef48d80ab01733f93922b842762cdd6baf705b5e72e70193d0f36eedb1bd53e21dd63804701797b6f491547a797b1dc3f24b3d04b2

data/lib/kennel/syncer.rb

@@ -2,6 +2,7 @@
 module Kennel
   class Syncer
     CACHE_FILE = "tmp/cache/details" # keep in sync with .travis.yml caching
+    TRACKING_FIELDS = [:message, :description].freeze
 
     def initialize(api, expected, project: nil)
       @api = api
@@ -28,6 +29,8 @@ module Kennel
     end
 
     def update
+      block_irreversible_partial_changes
+
       @create.each do |_, e|
         reply = @api.create e.class.api_resource, e.as_json
         reply = unnest(e.class.api_resource, reply)
@@ -54,11 +57,11 @@ module Kennel
     def calculate_diff
       @update = []
       @delete = []
-      actual = Progress.progress "Downloading definitions" do
-        filter_by_project! download_definitions
-      end
+      actual = Progress.progress("Downloading definitions") { download_definitions }
 
       Progress.progress "Diffing" do
+        filter_by_project! actual
+
         details_cache do |cache|
           actual.each do |a|
             id = a.fetch(:id)
@@ -66,9 +69,7 @@ module Kennel
             if e = delete_matching_expected(a)
               fill_details(a, cache) if e.class::API_LIST_INCOMPLETE
               diff = e.diff(a)
-              if diff.any?
-                @update << [id, e, a, diff]
-              end
+              @update << [id, e, a, diff] if diff.any?
             elsif tracking_id(a) # was previously managed
               @delete << [id, nil, a]
             end
@@ -168,14 +169,21 @@ module Kennel
       end
     end
 
+    def block_irreversible_partial_changes
+      return unless @project_filter
+      return if
+        @delete.none? &&
+        @update.none? { |_, e, _, diff| e.id && diff.any? { |_, field| TRACKING_FIELDS.include?(field.to_sym) } }
+
+      raise "Partial updates should not modify resources with an id, since these changes are irreversible"
+    end
+
     def filter_by_project!(definitions)
-      if @project_filter
-        definitions.select! do |a|
-          id = tracking_id(a)
-          !id || id.start_with?("#{@project_filter}:")
-        end
+      return unless @project_filter
+      definitions.select! do |a|
+        id = tracking_id(a)
+        !id || id.start_with?("#{@project_filter}:")
       end
-      definitions
     end
 
     def add_tracking_id(e)
@@ -189,7 +197,7 @@ module Kennel
     end
 
     def tracking_field(a)
-      a[:message] ? :message : :description
+      TRACKING_FIELDS.detect { |f| a.key?(f) }
     end
   end
 end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday