dependabot-composer 0.95.74 → 0.95.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92a05729def7f019bc964d5333b38b573b5b8478028a2a44a9953acfd2deffe
-  data.tar.gz: c60b2982c94740c7802e7eb0cec74d605631481ebe36f557a4cbb1fbadff9056
+  metadata.gz: 66f8f0f48c82bfe06df50374e55e36610b343fd1cbc692520ef49a058c7b1b7c
+  data.tar.gz: e4e4344100d8089d1af78b4833b649dfc6f895e7b59adc3bfeb965294ee6df71
 SHA512:
-  metadata.gz: 568b043307a98f73c33309f1d857c43fe151ad1b7d1848e662658d6674c946eb32cb76950803d7bc48ee04e151b69d6317bcf808a80d67a54beea91ec1cce9d6
-  data.tar.gz: 6cf32d774149c5ffcac7da389157337ea40b706ae8ef245f15e824abbdb55942b6c8e2e4621e6b35d500fe4968df7e0784ad1b09fff7fa680c04413b15128064
+  metadata.gz: d2b73d4af31663b2e92165ed5d7efbf091a054e210416aa327dc4b7137e9a42a4ecac48a2c53c429bdaeba935d02c305f14214c2dfc3707e8e337892d8dc195f
+  data.tar.gz: 458e89c8aa6bd407e00d9167b4c425e20b74a26c6687cfbbff912cf1a0ac18c32677e2cc1b0a2bcfa60fe693c63f0923089ff3df1505563616cddb9b5bb11dc0

data/lib/dependabot/composer/file_fetcher.rb

@@ -6,6 +6,8 @@ require "dependabot/file_fetchers/base"
 module Dependabot
   module Composer
     class FileFetcher < Dependabot::FileFetchers::Base
+      require_relative "file_fetcher/path_dependency_builder"
+
       def self.required_files_in?(filenames)
         filenames.include?("composer.json")
       end
@@ -57,12 +59,13 @@ module Dependabot
                 begin
                   composer_json_files << fetch_file_with_root_fallback(file)
                 rescue Dependabot::DependencyFileNotFound
-                  # Collected, but currently ignored
-                  unfetchable_deps << file
+                  unfetchable_deps << path
                 end
               end
             end
 
+            composer_json_files += build_unfetchable_deps(unfetchable_deps)
+
             # Mark the path dependencies as support files - we don't currently
             # parse or update them.
             composer_json_files.tap do |files|
@@ -81,6 +84,16 @@ module Dependabot
         raise Dependabot::DependencyFileNotParseable, composer_json.path
       end
 
+      def build_unfetchable_deps(unfetchable_deps)
+        unfetchable_deps.map do |path|
+          PathDependencyBuilder.new(
+            path: path,
+            directory: directory,
+            lockfile: composer_lock
+          ).dependency_file
+        end.compact
+      end
+
       def expand_path(path)
         repo_contents(dir: path.gsub(/\*$/, "")).
           select { |file| file.type == "dir" }.

data/lib/dependabot/composer/file_fetcher/path_dependency_builder.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "json"
+require "dependabot/dependency_file"
+require "dependabot/composer/file_fetcher"
+require "dependabot/composer/file_parser"
+
+module Dependabot
+  module Composer
+    class FileFetcher
+      class PathDependencyBuilder
+        def initialize(path:, directory:, lockfile:)
+          @path = path
+          @directory = directory
+          @lockfile = lockfile
+        end
+
+        def dependency_file
+          filename = File.join(path, "composer.json")
+
+          # Current we just return `nil` if a path dependency can't be built.
+          # In future we may wish to change that to a raise. (We'll get errors
+          # in the UpdateChecker or FileUpdater if we fail to build files.)
+          built_content = build_path_dep_content
+          return unless built_content
+
+          DependencyFile.new(
+            name: Pathname.new(filename).cleanpath.to_path,
+            content: built_content,
+            directory: directory,
+            support_file: true
+          )
+        end
+
+        private
+
+        attr_reader :path, :lockfile, :directory
+
+        def details_from_lockfile
+          keys = FileParser::DEPENDENCY_GROUP_KEYS.
+                 map { |h| h.fetch(:lockfile) }
+
+          keys.each do |key|
+            next unless parsed_lockfile[key]
+
+            parsed_lockfile[key].each do |details|
+              return details if details.dig("dist", "url") == path
+            end
+          end
+
+          nil
+        end
+
+        def build_path_dep_content
+          return unless details_from_lockfile
+
+          details_from_lockfile.to_json
+        end
+
+        def parsed_lockfile
+          return {} unless lockfile
+
+          @parsed_lockfile ||= JSON.parse(lockfile.content)
+        rescue JSON::ParserError
+          {}
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.95.74
+  version: 0.95.75
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-02-27 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.95.74
+        version: 0.95.75
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.74
+        version: 0.95.75
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ files:
 - helpers/src/Updater.php
 - lib/dependabot/composer.rb
 - lib/dependabot/composer/file_fetcher.rb
+- lib/dependabot/composer/file_fetcher/path_dependency_builder.rb
 - lib/dependabot/composer/file_parser.rb
 - lib/dependabot/composer/file_updater.rb
 - lib/dependabot/composer/file_updater/lockfile_updater.rb