dependabot-gradle 0.118.1 → 0.118.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dependabot/gradle/file_parser/property_value_finder.rb +19 -5
  3. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6c3ad22d39044523f12eab31ec98ec4de9205280ce880b82ac780e06cfa0b5af
4
- data.tar.gz: 3210eee1b7071cf9a51015f393c48cd590188e807c9c64fe4240f68a644fab90
3
+ metadata.gz: 4f2c8f43f742a1f45227091e6a8f683f5a47db5d763896a21f8ee92dc6cc5748
4
+ data.tar.gz: fee704da0761268ebc2a03bb40fcd6ec5c250ae95967bf979dd2b184135aba20
5
5
  SHA512:
6
- metadata.gz: 18377231beb3b2e09b64b71236024801a85eb696cee3cfc5564120beba8b9f4f9c54eed786dfe9d09796c5835acde6a4ef6eea7dceee4469f67bc7e63348546d
7
- data.tar.gz: d45670c9dec34393380df63fbf3547f4225ecb768dafa3bf4cc84b6c3426414df7bdc3c3340213793c45f75927c318bc86b6143a3aa28a9cfb24739915d1a0ec
6
+ metadata.gz: 9b74706bb8f313d25dcb6b04500cf21af95f6b067d9aefbe5a375c5771e76c0d83cc0a673c8b0a18edd289875f1acb224ac48cfc88921fac9f4a526883854f66
7
+ data.tar.gz: 34aeafe3d3559b697102e98e511e5f4380ef5ac2fc4d167f3e655b6456bddfa9cab0f6a6f3d201bd41542fd2aa9f85d8ce5c75655951f11019a7af598ee3a0d5
data/lib/dependabot/gradle/file_parser/property_value_finder.rb CHANGED
@@ -6,16 +6,30 @@ module Dependabot
6
6
  module Gradle
7
7
  class FileParser
8
8
  class PropertyValueFinder
9
+ # rubocop:disable Layout/LineLength
10
+ QUOTED_VALUE_REGEX =
11
+ /\s*['"][^\s]+['"]\s*/.freeze
12
+
13
+ # project.findProperty('property') ?:
14
+ FIND_PROPERTY_REGEX =
15
+ /\s*project\.findProperty\(#{QUOTED_VALUE_REGEX}\)\s*\?:/.freeze
16
+
17
+ # project.hasProperty('property') ? project.getProperty('property') :
18
+ HAS_PROPERTY_REGEX =
19
+ /\s*project\.hasProperty\(#{QUOTED_VALUE_REGEX}\)\s*\?\s*project\.getProperty\(#{QUOTED_VALUE_REGEX}\)\s*:/.freeze
20
+
21
+ PROPERTY_DECLARATION_AS_DEFAULTS_REGEX =
22
+ /(?:#{FIND_PROPERTY_REGEX}|#{HAS_PROPERTY_REGEX})?/.freeze
23
+
9
24
  SINGLE_PROPERTY_DECLARATION_REGEX =
10
- /(?:^|\s+|ext.)(?<name>[^\s=]+)\s*=\s*['"](?<value>[^\s]+)['"]/.
11
- freeze
25
+ /(?:^|\s+|ext.)(?<name>[^\s=]+)\s*=#{PROPERTY_DECLARATION_AS_DEFAULTS_REGEX}\s*['"](?<value>[^\s]+)['"]/.freeze
12
26
 
13
27
  MULTI_PROPERTY_DECLARATION_REGEX =
14
- /(?:^|\s+|ext.)(?<namespace>[^\s=]+)\s*=\s*\[(?<values>[^\]]+)\]/m.
15
- freeze
28
+ /(?:^|\s+|ext.)(?<namespace>[^\s=]+)\s*=\s*\[(?<values>[^\]]+)\]/m.freeze
16
29
 
17
30
  NAMESPACED_DECLARATION_REGEX =
18
- /(?:^|\s+)(?<name>[^\s:]+)\s*:\s*['"](?<value>[^\s]+)['"]\s*/.freeze
31
+ /(?:^|\s+)(?<name>[^\s:]+)\s*:#{PROPERTY_DECLARATION_AS_DEFAULTS_REGEX}\s*['"](?<value>[^\s]+)['"]\s*/.freeze
32
+ # rubocop:enable Layout/LineLength
19
33
 
20
34
  def initialize(dependency_files:)
21
35
  @dependency_files = dependency_files
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-gradle
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.118.1
4
+ version: 0.118.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-04 00:00:00.000000000 Z
11
+ date: 2020-06-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.118.1
19
+ version: 0.118.2
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.118.1
26
+ version: 0.118.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 0.83.0
117
+ version: 0.85.0
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 0.83.0
124
+ version: 0.85.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: vcr
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - '='
130
130
  - !ruby/object:Gem::Version
131
- version: '5.0'
131
+ version: 6.0.0
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - '='
137
137
  - !ruby/object:Gem::Version
138
- version: '5.0'
138
+ version: 6.0.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: webmock
141
141
  requirement: !ruby/object:Gem::Requirement