dependabot-bundler 0.97.0 → 0.97.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ba66fb38f984ecf636db3027ff8b81e86b274b3bfbbaf648ce8215172fcb690a
4
- data.tar.gz: 11154be9bf364129fbb655a793096f0432842311eec6607f73f6fa79d012ee59
3
+ metadata.gz: 0aeae68e6967e494140e91fae31fc4ace1d1096f6d114ca64ce391f39f445458
4
+ data.tar.gz: 48dc89dead5c64fd0336c0e372571faa5264f728b4489dc48931aaef9e9f7bdb
5
5
  SHA512:
6
- metadata.gz: cc223651ee3b6a8793c37bd12ad1de60fad57b077f842ba20f73d41c0edebd9dba0c73470c8367e34f65e627c181b2a29689c1e91a176e085056a7661635bded
7
- data.tar.gz: 82a2fa6529e06218b2c430ea498b95392274f3cfbf0e172ff78927a5c26cb6a26ac501163471a38f31a02e3caac04af3c9e695b827fef0cb743c774a3c97c84e
6
+ metadata.gz: a5b4c40e9d27dbacafb295c023c3b1b6759f4d1432a82d0ea9ee194ea10faf45a42787a93f656bf8a4cd0925a717aa180ae262cdc77d1757967a19f9df0905ea
7
+ data.tar.gz: 23f795e22c0f8a8f93374527d1a7084b94100177b29a92a2203649af079748fea8c099ba9b86adc00939b1a9436d21d8cb27aff8630f59d95a67441ae12ccd99
@@ -130,9 +130,18 @@ module Dependabot
130
130
  reject { |dep| dep.source.is_a?(::Bundler::Source::Gemspec) }
131
131
  end
132
132
  end
133
- rescue SharedHelpers::ChildProcessFailed => error
134
- msg = error.error_class + " with message: " +
135
- error.error_message.force_encoding("UTF-8").encode
133
+ rescue SharedHelpers::ChildProcessFailed, ArgumentError => err
134
+ handle_marshall_error(err) if err.is_a?(ArgumentError)
135
+
136
+ msg = err.error_class + " with message: " +
137
+ err.error_message.force_encoding("UTF-8").encode
138
+ raise Dependabot::DependencyFileNotEvaluatable, msg
139
+ end
140
+
141
+ def handle_marshall_error(err)
142
+ raise err unless err.message == "marshal data too short"
143
+
144
+ msg = "Error evaluating your dependency files: #{err.message}"
136
145
  raise Dependabot::DependencyFileNotEvaluatable, msg
137
146
  end
138
147
 
@@ -35,7 +35,6 @@ module Dependabot
35
35
  # Bundler context setup #
36
36
  #########################
37
37
 
38
- # rubocop:disable Metrics/MethodLength
39
38
  def in_a_temporary_bundler_context(error_handling: true)
40
39
  base_directory = dependency_files.first.directory
41
40
  SharedHelpers.in_a_temporary_directory(base_directory) do |tmp_dir|
@@ -73,20 +72,11 @@ module Dependabot
73
72
 
74
73
  # Raise more descriptive errors
75
74
  handle_bundler_errors(error)
76
- rescue ArgumentError => error
77
- handle_marshal_data_too_short_error(error)
78
- end
79
- # rubocop:enable Metrics/MethodLength
80
-
81
- def handle_marshal_data_too_short_error(error)
82
- raise unless error.message == "marshal data too short"
83
-
84
- msg = "Error evaluating your dependency files: #{error.message}"
85
- raise Dependabot::DependencyFileNotEvaluatable, msg
86
75
  end
87
76
 
88
77
  def retryable_error?(error)
89
78
  return true if error.message == "marshal data too short"
79
+ return false if error.is_a?(ArgumentError)
90
80
  return true if RETRYABLE_ERRORS.include?(error.error_class)
91
81
 
92
82
  unless RETRYABLE_PRIVATE_REGISTRY_ERRORS.include?(error.error_class)
@@ -105,6 +95,7 @@ module Dependabot
105
95
  msg = "Error evaluating your dependency files: #{error.message}"
106
96
  raise Dependabot::DependencyFileNotEvaluatable, msg
107
97
  end
98
+ raise if error.is_a?(ArgumentError)
108
99
 
109
100
  msg = error.error_class + " with message: " + error.error_message
110
101
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-bundler
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.97.0
4
+ version: 0.97.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.97.0
19
+ version: 0.97.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.97.0
26
+ version: 0.97.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement