skull_island 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff79cef47f9764701711c87bef82cded9cc3b7e58b4a21bc245042dbb77600f
-  data.tar.gz: 6f433b14ac328bd48fba2c7eadfdeff256b5f1c97c3f298665c2f25fc1a14327
+  metadata.gz: b70ddd0dfb6534cdcbf0c362ac9a8329123bff76de67497e107f968b1679cc28
+  data.tar.gz: 1d03c93f9fe6cdee72449e30febe26b59932011e8c55e68807ea9c5937a96729
 SHA512:
-  metadata.gz: f2422ea1ebd93c4b3f62c8b9229ca8bb8277abef46c036a79ac2a35fa7cd29e4c829a5eaea3df5917c74f1758ed73310f39580c7ce91617574e2127bd118c82e
-  data.tar.gz: 9b6026082b5d2811617cda731a4887eb1d54a89935f3c78a06ecce61a399b9b20d432613510428edab0e99372bcc5b4f359842f2ea4ccbc18fee7615bbb825e8
+  metadata.gz: e3c0fddd3e23b2e7d0f6577900cb2865212712d7d2b3774c465a7562279a96416a0e142180281306fe93689ee600a8700b9bb85a5fadfb2cfab0ed9ef750fd89
+  data.tar.gz: 81fc8486b6afcdd90d3641eb63ef64992b87dd57fd726e414a3359b8437df4d7e7d1597aa1484387fa3473c7bd4e9c1ba952b57f60566ee467649aa8f61a9918

data/.rubocop.yml

@@ -4,9 +4,21 @@ AllCops:
 Metrics/MethodLength:
   Max: 50
 
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
 Layout/LineLength:
   Max: 100
 
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
 Metrics/ClassLength:
   Max: 190
 
@@ -18,6 +30,9 @@ Metrics/ModuleLength:
 Metrics/CyclomaticComplexity:
   Max: 7
 
+Metrics/ParameterLists:
+  Max: 6
+
 Metrics/PerceivedComplexity:
   Exclude:
     - 'lib/skull_island/cli.rb'
@@ -40,6 +55,21 @@ Security/Eval:
   Exclude:
     - 'lib/skull_island/cli.rb'
 
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: false
+
 Style/NumericLiterals:
   Exclude:
     - 'spec/**/*_spec.rb'
+
+Style/SlicingWithRange:
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skull_island (2.0.3)
+    skull_island (2.0.4)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)
@@ -13,16 +13,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.4.0)
+    activesupport (5.2.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
-    backports (3.16.1)
+    concurrent-ruby (1.1.6)
     coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    deepsort (0.4.3)
+    deepsort (0.4.5)
     diff-lcs (1.3)
     docile (1.3.2)
     domain_name (0.5.20190701)
@@ -30,45 +36,49 @@ GEM
     erubi (1.9.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    faraday (0.17.3)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
     ffi (1.12.2)
-    gh (0.15.1)
-      addressable (~> 2.4.0)
-      backports
-      faraday (~> 0.8)
+    gh (0.17.0)
+      activesupport (~> 5.0)
+      addressable (~> 2.4)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
       multi_json (~> 1.0)
       net-http-persistent (~> 2.9)
       net-http-pipeline
-    highline (1.7.10)
+    highline (2.0.3)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    jaro_winkler (1.5.4)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
     json (2.3.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     linguistics (2.1.0)
       loggability (~> 0.11)
-    loggability (0.15.1)
+    loggability (0.17.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
+    minitest (5.14.1)
     multi_json (1.14.1)
     multipart-post (2.1.1)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     netrc (0.11.0)
     parallel (1.19.1)
-    parser (2.7.0.3)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
+    public_suffix (4.0.5)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
     rainbow (3.0.0)
-    rake (12.3.3)
+    rake (13.0.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -79,52 +89,54 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.1)
+    simplecov-html (0.12.2)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
-    tins (1.24.1)
+    thread_safe (0.3.6)
+    tins (1.25.0)
       sync
-    travis (1.8.10)
-      backports
-      faraday (~> 0.9)
-      faraday_middleware (~> 0.9, >= 0.9.1)
+    travis (1.9.1)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
       gh (~> 0.13)
-      highline (~> 1.6)
-      launchy (~> 2.1)
+      highline (~> 2.0)
+      json (~> 2.3)
+      launchy (~> 2.1, < 2.5.0)
       pusher-client (~> 0.4)
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.1)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
     websocket (1.2.8)
     will_paginate (3.3.0)
-    yard (0.9.24)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -132,7 +144,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   coveralls (~> 0.7)
-  rake (~> 12.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.50)
   simplecov (~> 0.17)
@@ -141,4 +153,4 @@ DEPENDENCIES
   yard (~> 0.9.20)
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/lib/skull_island/resource.rb

@@ -179,8 +179,10 @@ module SkullIsland
       )
     end
 
-    def self.cleanup_except(project, keep_these)
-      where(:project, project).reject { |res| keep_these.include?(res.id) }.map do |res|
+    def self.cleanup_except(project, keep_these, from_these = nil)
+      old_resources = from_these || where(:project, project)
+
+      old_resources.reject { |res| keep_these.include?(res.id) }.map do |res|
         puts "[WARN] ! Removing #{name} (#{res.id})"
         res.destroy
       end

data/lib/skull_island/resources/ca_certificate.rb

@@ -29,6 +29,8 @@ module SkullIsland
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
 
       def export(options = {})

data/lib/skull_island/resources/certificate.rb

@@ -35,6 +35,8 @@ module SkullIsland
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity

data/lib/skull_island/resources/consumer.rb

@@ -95,6 +95,8 @@ module SkullIsland
         # rubocop:enable Metrics/BlockLength
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/MethodLength
 

data/lib/skull_island/resources/plugin.rb

@@ -43,6 +43,8 @@ module SkullIsland
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity

data/lib/skull_island/resources/route.rb

@@ -31,7 +31,8 @@ module SkullIsland
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       # rubocop:disable Metrics/AbcSize
-      def self.batch_import(data, verbose: false, test: false, project: nil, time: nil)
+      # rubocop:disable Layout/LineLength
+      def self.batch_import(data, verbose: false, test: false, project: nil, time: nil, cleanup: true)
         raise(Exceptions::InvalidArguments) unless data.is_a?(Array)
 
         known_ids = []
@@ -59,11 +60,14 @@ module SkullIsland
           known_ids << resource.id
         end
 
-        cleanup_except(project, known_ids) if project
+        cleanup_except(project, known_ids) if project && cleanup
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
       # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Layout/LineLength
 
       # Provides a collection of related {Plugin} instances
       def plugins

data/lib/skull_island/resources/service.rb

@@ -49,16 +49,23 @@ module SkullIsland
           resource.import_update_or_skip(index: index, verbose: verbose, test: test)
           known_ids << resource.id
 
-          Route.batch_import(
+          previous_routes = resource.routes.dup
+
+          added_routes = Route.batch_import(
             (rdata['routes'] || []).map { |r| r.merge('service' => { 'id' => resource.id }) },
             verbose: verbose,
             test: test,
             project: project,
-            time: time
+            time: time,
+            cleanup: false
           )
+
+          Route.cleanup_except(project, added_routes, previous_routes)
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
@@ -116,7 +123,7 @@ module SkullIsland
       def modified_existing?
         return false unless new?
 
-        # Find routes of the same name
+        # Find services of the same name
         same_name = self.class.where(:name, name)
 
         existing = same_name.size == 1 ? same_name.first : nil

data/lib/skull_island/resources/upstream.rb

@@ -65,6 +65,8 @@ module SkullIsland
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity

data/lib/skull_island/resources/upstream_target.rb

@@ -38,6 +38,8 @@ module SkullIsland
         end
 
         cleanup_except(project, known_ids) if project
+
+        known_ids
       end
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity

data/lib/skull_island/version.rb

@@ -4,6 +4,6 @@ module SkullIsland
   VERSION = [
     2, # Major
     0, # Minor
-    3  # Patch
+    4  # Patch
   ].join('.')
 end

data/skull_island.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'coveralls', '~> 0.7'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.50'
   spec.add_development_dependency 'simplecov', '~> 0.17'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepsort
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement