dependabot-common 0.107.38 → 0.107.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87107d8dcd8080674df12b398f7304c2c4f4fc5f484d3d7f22ba942f6acca871
-  data.tar.gz: dff061c0576abd74f8a17d25e4feae6e75846b48304a32dd41a524d2e40b5fec
+  metadata.gz: 56e7de376cfb9c603012064cfe624aae34c07b88f5b2325d0215d415cc4733a7
+  data.tar.gz: a515e1a0e6a524937300d5eb6cddeed921062d94af2713703e0759a2b2d641be
 SHA512:
-  metadata.gz: c41075e6afd57360df73fdda1300f85b481e991d4353d1a46c17395ae49a99c42f3b81cc07cd8c89b9395d9c0060fff3a0782e22cda3dfda10c10149ab6ecbfd
-  data.tar.gz: 1dfdce6493a9a0378e57eeaeaeb302fa562e398710c2a5bc80b01003999c7d809e4e74a03044929fbfe3bd0b9a35126254b8538aa6a9eb701d479fb81290688e
+  metadata.gz: cceb9069a19f86d58fbd3f62325c6ec6260169f122f7049b9646f61ddfdeb37cdbac32304000a8dee278952e1feae13b6f85d549b3f9a41f34ccaf4f8f636334
+  data.tar.gz: 8410db69a173af78bd381e59b0034e1979b87bbe84cdc43a3130a895b8d5ab3c59b81f217c5904037db24b6e8e42020fed5541fc4c55070f3ce678c73b536bc3

data/lib/dependabot/clients/bitbucket.rb

@@ -10,24 +10,11 @@ module Dependabot
       class Unauthorized < StandardError; end
       class Forbidden < StandardError; end
 
-      #######################
-      # Constructor methods #
-      #######################
-
-      def self.for_bitbucket_dot_org(credentials:)
-        credential =
-          credentials.
-          select { |cred| cred["type"] == "git_source" }.
-          find { |cred| cred["host"] == "bitbucket.org" }
-
-        new(credential)
-      end
-
       ##########
       # Client #
       ##########
 
-      def initialize(credentials)
+      def initialize(credentials:)
         @credentials = credentials
       end
 

data/lib/dependabot/clients/bitbucket_with_retries.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require_relative "bitbucket"
+
+module Dependabot
+  module Clients
+    class BitbucketWithRetries
+      RETRYABLE_ERRORS = [
+        Excon::Error::Timeout,
+        Excon::Error::Socket
+      ].freeze
+
+      #######################
+      # Constructor methods #
+      #######################
+
+      def self.for_bitbucket_dot_org(credentials:)
+        credential =
+          credentials.
+          select { |cred| cred["type"] == "git_source" }.
+          find { |cred| cred["host"] == "bitbucket.org" }
+
+        new(credentials: credential)
+      end
+
+      ############
+      # Proxying #
+      ############
+
+      def initialize(max_retries: 3, **args)
+        @max_retries = max_retries || 3
+        @client = Bitbucket.new(args)
+      end
+
+      def method_missing(method_name, *args, &block)
+        retry_connection_failures do
+          if @client.respond_to?(method_name)
+            mutatable_args = args.map(&:dup)
+            @client.public_send(method_name, *mutatable_args, &block)
+          else
+            super
+          end
+        end
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        @client.respond_to?(method_name) || super
+      end
+
+      # rubocop:disable Naming/RescuedExceptionsVariableName
+      def retry_connection_failures
+        retry_attempt = 0
+
+        begin
+          yield
+        rescue *RETRYABLE_ERRORS
+          retry_attempt += 1
+          retry_attempt <= @max_retries ? retry : raise
+        end
+      end
+      # rubocop:enable Naming/RescuedExceptionsVariableName
+    end
+  end
+end

data/lib/dependabot/file_fetchers/base.rb

@@ -4,7 +4,7 @@ require "dependabot/dependency_file"
 require "dependabot/source"
 require "dependabot/errors"
 require "dependabot/clients/github_with_retries"
-require "dependabot/clients/bitbucket"
+require "dependabot/clients/bitbucket_with_retries"
 require "dependabot/clients/gitlab_with_retries"
 require "dependabot/shared_helpers"
 
@@ -399,7 +399,7 @@ module Dependabot
         # TODO: When self-hosted Bitbucket is supported this should use
         # `Bitbucket.for_source`
         @bitbucket_client ||=
-          Dependabot::Clients::Bitbucket.
+          Dependabot::Clients::BitbucketWithRetries.
           for_bitbucket_dot_org(credentials: credentials)
       end
     end

data/lib/dependabot/git_commit_checker.rb

@@ -4,7 +4,7 @@ require "excon"
 require "gitlab"
 require "dependabot/clients/github_with_retries"
 require "dependabot/clients/gitlab_with_retries"
-require "dependabot/clients/bitbucket"
+require "dependabot/clients/bitbucket_with_retries"
 require "dependabot/metadata_finders"
 require "dependabot/errors"
 require "dependabot/utils"
@@ -198,7 +198,7 @@ module Dependabot
             "#{listing_source_repo}/commits/?"\
             "include=#{ref2}&exclude=#{ref1}"
 
-      client = Clients::Bitbucket.
+      client = Clients::BitbucketWithRetries.
                for_bitbucket_dot_org(credentials: credentials)
 
       response = client.get(url)

data/lib/dependabot/metadata_finders/base/changelog_finder.rb

@@ -5,7 +5,7 @@ require "pandoc-ruby"
 
 require "dependabot/clients/github_with_retries"
 require "dependabot/clients/gitlab_with_retries"
-require "dependabot/clients/bitbucket"
+require "dependabot/clients/bitbucket_with_retries"
 require "dependabot/shared_helpers"
 require "dependabot/metadata_finders/base"
 
@@ -358,7 +358,7 @@ module Dependabot
         end
 
         def bitbucket_client
-          @bitbucket_client ||= Dependabot::Clients::Bitbucket.
+          @bitbucket_client ||= Dependabot::Clients::BitbucketWithRetries.
                                 for_bitbucket_dot_org(credentials: credentials)
         end
 

data/lib/dependabot/metadata_finders/base/commits_finder.rb

@@ -2,7 +2,7 @@
 
 require "dependabot/clients/github_with_retries"
 require "dependabot/clients/gitlab_with_retries"
-require "dependabot/clients/bitbucket"
+require "dependabot/clients/bitbucket_with_retries"
 require "dependabot/shared_helpers"
 require "dependabot/git_metadata_fetcher"
 require "dependabot/git_commit_checker"
@@ -298,7 +298,7 @@ module Dependabot
         end
 
         def bitbucket_client
-          @bitbucket_client ||= Dependabot::Clients::Bitbucket.
+          @bitbucket_client ||= Dependabot::Clients::BitbucketWithRetries.
                                 for_bitbucket_dot_org(credentials: credentials)
         end
 

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.107.38
+  version: 0.107.39
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
@@ -312,6 +312,7 @@ files:
 - bin/git-credential-store-immutable
 - lib/dependabot.rb
 - lib/dependabot/clients/bitbucket.rb
+- lib/dependabot/clients/bitbucket_with_retries.rb
 - lib/dependabot/clients/github_with_retries.rb
 - lib/dependabot/clients/gitlab_with_retries.rb
 - lib/dependabot/dependency.rb