dependabot-bundler 0.138.4 → 0.139.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c508c2f2ed7c44b477686d7385a08b08f9cc3b22821d4fd1a96f6228d7f7b7ae
-  data.tar.gz: 89ef7a905d30d6b46191760a893c119b8e45814e8fdd4a6fd6150327ecccf7f2
+  metadata.gz: 04c56148ac5dd6ef85efdf26a31b32f0acbbe6d44adcaa17142c3ecfeef33991
+  data.tar.gz: 1108c706a3c761dfef596f29ab5e0400e1e9168a81323885e38d8ce8fc7456bf
 SHA512:
-  metadata.gz: e91dae1d2fbed29ba408ab4bcc854662b3e36634d425732216e98bc92c881170b475325c0bca09e50803bdc9835cf28456aaf9c59d0620c6ba2c96920a9d3032
-  data.tar.gz: 28cba5afca8459dfc9c2e7e9ec64065ed1da409d0391c40847cf9c5353ea21f56da8b3228b0462209789abf08022b40e547e1677df694874d3c708f4bcf33c6c
+  metadata.gz: 3dc53307886dce6dad72fa3fc336bc100b00d3c7aab3ea2a195e33ca2af54de56262d9b379cb66ef7d51db9053497d2f76ce4d27f75e9ed0ab20c130548ed2f1
+  data.tar.gz: d382a44aa2ed1f54c3c5a3aedf6713bf1bff1c780900fd071c4b7bfb29dfbef2410c1058f273c5ec8a035cce2195c442c23937c54bd46769c1d0da1f77b5620e

data/helpers/v1/spec/native_spec_helper.rb

@@ -27,6 +27,9 @@ LOCKFILE_ENDING = /(?<ending>\s*(?:RUBY VERSION|BUNDLED WITH).*)/m.freeze
 
 def project_dependency_files(project)
   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/helpers/v2/lib/functions.rb

@@ -105,7 +105,13 @@ module Functions
   end
 
   def self.jfrog_source(dir:, gemfile_name:, credentials:, using_bundler2:)
-    raise NotImplementedError, "Bundler 2 adapter does not yet implement #{__method__}"
+    set_bundler_flags_and_credentials(dir: dir, credentials: credentials, using_bundler2: using_bundler2)
+
+    Bundler::Definition.build(gemfile_name, nil, {}).
+      send(:sources).
+      rubygems_remotes.
+      find { |uri| uri.host.include?("jfrog") }&.
+      host
   end
 
   def self.git_specs(dir:, gemfile_name:, credentials:, using_bundler2:)

data/helpers/v2/run.rb

@@ -11,7 +11,7 @@ require "git_source_patch"
 
 require "functions"
 
-MIN_BUNDLER_VERSION = "2.0.0"
+MIN_BUNDLER_VERSION = "2.1.0"
 
 def validate_bundler_version!
   return true if correct_bundler_version?

data/helpers/v2/spec/functions_spec.rb

@@ -1,21 +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
-  {
-    jfrog_source: %i(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/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/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.4
+  version: 0.139.1
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-03-31 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.4
+        version: 0.139.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.138.4
+        version: 0.139.1
 - !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