Rely on run-node on Mac (#236)

3 files changed, 10 insertions, 2 deletions

diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/CssAnalyzerBridgeServer.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/CssAnalyzerBridgeServer.java
index 702e880..a7bc764 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/CssAnalyzerBridgeServer.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/CssAnalyzerBridgeServer.java
@@ -108,7 +108,7 @@ public class CssAnalyzerBridgeServer {
     PROFILER.stopDebug();
   }
 
-  private void initNodeCommand(SensorContext context, File scriptFile) {
+  private void initNodeCommand(SensorContext context, File scriptFile) throws IOException {
     nodeCommandBuilder
       .outputConsumer(message -> {
         if (message.startsWith("DEBUG")) {
@@ -122,6 +122,7 @@ public class CssAnalyzerBridgeServer {
       .minNodeVersion(8)
       .configuration(context.config())
       .script(scriptFile.getAbsolutePath())
+      .pathResolver(bundle)
       .scriptArgs(String.valueOf(port));
 
     context.config()
diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/bundle/Bundle.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/bundle/Bundle.java
index 2639500..0ffd46d 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/bundle/Bundle.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/bundle/Bundle.java
@@ -20,8 +20,9 @@
 package org.sonar.css.plugin.server.bundle;
 
 import java.nio.file.Path;
+import org.sonarsource.nodejs.BundlePathResolver;
 
-public interface Bundle {
+public interface Bundle extends BundlePathResolver {
 
   void deploy(Path deployLocation);
 
diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/bundle/CssAnalyzerBundle.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/bundle/CssAnalyzerBundle.java
index eb59f05..7439ac1 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/bundle/CssAnalyzerBundle.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/server/bundle/CssAnalyzerBundle.java
@@ -45,6 +45,7 @@ public class CssAnalyzerBundle implements Bundle {
   final String bundleLocation;
 
   private String startServerScript = DEFAULT_STARTUP_SCRIPT.toString();
+  private Path deployLocation;
 
   public CssAnalyzerBundle() {
     this(DEFAULT_BUNDLE_LOCATION);
@@ -57,6 +58,7 @@ public class CssAnalyzerBundle implements Bundle {
 
   @Override
   public void deploy(Path deployLocation) {
+    this.deployLocation = deployLocation;
     PROFILER.startDebug("Deploying bundle");
     LOG.debug("Deploying css-bundle into {}", deployLocation);
     InputStream bundle = getClass().getResourceAsStream(bundleLocation);
@@ -78,4 +80,8 @@ public class CssAnalyzerBundle implements Bundle {
     return startServerScript;
   }
 
+  @Override
+  public String resolve(String relativePath) {
+    return deployLocation.resolve("css-bundle").resolve(relativePath).toString();
+  }
 }