dependabot-common 0.106.34 → 0.106.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df12a99783599b0f3edf3cdc626f23bb5729955fe6087fd55f34bd094b3b4cc
-  data.tar.gz: fe4466918754b920141ff5f8f85f9134934b8781281775d551e20021b31fd186
+  metadata.gz: e113808a578271526c147df4335fedb60cfeb19802f3f2e96f3bb09ee5d1f69a
+  data.tar.gz: 432aa7f481de6ec48e2ba29711bb41e6754075125ac83efcf31762761e19cdb6
 SHA512:
-  metadata.gz: 10352a9876983214b6303fade68161ecfb61832f2a0c3edf21a2e3777f68b642ad06ed0bd421f25cb6538f23a1c4251d7e72f871efaf073d19688d066942081a
-  data.tar.gz: eba843ea01479fd3fccc894e813eefbbdbf9b6437570055efc5898e2aac0df5946103cbfceebee0e4ea83dc3f67517398008d946ab4e6eaa0ea6597203805cba
+  metadata.gz: 653fc36e4e76f30d2edd7e3d5998a4d8a041a77262a48fe55d30a4faad063abf808b117eb180fd9ad5500d78bfcbdc7f5380eab823d4b8d6ac86b0f9ed2c7ff1
+  data.tar.gz: 3e401c7ea85e6626d164536d3cb721dd4f9915c31c3a068d4ef9e419f557ea0467edeb341c09aeed9e8cf177a1708f71bab25cac63a3764be916e1320473205b

data/lib/dependabot/pull_request_creator/github.rb

@@ -131,7 +131,7 @@ module Dependabot
           retry_count += 1
           raise if retry_count > 3
 
-          sleep(rand(0.9))
+          sleep(rand(1..1.99))
           retry
         end
       end
@@ -172,26 +172,28 @@ module Dependabot
         # A race condition may cause GitHub to fail here, in which case we retry
         retry_count ||= 0
         retry_count += 1
-        retry unless retry_count >= 2
+        retry_count < 2 ? retry : raise
       end
 
       def create_branch(commit)
-        github_client_for_source.create_ref(
-          source.repo,
-          "heads/#{branch_name}",
-          commit.sha
-        )
-      rescue Octokit::UnprocessableEntity => e
-        # Return quietly in the case of a race
-        return nil if e.message.match?(/Reference already exists/i)
-        raise if @retrying_branch_creation
+        ref = "heads/#{branch_name}"
+
+        begin
+          github_client_for_source.create_ref(source.repo, ref, commit.sha)
+        rescue Octokit::UnprocessableEntity => e
+          # Return quietly in the case of a race
+          return nil if e.message.match?(/Reference already exists/i)
+
+          retrying_branch_creation ||= false
+          raise if retrying_branch_creation
 
-        @retrying_branch_creation = true
+          retrying_branch_creation = true
 
-        # Branch creation will fail if a branch called `dependabot` already
-        # exists, since git won't be able to create a folder with the same name
-        @branch_name = SecureRandom.hex[0..3] + @branch_name
-        retry
+          # Branch creation will fail if a branch called `dependabot` already
+          # exists, since git won't be able to create a dir with the same name
+          ref = "heads/#{SecureRandom.hex[0..3] + branch_name}"
+          retry
+        end
       end
 
       def update_branch(commit)

data/lib/dependabot/pull_request_updater/github.rb

@@ -100,7 +100,7 @@ module Dependabot
           retry_count += 1
           raise if retry_count > 3
 
-          sleep(rand(0.9))
+          sleep(rand(1..1.99))
           retry
         end
       end

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.106.34
+  version: 0.106.35
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr