Skip to content

Commit 6d1b4e3

Browse files
Use pragmas env. var. if available (#323)
Signed-off-by: Brian J. Murrell <[email protected]>
1 parent a7ba410 commit 6d1b4e3

File tree

2 files changed

+36
-19
lines changed

2 files changed

+36
-19
lines changed

vars/cachedCommitPragma.groovy

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* groovylint-disable DuplicateStringLiteral, ParameterName, VariableName */
12
// vars/cachedCommitPragma.groovy
23

34
/**
@@ -12,9 +13,10 @@
1213

1314
import groovy.transform.Field
1415

15-
@Field static commit_pragma_cache = [:]
16+
/* groovylint-disable-next-line CompileStatic */
17+
@Field static Map commit_pragma_cache = [:]
1618

17-
def call(Map config = [:]) {
19+
String call(Map config = [:]) {
1820
if (config['clear']) {
1921
commit_pragma_cache.clear()
2022
return
@@ -26,22 +28,24 @@ def call(Map config = [:]) {
2628
return cachedCommitPragma(config['pragma'], config['def_val'])
2729
}
2830

29-
def call(String name, String def_val = null) {
30-
name = name.toLowerCase()
31+
String call(String name, String def_val = null) {
32+
String _name = name.toLowerCase()
33+
String _def_val
34+
3135
if (def_val) {
32-
def_val = def_val.toLowerCase()
36+
_def_val = def_val.toLowerCase()
3337
}
3438

35-
if (!commit_pragma_cache[name]) {
36-
commit_pragma_cache[name] = commitPragma(name)
39+
/* groovylint-disable-next-line CouldBeElvis */
40+
if (!commit_pragma_cache[_name]) {
41+
commit_pragma_cache[_name] = commitPragma(_name)
3742
}
3843

39-
if (commit_pragma_cache[name]) {
40-
return commit_pragma_cache[name]
41-
} else if (def_val) {
42-
return def_val
44+
if (commit_pragma_cache[_name]) {
45+
return commit_pragma_cache[_name]
46+
} else if (_def_val) {
47+
return _def_val
4348
}
44-
45-
return ""
4649

47-
}
50+
return ''
51+
}

vars/commitPragma.groovy

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* groovylint-disable ParameterName, VariableName */
12
// vars/commitPragma.groovy
23

34
/**
@@ -9,13 +10,12 @@
910
/**
1011
* Method to get a commit pragma value
1112
*
12-
*
1313
* @param config Map of parameters passed.
1414
*
1515
* config['pragma'] Pragma to get the value of
1616
* config['def_val'] Value to return if not found
1717
*/
18-
def call(Map config = [:]) {
18+
String call(Map config = [:]) {
1919
// convert the map for compat
2020
return commitPragma(config['pragma'], config['def_val'])
2121
}
@@ -24,6 +24,19 @@ def call(Map config = [:]) {
2424
* @param name Pragma to get the value of
2525
* @param def_val Value to return if not found
2626
*/
27-
def call(String name, String def_val = null) {
28-
return commitPragmaTrusted(name, def_val)
29-
}
27+
String call(String name, String def_val = null) {
28+
if (env.pragmas) {
29+
Map pragmas = "${env.pragmas}"[1..-2].split(', ').collectEntries { entry ->
30+
String[] pair = entry.split('= ')
31+
[(pair.first()): pair.last()]
32+
}
33+
34+
if (pragmas[name]) {
35+
return pragmas[name]
36+
} else if (def_val) {
37+
return def_val
38+
}
39+
} else {
40+
return commitPragmaTrusted(name, def_val)
41+
}
42+
}

0 commit comments

Comments
 (0)