dependabot-elm 0.143.3 → 0.145.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7df244087768a8c0791ca6ffb39eb192f0accbbe2cd2038b95fb9bbdb89dd9
-  data.tar.gz: 6946c86ede22d85dd9c05373d486384a4777eecde21f3e47e56decbbe4110902
+  metadata.gz: 5f5291d7f3e150be15567b006b56cff5b2689f6419195ab9bc8395738b99adb6
+  data.tar.gz: d08135ff65a93450c28669ef0f6c2eb6a5e14ba3174fee46135560ce8f1e5e2e
 SHA512:
-  metadata.gz: 9bb141f8504287a116a7e0879ab38ae1afa79f8cfdeaaa199178d479351fcf49ae2dce521fff358a45d24559c97b6212585eb19b4a7f97a581f113f090d1b5a4
-  data.tar.gz: bc3ce466423273c9a3557e995cda320d8e9eeee02e267e74d287e7b69d7e7831dacbf7a842ecdd43ad37395371ddb110dfedb4bc5ed78f6fd640f21f9f907eae
+  metadata.gz: 49b7d18618cd736d83e7ff697772bd7fdfa5877e38487b8d858e29041683e3cbc386eb97aec1f8a5958b56b1724be326701ba5a6d5d88bbf124e80cdd54ca118
+  data.tar.gz: a29ab3cd9e167ce6990968cb93b671547231167fdab0653947d622c2a407da93fc09718f613f8391a5932d57dee0ceb718d8088240482401cd8e16e8bb4474de

data/lib/dependabot/elm/file_fetcher.rb

@@ -7,8 +7,6 @@ module Dependabot
   module Elm
     class FileFetcher < Dependabot::FileFetchers::Base
       def self.required_files_in?(filenames)
-        return true if filenames.include?("elm-package.json")
-
         filenames.include?("elm.json")
       end
 
@@ -21,7 +19,6 @@ module Dependabot
       def fetch_files
         fetched_files = []
 
-        fetched_files << elm_package if elm_package
         fetched_files << elm_json if elm_json
 
         # NOTE: We *do not* fetch the exact-dependencies.json file, as it is
@@ -32,17 +29,13 @@ module Dependabot
       end
 
       def check_required_files_present
-        return if elm_package || elm_json
+        return if elm_json
 
         path = Pathname.new(File.join(directory, "elm.json")).
                cleanpath.to_path
         raise Dependabot::DependencyFileNotFound, path
       end
 
-      def elm_package
-        @elm_package ||= fetch_file_if_present("elm-package.json")
-      end
-
       def elm_json
         @elm_json ||= fetch_file_if_present("elm.json")
       end

data/lib/dependabot/elm/file_parser.rb

@@ -16,7 +16,6 @@ module Dependabot
       def parse
         dependency_set = DependencySet.new
 
-        dependency_set += elm_package_dependencies if elm_package
         dependency_set += elm_json_dependencies if elm_json
 
         dependency_set.dependencies.sort_by(&:name)
@@ -24,27 +23,6 @@ module Dependabot
 
       private
 
-      def elm_package_dependencies
-        dependency_set = DependencySet.new
-
-        parsed_package_file.fetch("dependencies").each do |name, req|
-          dependency_set <<
-            Dependency.new(
-              name: name,
-              version: version_for(req)&.to_s,
-              requirements: [{
-                requirement: req, # 4.0 <= v <= 4.0
-                groups: [], # we don't have this (its dev vs non-dev)
-                source: nil, # elm-package only has elm-package sources
-                file: "elm-package.json"
-              }],
-              package_manager: "elm"
-            )
-        end
-
-        dependency_set
-      end
-
       # For docs on elm.json, see:
       # https://github.com/elm/compiler/blob/master/docs/elm.json/application.md
       # https://github.com/elm/compiler/blob/master/docs/elm.json/package.md
@@ -98,9 +76,9 @@ module Dependabot
       end
 
       def check_required_files
-        return if elm_json || elm_package
+        return if elm_json
 
-        raise "No elm.json or elm-package.json!"
+        raise "No elm.json"
       end
 
       def version_for(version_requirement)
@@ -111,22 +89,12 @@ module Dependabot
         req.requirements.first.last
       end
 
-      def parsed_package_file
-        @parsed_package_file ||= JSON.parse(elm_package.content)
-      rescue JSON::ParserError
-        raise Dependabot::DependencyFileNotParseable, elm_package.path
-      end
-
       def parsed_elm_json
         @parsed_elm_json ||= JSON.parse(elm_json.content)
       rescue JSON::ParserError
         raise Dependabot::DependencyFileNotParseable, elm_json.path
       end
 
-      def elm_package
-        @elm_package ||= get_original_file("elm-package.json")
-      end
-
       def elm_json
         @elm_json ||= get_original_file("elm.json")
       end

data/lib/dependabot/elm/file_updater.rb

@@ -6,12 +6,10 @@ require "dependabot/file_updaters/base"
 module Dependabot
   module Elm
     class FileUpdater < Dependabot::FileUpdaters::Base
-      require_relative "file_updater/elm_package_updater"
       require_relative "file_updater/elm_json_updater"
 
       def self.updated_files_regex
         [
-          /^elm-package\.json$/,
           /^elm\.json$/
         ]
       end
@@ -19,16 +17,6 @@ module Dependabot
       def updated_dependency_files
         updated_files = []
 
-        elm_package_files.each do |file|
-          next unless file_changed?(file)
-
-          updated_files <<
-            updated_file(
-              file: file,
-              content: updated_elm_package_content(file)
-            )
-        end
-
         elm_json_files.each do |file|
           next unless file_changed?(file)
 
@@ -47,16 +35,9 @@ module Dependabot
       private
 
       def check_required_files
-        return if elm_json_files.any? || elm_package_files.any?
-
-        raise "No elm.json or elm-package.json!"
-      end
+        return if elm_json_files.any?
 
-      def updated_elm_package_content(file)
-        ElmPackageUpdater.new(
-          dependencies: dependencies,
-          elm_package_file: file
-        ).updated_elm_package_file_content
+        raise "No elm.json"
       end
 
       def updated_elm_json_content(file)
@@ -66,10 +47,6 @@ module Dependabot
         ).updated_content
       end
 
-      def elm_package_files
-        dependency_files.select { |f| f.name.end_with?("elm-package.json") }
-      end
-
       def elm_json_files
         dependency_files.select { |f| f.name.end_with?("elm.json") }
       end

data/lib/dependabot/elm/update_checker.rb

@@ -10,7 +10,6 @@ module Dependabot
   module Elm
     class UpdateChecker < Dependabot::UpdateCheckers::Base
       require_relative "update_checker/requirements_updater"
-      require_relative "update_checker/elm_18_version_resolver"
       require_relative "update_checker/elm_19_version_resolver"
 
       def latest_version
@@ -55,17 +54,15 @@ module Dependabot
 
       def version_resolver
         @version_resolver ||=
-          if dependency.requirements.any? { |r| r.fetch(:file) == "elm.json" }
+          begin
+            unless dependency.requirements.any? { |r| r.fetch(:file) == "elm.json" }
+              raise Dependabot::DependencyFileNotResolvable, "No elm.json found"
+            end
+
             Elm19VersionResolver.new(
               dependency: dependency,
               dependency_files: dependency_files
             )
-          else
-            Elm18VersionResolver.new(
-              dependency: dependency,
-              dependency_files: dependency_files,
-              candidate_versions: candidate_versions
-            )
           end
       end
 

data/lib/dependabot/elm/update_checker/elm_19_version_resolver.rb

@@ -29,7 +29,7 @@ module Dependabot
           return current_version if unlock_requirement == :none
 
           # Otherwise, we gotta check a few conditions to see if bumping
-          # wouldn't also bump other deps in elm-package.json
+          # wouldn't also bump other deps in elm.json
           fetch_latest_resolvable_version(unlock_requirement)
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-elm
 version: !ruby/object:Gem::Version
-  version: 0.143.3
+  version: 0.145.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-05 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.143.3
+        version: 0.145.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.143.3
+        version: 0.145.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -190,12 +190,10 @@ files:
 - lib/dependabot/elm/file_parser.rb
 - lib/dependabot/elm/file_updater.rb
 - lib/dependabot/elm/file_updater/elm_json_updater.rb
-- lib/dependabot/elm/file_updater/elm_package_updater.rb
 - lib/dependabot/elm/metadata_finder.rb
 - lib/dependabot/elm/requirement.rb
 - lib/dependabot/elm/update_checker.rb
 - lib/dependabot/elm/update_checker/cli_parser.rb
-- lib/dependabot/elm/update_checker/elm_18_version_resolver.rb
 - lib/dependabot/elm/update_checker/elm_19_version_resolver.rb
 - lib/dependabot/elm/update_checker/requirements_updater.rb
 - lib/dependabot/elm/version.rb

data/lib/dependabot/elm/file_updater/elm_package_updater.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-require "dependabot/elm/file_updater"
-
-module Dependabot
-  module Elm
-    class FileUpdater
-      class ElmPackageUpdater
-        def initialize(elm_package_file:, dependencies:)
-          @elm_package_file = elm_package_file
-          @dependencies = dependencies
-        end
-
-        def updated_elm_package_file_content
-          dependencies.
-            select { |dep| requirement_changed?(elm_package_file, dep) }.
-            reduce(elm_package_file.content.dup) do |content, dep|
-              updated_content = content
-
-              updated_content = update_requirement(
-                content: updated_content,
-                filename: elm_package_file.name,
-                dependency: dep
-              )
-
-              next updated_content unless content == updated_content
-
-              raise "Expected content to change!"
-            end
-        end
-
-        private
-
-        attr_reader :elm_package_file, :dependencies
-
-        def requirement_changed?(file, dependency)
-          changed_requirements =
-            dependency.requirements - dependency.previous_requirements
-
-          changed_requirements.any? { |f| f[:file] == file.name }
-        end
-
-        def update_requirement(content:, filename:, dependency:)
-          updated_req =
-            dependency.requirements.
-            find { |r| r.fetch(:file) == filename }.
-            fetch(:requirement)
-
-          old_req =
-            dependency.previous_requirements.
-            find { |r| r.fetch(:file) == filename }.
-            fetch(:requirement)
-
-          return content unless old_req
-
-          dep = dependency
-          regex =
-            /"#{Regexp.quote(dep.name)}"\s*:\s+"#{Regexp.quote(old_req)}"/
-
-          content.gsub(regex) do |declaration|
-            declaration.gsub(%("#{old_req}"), %("#{updated_req}"))
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dependabot/elm/update_checker/elm_18_version_resolver.rb

@@ -1,238 +0,0 @@
-# frozen_string_literal: true
-
-require "open3"
-require "dependabot/shared_helpers"
-require "dependabot/errors"
-require "dependabot/elm/file_parser"
-require "dependabot/elm/update_checker"
-require "dependabot/elm/update_checker/cli_parser"
-require "dependabot/elm/update_checker/requirements_updater"
-require "dependabot/elm/requirement"
-
-module Dependabot
-  module Elm
-    class UpdateChecker
-      class Elm18VersionResolver
-        class UnrecoverableState < StandardError; end
-
-        def initialize(dependency:, dependency_files:, candidate_versions:)
-          @dependency = dependency
-          @dependency_files = dependency_files
-          @candidate_versions = candidate_versions
-        end
-
-        def latest_resolvable_version(unlock_requirement:)
-          raise "Invalid unlock setting: #{unlock_requirement}" unless %i(none own all).include?(unlock_requirement)
-
-          # Elm has no lockfile, so we will never create an update PR if
-          # unlock requirements are `none`. Just return the current version.
-          return current_version if unlock_requirement == :none
-
-          # Otherwise, we gotta check a few conditions to see if bumping
-          # wouldn't also bump other deps in elm-package.json
-          candidate_versions.sort.reverse_each do |version|
-            return version if can_update?(version, unlock_requirement)
-          end
-
-          # Fall back to returning the dependency's current version, which is
-          # presumed to be resolvable
-          current_version
-        end
-
-        def updated_dependencies_after_full_unlock
-          version = latest_resolvable_version(unlock_requirement: :all)
-          deps_after_install = fetch_install_metadata(target_version: version)
-
-          original_dependency_details.map do |original_dep|
-            new_version = deps_after_install.fetch(original_dep.name)
-
-            old_reqs = original_dep.requirements.map do |req|
-              requirement_class.new(req[:requirement])
-            end
-
-            next if old_reqs.all? { |req| req.satisfied_by?(new_version) }
-
-            new_requirements =
-              RequirementsUpdater.new(
-                requirements: original_dep.requirements,
-                latest_resolvable_version: new_version.to_s
-              ).updated_requirements
-
-            Dependency.new(
-              name: original_dep.name,
-              version: new_version.to_s,
-              requirements: new_requirements,
-              previous_version: original_dep.version,
-              previous_requirements: original_dep.requirements,
-              package_manager: original_dep.package_manager
-            )
-          end.compact
-        end
-
-        private
-
-        attr_reader :dependency, :dependency_files, :candidate_versions
-
-        def can_update?(version, unlock_requirement)
-          deps_after_install = fetch_install_metadata(target_version: version)
-
-          result = check_install_result(deps_after_install, version)
-
-          # If the install was clean then we can definitely update
-          return true if result == :clean_bump
-
-          # Otherwise, we can still update if the result was a forced full
-          # unlock and we're allowed to unlock other requirements
-          return false unless unlock_requirement == :all
-
-          result == :forced_full_unlock_bump
-        end
-
-        def check_install_result(deps_after_install, target_version)
-          # This can go one of 5 ways:
-          # 1) We bump our dep and no other dep is bumped
-          # 2) We bump our dep and another dep is bumped too
-          #    Scenario: NoRedInk/datetimepicker bump to 3.0.2 also
-          #              bumps elm-css to 14
-          # 3) We bump our dep but actually elm-package doesn't bump it
-          #    Scenario: elm-css bump to 14 but datetimepicker is at 3.0.1
-          # 4) We bump our dep but elm-package just says
-          #    "Packages configured successfully!"
-          #    Narrator: they weren't
-          #    Scenario: impossible dependency (i.e. elm-css 999.999.999)
-          #              a <= v < b where a is greater than latest version
-          # 5) We bump our dep but elm-package blows up (not handled here)
-          #    Scenario: rtfeldman/elm-css 14 && rtfeldman/hashed-class 1.0.0
-          #              I'm not sure what's different from this scenario
-          #              to 3), why it blows up instead of just rolling
-          #              elm-css back to version 9 which is what
-          #              hashed-class requires
-
-          # 4) We bump our dep but elm-package just says
-          #    "Packages configured successfully!"
-          return :empty_elm_stuff_bug if deps_after_install.empty?
-
-          version_after_install = deps_after_install.fetch(dependency.name)
-
-          # 3) We bump our dep but actually elm-package doesn't bump it
-          return :downgrade_bug if version_after_install < target_version
-
-          other_top_level_deps_bumped =
-            original_dependency_details.
-            reject { |dep| dep.name == dependency.name }.
-            select do |dep|
-              reqs = dep.requirements.map { |r| r.fetch(:requirement) }
-              reqs = reqs.map { |r| requirement_class.new(r) }
-              reqs.any? { |r| !r.satisfied_by?(deps_after_install[dep.name]) }
-            end
-
-          # 2) We bump our dep and another dep is bumped
-          return :forced_full_unlock_bump if other_top_level_deps_bumped.any?
-
-          # 1) We bump our dep and no other dep is bumped
-          :clean_bump
-        end
-
-        def fetch_install_metadata(target_version:)
-          @install_cache ||= {}
-          @install_cache[target_version.to_s] ||=
-            SharedHelpers.in_a_temporary_directory do
-              write_temporary_dependency_files(target_version: target_version)
-
-              # Elm package install outputs a preview of the actions to be
-              # performed. We can use this preview to calculate whether it
-              # would do anything funny
-              command = "yes n | elm-package install"
-              response = run_shell_command(command)
-
-              deps_after_install = CliParser.decode_install_preview(response)
-
-              deps_after_install
-            rescue SharedHelpers::HelperSubprocessFailed => e
-              # 5) We bump our dep but elm-package blows up
-              handle_elm_package_errors(e)
-            end
-        end
-
-        def run_shell_command(command)
-          start = Time.now
-          stdout, process = Open3.capture2e(command)
-          time_taken = Time.now - start
-
-          # Raise an error with the output from the shell session if Elm
-          # returns a non-zero status
-          return stdout if process.success?
-
-          raise SharedHelpers::HelperSubprocessFailed.new(
-            message: stdout,
-            error_context: {
-              command: command,
-              time_taken: time_taken,
-              process_exit_value: process.to_s
-            }
-          )
-        end
-
-        def handle_elm_package_errors(error)
-          if error.message.include?("I cannot find a set of packages that " \
-                                    "works with your constraints")
-            raise Dependabot::DependencyFileNotResolvable, error.message
-          end
-
-          if error.message.include?("You are using Elm 0.18.0, but")
-            raise Dependabot::DependencyFileNotResolvable, error.message
-          end
-
-          # I don't know any other errors
-          raise error
-        end
-
-        def write_temporary_dependency_files(target_version:)
-          dependency_files.each do |file|
-            path = file.name
-            FileUtils.mkdir_p(Pathname.new(path).dirname)
-
-            File.write(
-              path,
-              updated_elm_package_content(file.content, target_version)
-            )
-          end
-        end
-
-        def updated_elm_package_content(content, version)
-          json = JSON.parse(content)
-
-          new_requirement = RequirementsUpdater.new(
-            requirements: dependency.requirements,
-            latest_resolvable_version: version.to_s
-          ).updated_requirements.first[:requirement]
-
-          json["dependencies"][dependency.name] = new_requirement
-          JSON.dump(json)
-        end
-
-        def original_dependency_details
-          @original_dependency_details ||=
-            Elm::FileParser.new(
-              dependency_files: dependency_files,
-              source: nil
-            ).parse
-        end
-
-        def current_version
-          return unless dependency.version
-
-          version_class.new(dependency.version)
-        end
-
-        def version_class
-          Elm::Version
-        end
-
-        def requirement_class
-          Elm::Requirement
-        end
-      end
-    end
-  end
-end