dependabot-bundler 0.138.3 → 0.139.0

data/helpers/v2/spec/functions_spec.rb

@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
 require "native_spec_helper"
+require "shared_contexts"
 
 RSpec.describe Functions do
-  # Verify v1 method signatures are exist, but raise as NYI
-  {
-    vendor_cache_dir: [ :dir ],
-    update_lockfile: [ :dir, :gemfile_name, :lockfile_name, :using_bundler2, :credentials, :dependencies ],
-    force_update: [ :dir, :dependency_name, :target_version, :gemfile_name, :lockfile_name, :using_bundler2,
-                    :credentials, :update_multiple_dependencies ],
-    dependency_source_type: [ :gemfile_name, :dependency_name, :dir, :credentials ],
-    depencency_source_latest_git_version: [ :gemfile_name, :dependency_name, :dir, :credentials, :dependency_source_url,
-                                            :dependency_source_branch  ],
-    private_registry_versions: [:gemfile_name, :dependency_name, :dir, :credentials ],
-    resolve_version: [:dependency_name, :dependency_requirements, :gemfile_name, :lockfile_name, :using_bundler2,
-                      :dir, :credentials],
-    jfrog_source: [:dir, :gemfile_name, :credentials, :using_bundler2],
-    git_specs: [:dir, :gemfile_name, :credentials, :using_bundler2],
-  }.each do |function, kwargs|
-    describe "::#{function}" do
-      let(:args) do
-        kwargs.inject({}) do |args, keyword|
-          args.merge({ keyword => anything })
-        end
-      end
+  include_context "in a temporary bundler directory"
+
+  describe "#jfrog_source" do
+    let(:project_name) { "jfrog_source" }
+
+    it "returns the jfrog source" do
+      in_tmp_folder do
+        jfrog_source = Functions.jfrog_source(
+          dir: tmp_path,
+          gemfile_name: "Gemfile",
+          credentials: {},
+          using_bundler2: true
+        )
 
-      it "raises a NYI" do
-        expect { Functions.send(function, **args) }.to raise_error(Functions::NotImplementedError)
+        expect(jfrog_source).to eq("test.jfrog.io")
       end
     end
   end

data/helpers/v2/spec/native_spec_helper.rb

@@ -26,7 +26,11 @@ end
 LOCKFILE_ENDING = /(?<ending>\s*(?:RUBY VERSION|BUNDLED WITH).*)/m.freeze
 
 def project_dependency_files(project)
+  # TODO: Retrieve files from bundler2 folder once it is fully up to date
   project_path = File.expand_path(File.join("../../spec/fixtures/projects/bundler1", project))
+
+  raise "Fixture does not exist for project: '#{project}'" unless Dir.exist?(project_path)
+
   Dir.chdir(project_path) do
     # NOTE: Include dotfiles (e.g. .npmrc)
     files = Dir.glob("**/*", File::FNM_DOTMATCH)

data/lib/dependabot/bundler/file_updater/requirement_replacer.rb

@@ -167,6 +167,8 @@ module Dependabot
             req_string.include?(" ")
           end
 
+          EQUALITY_OPERATOR = /(?<![<>!])=/.freeze
+
           def use_equality_operator?(requirement_nodes)
             return true if requirement_nodes.none?
 
@@ -178,7 +180,7 @@ module Dependabot
                 requirement_nodes.first.children.first.loc.expression.source
               end
 
-            req_string.match?(/(?<![<>])=/)
+            req_string.match?(EQUALITY_OPERATOR)
           end
 
           def new_requirement_string(quote_characters:,
@@ -203,7 +205,7 @@ module Dependabot
             # Gem::Requirement serializes exact matches as a string starting
             # with `=`. We may need to remove that equality operator if it
             # wasn't used originally.
-            tmp_req = tmp_req.gsub(/(?<![<>])=/, "") unless use_equality_operator
+            tmp_req = tmp_req.gsub(EQUALITY_OPERATOR, "") unless use_equality_operator
 
             tmp_req.strip
           end

data/lib/dependabot/bundler/helpers.rb

@@ -5,23 +5,37 @@ module Dependabot
     module Helpers
       V1 = "1"
       V2 = "2"
+      # If we are updating a project with no Gemfile.lock, we default to the
+      # newest version we support
+      DEFAULT = V2
+      # If we are updating a project with a Gemfile.lock that does not specify
+      # the version it was bundled with, with failover to V1 on the assumption
+      # it was created with an old version that didn't add this information
+      FAILOVER = V1
 
-      # NOTE: options is a manditory argument to ensure we pass it from all calling classes
-      def self.bundler_version(_lockfile, options:)
-        # For now, force V2 if bundler_2_available
-        return V2 if options[:bundler_2_available]
+      BUNDLER_MAJOR_VERSION_REGEX = /BUNDLED WITH\s+(?<version>\d+)\./m.freeze
 
-        # TODO: Add support for bundler v2 based on lockfile
-        # return V2 if lockfile.content.match?(/BUNDLED WITH\s+2/m)
+      # NOTE: options is a manditory argument to ensure we pass it from all calling classes
+      def self.bundler_version(lockfile, options:)
+        # TODO: Remove once bundler 2 is fully supported
+        return V1 unless options[:bundler_2_available]
+        return DEFAULT unless lockfile
 
-        V1
+        if (matches = lockfile.content.match(BUNDLER_MAJOR_VERSION_REGEX))
+          matches[:version].to_i >= 2 ? V2 : V1
+        else
+          FAILOVER
+        end
       end
 
       def self.detected_bundler_version(lockfile)
         return "unknown" unless lockfile
-        return V2 if lockfile.content.match?(/BUNDLED WITH\s+2/m)
 
-        V1
+        if (matches = lockfile.content.match(BUNDLER_MAJOR_VERSION_REGEX))
+          matches[:version]
+        else
+          FAILOVER
+        end
       end
     end
   end

data/lib/dependabot/bundler/update_checker.rb

@@ -359,20 +359,18 @@ module Dependabot
         @version_resolver ||= {}
         @version_resolver[remove_git_source] ||= {}
         @version_resolver[remove_git_source][unlock_requirement] ||=
-          begin
-            VersionResolver.new(
-              dependency: dependency,
-              unprepared_dependency_files: dependency_files,
-              repo_contents_path: repo_contents_path,
-              credentials: credentials,
-              ignored_versions: ignored_versions,
-              raise_on_ignored: raise_on_ignored,
-              remove_git_source: remove_git_source,
-              unlock_requirement: unlock_requirement,
-              latest_allowable_version: latest_version,
-              options: options
-            )
-          end
+          VersionResolver.new(
+            dependency: dependency,
+            unprepared_dependency_files: dependency_files,
+            repo_contents_path: repo_contents_path,
+            credentials: credentials,
+            ignored_versions: ignored_versions,
+            raise_on_ignored: raise_on_ignored,
+            remove_git_source: remove_git_source,
+            unlock_requirement: unlock_requirement,
+            latest_allowable_version: latest_version,
+            options: options
+          )
       end
 
       def latest_version_finder(remove_git_source:)

data/lib/dependabot/bundler/update_checker/requirements_updater.rb

@@ -188,7 +188,7 @@ module Dependabot
               req
             end
           when "<", "<=" then [update_greatest_version(req, latest_version)]
-          when "~>" then convert_twidle_to_range(req, latest_version)
+          when "~>" then convert_twiddle_to_range(req, latest_version)
           when "!=" then []
           when ">", ">=" then raise UnfixableRequirement
           else raise "Unexpected operation for requirement: #{op}"
@@ -214,7 +214,7 @@ module Dependabot
           end
         end
 
-        def convert_twidle_to_range(requirement, version_to_be_permitted)
+        def convert_twiddle_to_range(requirement, version_to_be_permitted)
           version = requirement.requirements.first.last
           version = version.release if version.prerelease?
 

data/lib/dependabot/bundler/update_checker/shared_bundler_helpers.rb

@@ -187,7 +187,9 @@ module Dependabot
         end
 
         def jfrog_source
-          in_a_native_bundler_context(error_handling: false) do |dir|
+          return @jfrog_source unless defined?(@jfrog_source)
+
+          @jfrog_source = in_a_native_bundler_context(error_handling: false) do |dir|
             NativeHelpers.run_bundler_subprocess(
               bundler_version: bundler_version,
               function: "jfrog_source",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-bundler
 version: !ruby/object:Gem::Version
-  version: 0.138.3
+  version: 0.139.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-30 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.138.3
+        version: 0.139.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.138.3
+        version: 0.139.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -211,13 +211,19 @@ files:
 - helpers/v2/build
 - helpers/v2/lib/functions.rb
 - helpers/v2/lib/functions/conflicting_dependency_resolver.rb
+- helpers/v2/lib/functions/dependency_source.rb
 - helpers/v2/lib/functions/file_parser.rb
+- helpers/v2/lib/functions/force_updater.rb
+- helpers/v2/lib/functions/lockfile_updater.rb
+- helpers/v2/lib/functions/version_resolver.rb
 - helpers/v2/monkey_patches/definition_bundler_version_patch.rb
 - helpers/v2/monkey_patches/definition_ruby_version_patch.rb
 - helpers/v2/monkey_patches/git_source_patch.rb
 - helpers/v2/run.rb
 - helpers/v2/spec/functions/conflicting_dependency_resolver_spec.rb
+- helpers/v2/spec/functions/dependency_source_spec.rb
 - helpers/v2/spec/functions/file_parser_spec.rb
+- helpers/v2/spec/functions/version_resolver_spec.rb
 - helpers/v2/spec/functions_spec.rb
 - helpers/v2/spec/native_spec_helper.rb
 - helpers/v2/spec/shared_contexts.rb