dependabot-bundler 0.95.61 → 0.95.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66d8c28b018f895d5e81b2633342c693b62bc4c1a55ef25cd007cc4686ba8e2
-  data.tar.gz: '08623cfe93e8508023f3050b36d1d247ad824eceec86bd9631df3f7165859781'
+  metadata.gz: a627101cc876da4ddd7df8218d3ae98cb434994a9d7a16fc102067480402f70a
+  data.tar.gz: 22953a12618c3aafc332cb74beb71241d8f5b297edb500f59f63b79a1256aa4b
 SHA512:
-  metadata.gz: 2cf02dee04b1c25e5100a7e849cce3bb7d42000ac443f5e48a608e4203da6b650cea013e7b95924eb7531a9fc1c729c7ae6d37195559c0c22018c58560e93f33
-  data.tar.gz: 3bbfa7fe9414c7c6eb1095e42fe1c5d442f7a6ef4b820b8041bd5f09f57f574a6fff7a8ade00afd80edcc9ff8c9a5216b8086624c8918a7e95ab34e4aceb0223
+  metadata.gz: a659094c763912880f7bca1d420ac4eae188bcaaf2ae8d0226094a0b3803e3f8abc761db8921877096fd15b2ed3387640778ad320177d450bfd6e156147a759a
+  data.tar.gz: '0483ca332310a927231ae7aebb540b152955d6fa4eac2a867a33831f68942c1346e63909b20b4dd5767fd5bd4c205c372831fb84122e981a3ed18768ca8f2898'

data/lib/dependabot/bundler/file_parser.rb

@@ -13,7 +13,7 @@ module Dependabot
     class FileParser < Dependabot::FileParsers::Base
       require "dependabot/file_parsers/base/dependency_set"
       require "dependabot/bundler/file_parser/file_preparer"
-      require "dependabot/bundler/file_parser/gemfile_checker"
+      require "dependabot/bundler/file_parser/gemfile_declaration_finder"
 
       def parse
         dependency_set = DependencySet.new
@@ -45,14 +45,16 @@ module Dependabot
 
         [gemfile, *evaled_gemfiles].each do |file|
           parsed_gemfile.each do |dep|
-            next unless dependency_in_gemfile?(gemfile: file, dependency: dep)
+            gemfile_declaration_finder =
+              GemfileDeclarationFinder.new(dependency: dep, gemfile: file)
+            next unless gemfile_declaration_finder.gemfile_includes_dependency?
 
             dependencies <<
               Dependency.new(
                 name: dep.name,
                 version: dependency_version(dep.name)&.to_s,
                 requirements: [{
-                  requirement: dep.requirement.to_s,
+                  requirement: gemfile_declaration_finder.enhanced_req_string,
                   groups: dep.groups,
                   source: source_for(dep),
                   file: file.name
@@ -240,13 +242,6 @@ module Dependabot
         parsed_lockfile.specs.find { |s| s.name == dependency_name }&.source
       end
 
-      def dependency_in_gemfile?(gemfile:, dependency:)
-        GemfileChecker.new(
-          dependency: dependency,
-          gemfile: gemfile
-        ).includes_dependency?
-      end
-
       def gemfile
         @gemfile ||= get_original_file("Gemfile") ||
                      get_original_file("gems.rb")

data/lib/dependabot/bundler/file_parser/gemfile_declaration_finder.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "parser/current"
+require "dependabot/bundler/file_parser"
+
+module Dependabot
+  module Bundler
+    class FileParser
+      # Checks whether a dependency is declared in a Gemfile
+      class GemfileDeclarationFinder
+        def initialize(dependency:, gemfile:)
+          @dependency = dependency
+          @gemfile = gemfile
+        end
+
+        def gemfile_includes_dependency?
+          !declaration_node.nil?
+        end
+
+        def enhanced_req_string
+          return unless gemfile_includes_dependency?
+
+          fallback_string = dependency.requirement.to_s
+          req_nodes = declaration_node.children[3..-1]
+          req_nodes = req_nodes.reject { |child| child.type == :hash }
+
+          return fallback_string if req_nodes.none?
+          return fallback_string unless req_nodes.all? { |n| n.type == :str }
+
+          original_req_string = req_nodes.map { |n| n.children.last }
+          if dependency.requirement == Gem::Requirement.new(original_req_string)
+            original_req_string.join(", ")
+          else
+            fallback_string
+          end
+        end
+
+        private
+
+        attr_reader :dependency, :gemfile
+
+        def declaration_node
+          return @declaration_node if defined?(@declaration_node)
+          return unless Parser::CurrentRuby.parse(gemfile.content)
+
+          @declaration_node = nil
+          Parser::CurrentRuby.parse(gemfile.content).children.any? do |node|
+            @declaration_node = deep_search_for_gem(node)
+          end
+          @declaration_node
+        end
+
+        def deep_search_for_gem(node)
+          return node if declares_targeted_gem?(node)
+          return unless node.is_a?(Parser::AST::Node)
+
+          declaration_node = nil
+          node.children.find do |child_node|
+            declaration_node = deep_search_for_gem(child_node)
+          end
+          declaration_node
+        end
+
+        def declares_targeted_gem?(node)
+          return false unless node.is_a?(Parser::AST::Node)
+          return false unless node.children[1] == :gem
+
+          node.children[2].children.first == dependency.name
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.95.61
+  version: 0.95.62
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-23 00:00:00.000000000 Z
+date: 2019-02-25 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.61
+        version: 0.95.62
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.61
+        version: 0.95.62
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ files:
 - lib/dependabot/bundler/file_fetcher/require_relative_finder.rb
 - lib/dependabot/bundler/file_parser.rb
 - lib/dependabot/bundler/file_parser/file_preparer.rb
-- lib/dependabot/bundler/file_parser/gemfile_checker.rb
+- lib/dependabot/bundler/file_parser/gemfile_declaration_finder.rb
 - lib/dependabot/bundler/file_updater.rb
 - lib/dependabot/bundler/file_updater/gemfile_updater.rb
 - lib/dependabot/bundler/file_updater/gemspec_dependency_name_finder.rb

data/lib/dependabot/bundler/file_parser/gemfile_checker.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require "parser/current"
-require "dependabot/bundler/file_parser"
-
-module Dependabot
-  module Bundler
-    class FileParser
-      # Checks whether a dependency is declared in a Gemfile
-      class GemfileChecker
-        def initialize(dependency:, gemfile:)
-          @dependency = dependency
-          @gemfile = gemfile
-        end
-
-        def includes_dependency?
-          return false unless Parser::CurrentRuby.parse(gemfile.content)
-
-          Parser::CurrentRuby.parse(gemfile.content).children.any? do |node|
-            deep_check_for_gem(node)
-          end
-        end
-
-        private
-
-        attr_reader :dependency, :gemfile
-
-        def deep_check_for_gem(node)
-          return true if declares_targeted_gem?(node)
-          return false unless node.is_a?(Parser::AST::Node)
-
-          node.children.any? do |child_node|
-            deep_check_for_gem(child_node)
-          end
-        end
-
-        def declares_targeted_gem?(node)
-          return false unless node.is_a?(Parser::AST::Node)
-          return false unless node.children[1] == :gem
-
-          node.children[2].children.first == dependency.name
-        end
-      end
-    end
-  end
-end