dependabot-python 0.98.24 → 0.98.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00bf7e7eced86d3d9da04d2e30bcbb92f0525364864d3629c595c4e5cd56af8c
-  data.tar.gz: 0d47ebf51e6ace9e70d129854fc5675e1df23b635374b99449eb4f9238409d6e
+  metadata.gz: 1aaab07a4e5df91bccc505b908fc7f37702b8edbb79737e541b757e6e34f1bc7
+  data.tar.gz: 990d6385f400beb22a15d24d9e61831422d0eb13d801aa2f3425c6d87b933c30
 SHA512:
-  metadata.gz: bc2d0b454b81d1068e18cfa9602a915a883924605d6931475eac9c1eda66d9671b1bf0cc1aa9f1a739a5965f4ba87565926a89657fd8294ff88fca70fb5324ee
-  data.tar.gz: a8af71c1908e76f26e6b5cd550810557398f2982058734ef6a23c19f527086d49b6413ee9bb9841e6e113fadf000ef2b11abfe7a3c721486cf489c51ef752ee3
+  metadata.gz: 3cd9b354906ec58fd77380a1bb5f6ffb450aa01eab2c38396e7708ba23174e0696350fab6c5633a932981aa0d190789746a63c4337866d5272979e174ba47562
+  data.tar.gz: 065ce3c0dd5afa5f01df0af0e15d6c187a89e0fa491c48bb783fe3d519736527f07e1c942d77bbe1959a3d6283edb3a935c14ead1d964f7acab6d9ad254e7bc1

data/lib/dependabot/python/file_updater/pipfile_file_updater.rb

@@ -6,12 +6,14 @@ require "dependabot/python/requirement_parser"
 require "dependabot/python/file_updater"
 require "dependabot/shared_helpers"
 require "dependabot/python/native_helpers"
+
 module Dependabot
   module Python
     class FileUpdater
       # rubocop:disable Metrics/ClassLength
       class PipfileFileUpdater
         require_relative "pipfile_preparer"
+        require_relative "pipfile_manifest_updater"
         require_relative "setup_file_sanitizer"
 
         attr_reader :dependencies, :dependency_files, :credentials
@@ -39,7 +41,7 @@ module Dependabot
         def fetch_updated_dependency_files
           updated_files = []
 
-          if file_changed?(pipfile)
+          if pipfile.content != updated_pipfile_content
             updated_files <<
               updated_file(file: pipfile, content: updated_pipfile_content)
           end
@@ -58,27 +60,11 @@ module Dependabot
         end
 
         def updated_pipfile_content
-          dependencies.
-            select { |dep| requirement_changed?(pipfile, dep) }.
-            reduce(pipfile.content.dup) do |content, dep|
-              updated_requirement =
-                dep.requirements.find { |r| r[:file] == pipfile.name }.
-                fetch(:requirement)
-
-              old_req =
-                dep.previous_requirements.
-                find { |r| r[:file] == pipfile.name }.
-                fetch(:requirement)
-
-              updated_content =
-                content.gsub(declaration_regex(dep)) do |line|
-                  line.gsub(old_req, updated_requirement)
-                end
-
-              raise "Content did not change!" if content == updated_content
-
-              updated_content
-            end
+          @updated_pipfile_content ||=
+            PipfileManifestUpdater.new(
+              dependencies: dependencies,
+              manifest: pipfile
+            ).updated_manifest_content
         end
 
         def updated_lockfile_content
@@ -430,22 +416,6 @@ module Dependabot
           end
         end
 
-        def declaration_regex(dep)
-          escaped_name = Regexp.escape(dep.name).gsub("\\-", "[-_.]")
-          /(?:^|["'])#{escaped_name}["']?\s*=.*$/i
-        end
-
-        def file_changed?(file)
-          dependencies.any? { |dep| requirement_changed?(file, dep) }
-        end
-
-        def requirement_changed?(file, dependency)
-          changed_requirements =
-            dependency.requirements - dependency.previous_requirements
-
-          changed_requirements.any? { |f| f[:file] == file.name }
-        end
-
         def updated_file(file:, content:)
           updated_file = file.dup
           updated_file.content = content

data/lib/dependabot/python/file_updater/pipfile_manifest_updater.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "toml-rb"
+require "dependabot/python/file_updater"
+
+module Dependabot
+  module Python
+    class FileUpdater
+      class PipfileManifestUpdater
+        def initialize(dependencies:, manifest:)
+          @dependencies = dependencies
+          @manifest = manifest
+        end
+
+        def updated_manifest_content
+          dependencies.
+            select { |dep| requirement_changed?(dep) }.
+            reduce(manifest.content.dup) do |content, dep|
+              updated_requirement =
+                dep.requirements.find { |r| r[:file] == manifest.name }.
+                fetch(:requirement)
+
+              old_req =
+                dep.previous_requirements.
+                find { |r| r[:file] == manifest.name }.
+                fetch(:requirement)
+
+              updated_content =
+                content.gsub(declaration_regex(dep)) do |line|
+                  line.gsub(old_req, updated_requirement)
+                end
+
+              raise "Content did not change!" if content == updated_content
+
+              updated_content
+            end
+        end
+
+        private
+
+        attr_reader :dependencies, :manifest
+
+        def declaration_regex(dep)
+          escaped_name = Regexp.escape(dep.name).gsub("\\-", "[-_.]")
+          /(?:^|["'])#{escaped_name}["']?\s*=.*$/i
+        end
+
+        def requirement_changed?(dependency)
+          changed_requirements =
+            dependency.requirements - dependency.previous_requirements
+
+          changed_requirements.any? { |f| f[:file] == manifest.name }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.98.24
+  version: 0.98.25
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.24
+        version: 0.98.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.24
+        version: 0.98.25
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - lib/dependabot/python/file_updater.rb
 - lib/dependabot/python/file_updater/pip_compile_file_updater.rb
 - lib/dependabot/python/file_updater/pipfile_file_updater.rb
+- lib/dependabot/python/file_updater/pipfile_manifest_updater.rb
 - lib/dependabot/python/file_updater/pipfile_preparer.rb
 - lib/dependabot/python/file_updater/poetry_file_updater.rb
 - lib/dependabot/python/file_updater/pyproject_preparer.rb