dependabot-docker 0.111.0 → 0.111.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a88e707d7239c7851a7023ecbbe879f5099c09ff13a1b676462cb86e215bc5f0
-  data.tar.gz: 9a2af4af8dcbaf3afc68ba7a28db2e64359a24a57ecb75a8d2b331ed99c36594
+  metadata.gz: 1b64a3fd9b6612178f92d0fc50d982d1d6e36bc096e3e1120bc84267a1dbd70a
+  data.tar.gz: f6d26b730c5361e6d1882c2fbaade11281e1bbfe46caa9b54d36c63e45857f13
 SHA512:
-  metadata.gz: f49255d9e6d3e9c4d6432ad935fc62cdf303c5dceec13fb912994375d03f69296ba217b37a8fc4d01107e16c90797601bd86371342c23e3f874a9a401ff9ac88
-  data.tar.gz: 94c3fc5bdd4bb14f594cf17f27a2a237a75415feb3d8af88e8960e1a6960584d7c261fe99d656dde209000dfb264a4879f20b2f6176a5ff86bfc97054522b1d8
+  metadata.gz: 3415fc685691295190d3739c34943dccabec88a72a540392cbdb297cefe2833c9d805ce35157b02b3970dabc9ccf8c934e1bc40a37d2a7e85817d5ff7044e1e5
+  data.tar.gz: 702024ab2a577d453181827d77f6e92cee3d3562957ec6d80066867b520e1f308c580fe41e619496ff44335151e64871a06fbf846d52d6ed4aa7cd256ab6a384

data/lib/dependabot/docker/update_checker.rb

@@ -12,11 +12,12 @@ require "dependabot/docker/utils/credentials_finder"
 module Dependabot
   module Docker
     class UpdateChecker < Dependabot::UpdateCheckers::Base
-      VERSION_REGEX = /v?(?<version>[0-9]+(?:\.[a-zA-Z0-9]+)*)/.freeze
-      VERSION_WITH_SFX = /^#{VERSION_REGEX}(?<suffix>-[a-z0-9.\-]+)?$/.freeze
-      VERSION_WITH_PFX = /^(?<prefix>[a-z0-9.\-]+-)?#{VERSION_REGEX}$/.freeze
+      VERSION_REGEX =
+        /v?(?<version>[0-9]+(?:(?:\.[a-z0-9]+)|(?:-(?:kb)?[0-9]+))*)/i.freeze
+      VERSION_WITH_SFX = /^#{VERSION_REGEX}(?<suffix>-[a-z0-9.\-]+)?$/i.freeze
+      VERSION_WITH_PFX = /^(?<prefix>[a-z0-9.\-]+-)?#{VERSION_REGEX}$/i.freeze
       VERSION_WITH_PFX_AND_SFX =
-        /^(?<prefix>[a-z\-]+-)?#{VERSION_REGEX}(?<suffix>-[a-z\-]+)?$/.
+        /^(?<prefix>[a-z\-]+-)?#{VERSION_REGEX}(?<suffix>-[a-z\-]+)?$/i.
         freeze
       NAME_WITH_VERSION =
         /
@@ -130,11 +131,13 @@ module Dependabot
       def comparable_tags_from_registry
         original_prefix = prefix_of(dependency.version)
         original_suffix = suffix_of(dependency.version)
+        original_format = format_of(dependency.version)
 
         tags_from_registry.
           select { |tag| tag.match?(NAME_WITH_VERSION) }.
           select { |tag| prefix_of(tag) == original_prefix }.
           select { |tag| suffix_of(tag) == original_suffix }.
+          select { |tag| format_of(tag) == original_format }.
           reject { |tag| commit_sha_suffix?(tag) }
       end
 
@@ -251,8 +254,19 @@ module Dependabot
         tag.match(NAME_WITH_VERSION).named_captures.fetch("suffix")
       end
 
+      def format_of(tag)
+        version = numeric_version_from(tag)
+
+        return :year_month if version.match?(/^[12]\d{3}(?:[.\-]|$)/)
+        return :year_month_day if version.match?(/^[12]\d{5}(?:[.\-]|$)/)
+
+        :normal
+      end
+
       def prerelease?(tag)
-        return true if numeric_version_from(tag).match?(/[a-zA-Z]/)
+        if numeric_version_from(tag).gsub(/kb/i, "").match?(/[a-zA-Z]/)
+          return true
+        end
 
         # If we're dealing with a numeric version we can compare it against
         # the digest for the `latest` tag.

metadata

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