dependabot-common 0.106.24 → 0.106.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '085f16204b2551d38ef4c26941b68d2ba00461535b9350864b0609da3286638e'
-  data.tar.gz: 9cc218bf3fa33b816ea5dc698d7d9c79dee4ca74556d553005eb49f144de0ffb
+  metadata.gz: e36a9f3c0cd33577b87e4c5223c58ac3a7979aa1f149982b302e53f1d10d50c1
+  data.tar.gz: 7bcf71897e15bcb565983a5fb2738700ab366bdd8adb4628e7ba16de79cb2cb2
 SHA512:
-  metadata.gz: e4dcb16b460823de0b934221de85c84193360c1faf8b2c2b9d31c795237061fd62de5198a246d5ee1d5df21d4111fe7982d595b6e5d328a88aa106932f12e52c
-  data.tar.gz: 8f2c70342866e06dab4ff4973692e9c4514ba270f32188e1666cfca78341062c25cd066e6f5bb0ad73e7d517c364686740ae87897416033f2c89979a006c618f
+  metadata.gz: 5ddebe9792fa5fc11e42b602e3fd14f2c2556a0eb70a0d053a8e3efd45e89198d65205ef48f7f4dd5c39a4130d0bad991a47cdb9dd64a14e920720092cc79a8f
+  data.tar.gz: a6bc88d8fcee2cbc9d94ba7589b6ec93c9c84a45ab738edb32b4533a878b485d12de0464a333afcd6a17d30c441bf30aa37512e98cbcea744b5f065f56db1322

data/lib/dependabot/file_fetchers/base.rb

@@ -65,6 +65,7 @@ module Dependabot
 
       private
 
+      # rubocop:disable Naming/RescuedExceptionsVariableName
       def fetch_file_if_present(filename, fetch_submodules: false)
         dir = File.dirname(filename)
         basename = File.basename(filename)
@@ -80,7 +81,9 @@ module Dependabot
         path = Pathname.new(File.join(directory, filename)).cleanpath.to_path
         raise Dependabot::DependencyFileNotFound, path
       end
+      # rubocop:enable Naming/RescuedExceptionsVariableName
 
+      # rubocop:disable Naming/RescuedExceptionsVariableName
       def fetch_file_from_host(filename, type: "file", fetch_submodules: false)
         path = Pathname.new(File.join(directory, filename)).cleanpath.to_path
 
@@ -93,6 +96,7 @@ module Dependabot
       rescue *CLIENT_NOT_FOUND_ERRORS
         raise Dependabot::DependencyFileNotFound, path
       end
+      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       def repo_contents(dir: ".", ignore_base_directory: false,
                         raise_errors: true, fetch_submodules: false)
@@ -111,6 +115,7 @@ module Dependabot
       # INTERNAL METHODS (not for use by sub-classes) #
       #################################################
 
+      # rubocop:disable Naming/RescuedExceptionsVariableName
       def _fetch_repo_contents(path, fetch_submodules: false,
                                raise_errors: true)
         path = path.gsub(" ", "%20")
@@ -139,6 +144,7 @@ module Dependabot
         retrying = true
         retry
       end
+      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       def _fetch_repo_contents_fully_specified(provider, repo, path, commit)
         case provider
@@ -264,6 +270,7 @@ module Dependabot
         end
       end
 
+      # rubocop:disable Naming/RescuedExceptionsVariableName
       def _fetch_file_content(path, fetch_submodules: false)
         path = path.gsub(%r{^/*}, "")
 
@@ -283,6 +290,7 @@ module Dependabot
         retrying = true
         retry
       end
+      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       def _fetch_file_content_fully_specified(provider, repo, path, commit)
         case provider
@@ -312,8 +320,8 @@ module Dependabot
         end
 
         Base64.decode64(tmp.content).force_encoding("UTF-8").encode
-      rescue Octokit::Forbidden => error
-        raise unless error.message.include?("too_large")
+      rescue Octokit::Forbidden => e
+        raise unless e.message.include?("too_large")
 
         # Fall back to Git Data API to fetch the file
         prefix_dir = directory.gsub(%r{(^/|/$)}, "")
@@ -329,12 +337,14 @@ module Dependabot
       end
       # rubocop:enable Metrics/AbcSize
 
+      # rubocop:disable Naming/RescuedExceptionsVariableName
       def default_branch_for_repo
         @default_branch_for_repo ||= client_for_provider.
                                      fetch_default_branch(repo)
       rescue *CLIENT_NOT_FOUND_ERRORS
         raise Dependabot::RepoNotFound, source
       end
+      # rubocop:enable Naming/RescuedExceptionsVariableName
 
       # Update the @linked_paths hash by exploiting a side-effect of
       # recursively calling `repo_contents` for each directory up the tree

data/lib/dependabot/pull_request_creator/github.rb

@@ -122,8 +122,8 @@ module Dependabot
             base_commit,
             options
           )
-        rescue Octokit::UnprocessableEntity => error
-          raise unless error.message == "Tree SHA does not exist"
+        rescue Octokit::UnprocessableEntity => e
+          raise unless e.message == "Tree SHA does not exist"
 
           # Sometimes a race condition on GitHub's side means we get an error
           # here. No harm in retrying if we do.
@@ -181,9 +181,9 @@ module Dependabot
           "heads/#{branch_name}",
           commit.sha
         )
-      rescue Octokit::UnprocessableEntity => error
+      rescue Octokit::UnprocessableEntity => e
         # Return quietly in the case of a race
-        return nil if error.message.match?(/Reference already exists/i)
+        return nil if e.message.match?(/Reference already exists/i)
         raise if @retrying_branch_creation
 
         @retrying_branch_creation = true
@@ -220,9 +220,9 @@ module Dependabot
           reviewers: reviewers_hash[:reviewers] || [],
           team_reviewers: reviewers_hash[:team_reviewers] || []
         )
-      rescue Octokit::UnprocessableEntity => error
-        return if error.message.include?("not a collaborator")
-        return if error.message.include?("Could not resolve to a node")
+      rescue Octokit::UnprocessableEntity => e
+        return if e.message.include?("not a collaborator")
+        return if e.message.include?("Could not resolve to a node")
 
         raise
       end
@@ -244,8 +244,8 @@ module Dependabot
           pull_request.number,
           milestone: milestone
         )
-      rescue Octokit::UnprocessableEntity => error
-        raise unless error.message.include?("code: invalid")
+      rescue Octokit::UnprocessableEntity => e
+        raise unless e.message.include?("code: invalid")
       end
 
       def create_pull_request
@@ -256,12 +256,12 @@ module Dependabot
           pr_name,
           pr_description
         )
-      rescue Octokit::UnprocessableEntity => error
+      rescue Octokit::UnprocessableEntity => e
         # Ignore races that we lose
-        return if error.message.include?("pull request already exists")
+        return if e.message.include?("pull request already exists")
 
         # Ignore cases where the target branch has been deleted
-        return if error.message.include?("field: base") &&
+        return if e.message.include?("field: base") &&
                   source.branch &&
                   !branch_exists?(source.branch)
 

data/lib/dependabot/pull_request_creator/labeler.rb

@@ -302,8 +302,8 @@ module Dependabot
           accept: "application/vnd.github.symmetra-preview+json"
         )
         @labels = [*@labels, "security"].uniq
-      rescue Octokit::UnprocessableEntity => error
-        raise unless error.errors.first.fetch(:code) == "already_exists"
+      rescue Octokit::UnprocessableEntity => e
+        raise unless e.errors.first.fetch(:code) == "already_exists"
 
         @labels = [*@labels, "security"].uniq
       end
@@ -330,8 +330,8 @@ module Dependabot
           accept: "application/vnd.github.symmetra-preview+json"
         )
         @labels = [*@labels, langauge_name].uniq
-      rescue Octokit::UnprocessableEntity => error
-        raise unless error.errors.first.fetch(:code) == "already_exists"
+      rescue Octokit::UnprocessableEntity => e
+        raise unless e.errors.first.fetch(:code) == "already_exists"
 
         @labels = [*@labels, langauge_name].uniq
       end

data/lib/dependabot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.106.24
+  version: 0.106.25
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
@@ -266,14 +266,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.68.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.68.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement