dependabot-docker 0.94.8 → 0.94.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 753988736462e843e5f711cb9c34ff2977df1c0d34a671354df0bbcb8e754b15
-  data.tar.gz: b6689d77ec4eb42a48c458f8f63a0dba99b2103e4090d6979bc06f796d95dda2
+  metadata.gz: 13e409eeba36e4d42b318143216136e675ee1cd62c2e0de874dd07a0c620e373
+  data.tar.gz: 70774b2acef5376b1c4ca59917f1c880a78b6b1566b5e54fccc81572dfd92643
 SHA512:
-  metadata.gz: ccbd3cff822e0dc23ba3ba23a63c4042400aed408584e0f920692d26c2ae159edb114648bf0bc6acfc57625db9c0466e4bbeb3ce489d93f91f54199796f2988b
-  data.tar.gz: a2cc7f775cff5727419b65c80566a4d3d885267067abb0ffe7dbeaf69cf37bfa3cebd784739a60f057fcc3b7a69ea342f501b06b8b4fbbda13587f8c9f0df0c8
+  metadata.gz: 2c123caad2ea723176abb21a4bd76710be7fdb85df697c5ca34134e1a6441f1361e22f6e6d16cc1ada11a74f698099b776e7cfc9639c5b086435a595814ea75b
+  data.tar.gz: 32206ce2b84aed0fd426ec06dac8389a91c91d3ed0da57776fb999b96b7c93f12d179d00c8b825203a20862b13c076e28dee4dd7fe3d28c9b5c9297e03019d29

data/lib/dependabot/docker/update_checker.rb

@@ -13,11 +13,18 @@ module Dependabot
     class UpdateChecker < Dependabot::UpdateCheckers::Base
       VERSION_REGEX = /(?<version>[0-9]+(?:\.[a-zA-Z0-9]+)*)/.freeze
       VERSION_WITH_SUFFIX =
-        /^#{VERSION_REGEX}(?<affix>-[a-z0-9.\-]+)?$/.freeze
+        /^#{VERSION_REGEX}(?<suffix>-[a-z0-9.\-]+)?$/.freeze
       VERSION_WITH_PREFIX =
-        /^(?<affix>[a-z0-9.\-]+-)?#{VERSION_REGEX}$/.freeze
+        /^(?<prefix>[a-z0-9.\-]+-)?#{VERSION_REGEX}$/.freeze
+      VERSION_WITH_PREFIX_AND_SUFFIX =
+        /^(?<prefix>[a-z\-]+-)?#{VERSION_REGEX}(?<suffix>-[a-z\-]+)?$/.
+        freeze
       NAME_WITH_VERSION =
-        /#{VERSION_WITH_PREFIX}|#{VERSION_WITH_SUFFIX}/.freeze
+        /
+          #{VERSION_WITH_PREFIX}|
+          #{VERSION_WITH_SUFFIX}|
+          #{VERSION_WITH_PREFIX_AND_SUFFIX}
+        /x.freeze
 
       def latest_version
         @latest_version ||= fetch_latest_version
@@ -121,11 +128,13 @@ module Dependabot
       end
 
       def comparable_tags_from_registry
-        original_affix = affix_of(dependency.version)
+        original_prefix = prefix_of(dependency.version)
+        original_suffix = suffix_of(dependency.version)
 
         tags_from_registry.
           select { |tag| tag.match?(NAME_WITH_VERSION) }.
-          select { |tag| affix_of(tag) == original_affix }.
+          select { |tag| prefix_of(tag) == original_prefix }.
+          select { |tag| suffix_of(tag) == original_suffix }.
           reject { |tag| commit_sha_suffix?(tag) }
       end
 
@@ -165,9 +174,10 @@ module Dependabot
         return false unless numeric_version_from(tag)
         return true if tag == numeric_version_from(tag)
 
-        # .NET tags are suffixed with -sdk. There may be other cases we need
-        # to consider in future, too.
-        tag == numeric_version_from(tag) + "-sdk"
+        # .NET tags are suffixed with -sdk
+        return true if tag == numeric_version_from(tag) + "-sdk"
+
+        tag == "jdk-" + numeric_version_from(tag)
       end
 
       def updated_digest
@@ -220,8 +230,12 @@ module Dependabot
         [RestClient::Exceptions::Timeout, DockerRegistry2::NotFound]
       end
 
-      def affix_of(tag)
-        tag.match(NAME_WITH_VERSION).named_captures.fetch("affix")
+      def prefix_of(tag)
+        tag.match(NAME_WITH_VERSION).named_captures.fetch("prefix")
+      end
+
+      def suffix_of(tag)
+        tag.match(NAME_WITH_VERSION).named_captures.fetch("suffix")
       end
 
       def prerelease?(tag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-docker
 version: !ruby/object:Gem::Version
-  version: 0.94.8
+  version: 0.94.9
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.94.8
+        version: 0.94.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.94.8
+        version: 0.94.9
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement