Merge pull request #68 from JustinMcNamara74/add-binary-cache

Added env var for cached binary

dist/sonarqube-scanner-executable.js

@@ -13,6 +13,7 @@ var sonarQubeParams = require('./sonarqube-scanner-params')
 module.exports.prepareExecEnvironment = prepareExecEnvironment
 module.exports.getSonarQubeScannerExecutable = getSonarQubeScannerExecutable
 module.exports.getLocalSonarQubeScannerExecutable = getLocalSonarQubeScannerExecutable
+module.exports.getInstallFolderPath = getInstallFolderPath
 
 const SONAR_SCANNER_MIRROR = 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/'
 const SONAR_SCANNER_VERSION = '4.2.0.1873'
@@ -62,7 +63,7 @@ function getSonarQubeScannerExecutable(passExecutableCallback) {
   const platformBinariesVersion =
     process.env.SONAR_SCANNER_VERSION || process.env.npm_config_sonar_scanner_version || SONAR_SCANNER_VERSION
   var targetOS = findTargetOS()
-  var installFolder = path.join(os.homedir(), '.sonar', 'native-sonar-scanner')
+  var installFolder = getInstallFolderPath()
   var binaryExtension = ''
   if (isWindows()) {
     binaryExtension = '.bat'
@@ -158,6 +159,11 @@ function findTargetOS() {
   throw Error(`Your platform '${process.platform}' is currently not supported.`)
 }
 
+function getInstallFolderPath() {
+  var basePath = process.env.SONAR_BINARY_CACHE ? process.env.SONAR_BINARY_CACHE : os.homedir()
+  return path.join(basePath, '.sonar', 'native-sonar-scanner')
+}
+
 /*
  * Some util functions...
  */

specs/sonarqube-scanner-executable-test.js

@@ -59,6 +59,13 @@ describe('sqScannerExecutable', function() {
   })
 })
 
+describe('getSonarQubeScannerExecutable', function() {
+  it('should use SONAR_BINARY_CACHE env when exists', function() {
+    process.env.SONAR_BINARY_CACHE = './test-cache'
+    assert.equal(index.getInstallFolderPath(), 'test-cache/.sonar/native-sonar-scanner', 'congrats')
+  })
+})
+
 function pathForProject(projectFolder) {
   return path.join(process.cwd(), 'specs', 'resources', projectFolder)
 }