dependabot-core 0.89.2 → 0.89.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5067da1c08eb196edb308387633bc2394063d8b4c4d0a7dc64b0e06b4b53ae27
-  data.tar.gz: 3edaf8e1eddc3239a639a13cce6d9b31ba205055471f16b343fb91b7bb265e56
+  metadata.gz: 68b24cb423c178ba9f593779aba15d90eb2c63608a4533526afd1715a62fdac3
+  data.tar.gz: dfdc7b94a470329a808c01ea05e0412238c4596d16e22b540ea0e900e0847a62
 SHA512:
-  metadata.gz: 2d804a781035f5ff2b18c931f416c93b6e659d08a8b8ea1ac89314eda547b441390b2e9cbbd0096728367895f0f2298d48e466899f9bc275a7e8debf7ea4963b
-  data.tar.gz: 519c0ae88a184565045813998393d95a9e6da3212be98d76f42c03d3290be1275d9c45b2592c904a9bc5e55dc8810853d319c0b628af87ecf8579650ea38a842
+  metadata.gz: 9cc690016b52d4f1586c894f5e57e51184c5c7c1c09ff8968079caec11ca9f647850642418885c95e5ada945ac692e2eaf0ef28727160bb752006076072ccc67
+  data.tar.gz: 28de24c17cc0f5c66c02b2130a389e8426a1450d1842b1edb4e17832169442813f38975c17115221eaa42abd567df3579e6b9ab4f40cf1d76d6d277e02aace14

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.89.3, 12 January 2019
+
+- Ruby: Handle fetching gemspecs which specify a path
+
 ## v0.89.2, 11 January 2019
 
 - Require composer from omnibus

data/lib/dependabot/file_fetchers/ruby/bundler.rb

@@ -8,6 +8,7 @@ module Dependabot
   module FileFetchers
     module Ruby
       class Bundler < Dependabot::FileFetchers::Base
+        require "dependabot/file_fetchers/ruby/bundler/gemspec_finder"
         require "dependabot/file_fetchers/ruby/bundler/path_gemspec_finder"
         require "dependabot/file_fetchers/ruby/bundler/child_gemfile_finder"
         require "dependabot/file_fetchers/ruby/bundler/require_relative_finder"
@@ -30,19 +31,27 @@ module Dependabot
           fetched_files = []
           fetched_files << gemfile if gemfile
           fetched_files << lockfile if gemfile && lockfile
+          fetched_files += child_gemfiles
           fetched_files += gemspecs
           fetched_files << ruby_version_file if ruby_version_file
-          fetched_files += child_gemfiles
           fetched_files += path_gemspecs
           fetched_files += require_relative_files(fetched_files)
 
+          fetched_files = uniq_files(fetched_files)
+
           check_required_files_present
 
           unless self.class.required_files_in?(fetched_files.map(&:name))
             raise "Invalid set of files: #{fetched_files.map(&:name)}"
           end
 
-          fetched_files.uniq
+          fetched_files
+        end
+
+        def uniq_files(fetched_files)
+          uniq_files = fetched_files.reject(&:support_file?).uniq
+          uniq_files += fetched_files.
+                        reject { |f| uniq_files.map(&:name).include?(f.name) }
         end
 
         def check_required_files_present
@@ -64,12 +73,31 @@ module Dependabot
         end
 
         def gemspecs
-          gemspecs = repo_contents.select { |f| f.name.end_with?(".gemspec") }
-          @gemspecs ||= gemspecs.map { |gs| fetch_file_from_host(gs.name) }
+          return @gemspecs if defined?(@gemspecs)
+
+          gemspecs_paths =
+            gemspec_directories.
+            flat_map do |d|
+              repo_contents(dir: d).
+                select { |f| f.name.end_with?(".gemspec") }.
+                map { |f| File.join(d, f.name) }
+            end
+
+          @gemspecs = gemspecs_paths.map { |n| fetch_file_from_host(n) }
         rescue Octokit::NotFound
           []
         end
 
+        def gemspec_directories
+          gemfiles = ([gemfile] + child_gemfiles).compact
+          directories =
+            gemfiles.flat_map do |file|
+              GemspecFinder.new(gemfile: file).gemspec_directories
+            end.uniq
+
+          directories.empty? ? ["."] : directories
+        end
+
         def ruby_version_file
           return unless gemfile
           return unless gemfile.content.include?(".ruby-version")
@@ -83,7 +111,7 @@ module Dependabot
           gemspec_files = []
           unfetchable_gems = []
 
-          gemspec_paths.each do |path|
+          path_gemspec_paths.each do |path|
             # Get any gemspecs at the path itself
             gemspecs_at_path = fetch_gemspecs_from_directory(path)
 
@@ -112,8 +140,8 @@ module Dependabot
           gemspec_files.tap { |ar| ar.each { |f| f.support_file = true } }
         end
 
-        def gemspec_paths
-          fetch_gemspec_paths.map { |path| Pathname.new(path) }
+        def path_gemspec_paths
+          fetch_path_gemspec_paths.map { |path| Pathname.new(path) }
         end
 
         def require_relative_files(files)
@@ -136,7 +164,7 @@ module Dependabot
             map { |fp| fetch_file_from_host(fp) }
         end
 
-        def fetch_gemspec_paths
+        def fetch_path_gemspec_paths
           if lockfile
             parsed_lockfile = ::Bundler::LockfileParser.new(
               sanitized_lockfile_content

data/lib/dependabot/file_fetchers/ruby/bundler/gemspec_finder.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "pathname"
+require "parser/current"
+require "dependabot/file_fetchers/ruby/bundler"
+require "dependabot/errors"
+
+module Dependabot
+  module FileFetchers
+    module Ruby
+      class Bundler
+        # Finds the directories of any gemspecs declared using `gemspec` in the
+        # passed Gemfile.
+        class GemspecFinder
+          def initialize(gemfile:)
+            @gemfile = gemfile
+          end
+
+          def gemspec_directories
+            ast = Parser::CurrentRuby.parse(gemfile.content)
+            find_gemspec_paths(ast)
+          rescue Parser::SyntaxError
+            raise Dependabot::DependencyFileNotParseable, gemfile.path
+          end
+
+          private
+
+          attr_reader :gemfile
+
+          # rubocop:disable Security/Eval
+          def find_gemspec_paths(node)
+            return [] unless node.is_a?(Parser::AST::Node)
+
+            if declares_gemspec_dependency?(node)
+              path_node = path_node_for_gem_declaration(node)
+              return [clean_path(".")] unless path_node
+
+              begin
+                # We use eval here, but we know what we're doing. The
+                # FileFetchers helper method should only ever be run in an
+                # isolated environment
+                path = eval(path_node.loc.expression.source)
+              rescue StandardError
+                return []
+              end
+              return [clean_path(path)]
+            end
+
+            node.children.flat_map do |child_node|
+              find_gemspec_paths(child_node)
+            end
+          end
+          # rubocop:enable Security/Eval
+
+          def current_dir
+            @current_dir ||= gemfile.name.rpartition("/").first
+            @current_dir = nil if @current_dir == ""
+            @current_dir
+          end
+
+          def declares_gemspec_dependency?(node)
+            return false unless node.is_a?(Parser::AST::Node)
+
+            node.children[1] == :gemspec
+          end
+
+          def clean_path(path)
+            if Pathname.new(path).absolute?
+              base_path = Pathname.new(File.expand_path(Dir.pwd))
+              path = Pathname.new(path).relative_path_from(base_path).to_s
+            end
+            path = File.join(current_dir, path) unless current_dir.nil?
+            Pathname.new(path).cleanpath
+          end
+
+          def path_node_for_gem_declaration(node)
+            return unless node.children.last.is_a?(Parser::AST::Node)
+            return unless node.children.last.type == :hash
+
+            kwargs_node = node.children.last
+
+            path_hash_pair =
+              kwargs_node.children.
+              find { |hash_pair| key_from_hash_pair(hash_pair) == :path }
+
+            return unless path_hash_pair
+
+            path_hash_pair.children.last
+          end
+
+          def key_from_hash_pair(node)
+            node.children.first.children.first.to_sym
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dependabot/file_parsers/ruby/bundler.rb

@@ -137,8 +137,7 @@ module Dependabot
           @parsed_gemspecs ||= {}
           @parsed_gemspecs[file.name] ||=
             SharedHelpers.in_a_temporary_directory do
-              File.write(file.name, file.content)
-              imported_ruby_files.each do |f|
+              [file, *imported_ruby_files].each do |f|
                 path = f.name
                 FileUtils.mkdir_p(Pathname.new(path).dirname)
                 File.write(path, f.content)
@@ -278,10 +277,10 @@ module Dependabot
         end
 
         def gemspecs
-          # The gemspecs for this project will be at the top level
-          @gemspecs ||= prepared_dependency_files.select do |file|
-            file.name.match?(%r{^[^/]*\.gemspec$})
-          end
+          # Path gemspecs are excluded (they're supporting files)
+          @gemspecs ||= prepared_dependency_files.
+                        select { |file| file.name.end_with?(".gemspec") }.
+                        reject(&:support_file?)
         end
 
         def imported_ruby_files

data/lib/dependabot/file_parsers/ruby/bundler/file_preparer.rb

@@ -20,7 +20,8 @@ module Dependabot
               files << DependencyFile.new(
                 name: file.name,
                 content: sanitize_gemspec_content(file.content),
-                directory: file.directory
+                directory: file.directory,
+                support_file: file.support_file?
               )
             end
 

data/lib/dependabot/file_updaters/ruby/bundler.rb

@@ -16,7 +16,7 @@ module Dependabot
             /^Gemfile\.lock$/,
             /^gems\.rb$/,
             /^gems\.locked$/,
-            %r{^[^/]*\.gemspec$}
+            /^*\.gemspec$/
           ]
         end
 
@@ -113,7 +113,9 @@ module Dependabot
         end
 
         def top_level_gemspecs
-          dependency_files.select { |f| f.name.match?(%r{^[^/]*\.gemspec$}) }
+          dependency_files.
+            select { |file| file.name.end_with?(".gemspec") }.
+            reject(&:support_file?)
         end
       end
     end

data/lib/dependabot/file_updaters/ruby/bundler/lockfile_updater.rb

@@ -94,10 +94,10 @@ module Dependabot
             File.write(lockfile.name, sanitized_lockfile_body)
 
             top_level_gemspecs.each do |gemspec|
-              File.write(
-                gemspec.name,
-                sanitized_gemspec_content(updated_gemspec_content(gemspec))
-              )
+              path = gemspec.name
+              FileUtils.mkdir_p(Pathname.new(path).dirname)
+              updated_content = updated_gemspec_content(gemspec)
+              File.write(path, sanitized_gemspec_content(updated_content))
             end
 
             write_ruby_version_file
@@ -248,7 +248,9 @@ module Dependabot
           end
 
           def top_level_gemspecs
-            dependency_files.select { |f| f.name.match?(%r{^[^/]*\.gemspec$}) }
+            dependency_files.
+              select { |file| file.name.end_with?(".gemspec") }.
+              reject(&:support_file?)
           end
 
           def ruby_version_file

data/lib/dependabot/pull_request_creator.rb

@@ -136,9 +136,7 @@ module Dependabot
     end
 
     def library?
-      if files.map(&:name).any? { |name| name.match?(%r{^[^/]*\.gemspec$}) }
-        return true
-      end
+      return true if files.any? { |file| file.name.end_with?(".gemspec") }
 
       dependencies.none?(&:appears_in_lockfile?)
     end

data/lib/dependabot/pull_request_creator/branch_namer.rb

@@ -155,7 +155,7 @@ module Dependabot
       end
 
       def library?
-        if files.map(&:name).any? { |name| name.match?(%r{^[^/]*\.gemspec$}) }
+        if files.map(&:name).any? { |name| name.end_with?(".gemspec") }
           return true
         end
 

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -708,8 +708,7 @@ module Dependabot
       end
 
       def library?
-        filenames = files.map(&:name)
-        return true if filenames.any? { |nm| nm.match?(%r{^[^/]*\.gemspec$}) }
+        return true if files.map(&:name).any? { |nm| nm.end_with?(".gemspec") }
 
         dependencies.none?(&:appears_in_lockfile?)
       end

data/lib/dependabot/update_checkers/ruby/bundler/file_preparer.rb

@@ -76,7 +76,8 @@ module Dependabot
               files << DependencyFile.new(
                 name: file.name,
                 content: sanitize_gemspec_content(file.content),
-                directory: file.directory
+                directory: file.directory,
+                support_file: file.support_file?
               )
             end
 
@@ -132,7 +133,9 @@ module Dependabot
           end
 
           def top_level_gemspecs
-            dependency_files.select { |f| f.name.match?(%r{^[^/]*\.gemspec$}) }
+            dependency_files.
+              select { |f| f.name.end_with?(".gemspec") }.
+              reject(&:support_file?)
           end
 
           def ruby_version_file

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.89.2"
+  VERSION = "0.89.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-core
 version: !ruby/object:Gem::Version
-  version: 0.89.2
+  version: 0.89.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
@@ -359,6 +359,7 @@ files:
 - lib/dependabot/file_fetchers/java_script/npm_and_yarn/path_dependency_builder.rb
 - lib/dependabot/file_fetchers/ruby/bundler.rb
 - lib/dependabot/file_fetchers/ruby/bundler/child_gemfile_finder.rb
+- lib/dependabot/file_fetchers/ruby/bundler/gemspec_finder.rb
 - lib/dependabot/file_fetchers/ruby/bundler/path_gemspec_finder.rb
 - lib/dependabot/file_fetchers/ruby/bundler/require_relative_finder.rb
 - lib/dependabot/file_parsers.rb