Merge pull request #308 from jpogran/GH-307-fix-path-resolution-on-nix-and-mac

(GH-307) Fix path resolution on mac and *nix

Author: glennsarti

src/configuration.ts

@@ -26,7 +26,7 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
     this.debugFilePath = this.config['languageserver']['debugFilePath'];
   }
 
-  get puppetAgentDir(): string {
+  get puppetBaseDir(): string {
     if (this.config['puppetAgentDir'] !== null) {
       return this.config['puppetAgentDir'];
     }
@@ -37,9 +37,12 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
         if (process.env['PROCESSOR_ARCHITEW6432'] === 'AMD64') {
           programFiles = process.env['ProgramW6432'] || 'C:\\Program Files';
         }
+        // On Windows we have a subfolder called 'Puppet' that has
+        // every product underneath
         return path.join(programFiles, 'Puppet Labs', 'Puppet');
       default:
-        return '/opt/puppetlabs/puppet';
+        // On *nix we don't have a sub folder called 'Puppet'
+        return '/opt/puppetlabs';
     }
   }
 
@@ -61,34 +64,45 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
   }
 
   get puppetDir(): string {
-    return path.join(this.puppetAgentDir, 'puppet');
+    return path.join(this.puppetBaseDir, 'puppet');
   }
 
   get facterDir(): string {
-    return path.join(this.puppetAgentDir, 'facter');
+    return path.join(this.puppetBaseDir, 'facter');
   }
 
   get hieraDir(): string {
-    return path.join(this.puppetAgentDir, 'hiera');
+    return path.join(this.puppetBaseDir, 'hiera');
   }
 
   get mcoDir(): string {
-    return path.join(this.puppetAgentDir, 'mcollective');
+    return path.join(this.puppetBaseDir, 'mcollective');
   }
 
   get rubydir(): string {
-    return path.join(this.puppetAgentDir, 'sys', 'ruby');
+    switch(process.platform){
+      case 'win32':
+        return path.join(this.puppetBaseDir, 'sys', 'ruby');
+      default:
+        return path.join(this.puppetBaseDir, 'lib', 'ruby');      
+    }
+  }
+
+  get sslCertDir(): string {
+    return path.join(this.puppetDir, 'ssl', 'certs');
   }
 
+  get sslCertFile(): string {
+    return path.join(this.puppetDir, 'ssl', 'cert.pem');
+  }
+
+  // RUBYLIB=%PUPPET_DIR%\lib;%FACTERDIR%\lib;%HIERA_DIR%\lib;%RUBYLIB%
   get rubylib(): string {
-    var p =
-      path.join(this.puppetDir, 'lib') +
-      this.pathEnvSeparator() +
-      path.join(this.facterDir, 'lib') +
-      this.pathEnvSeparator() +
-      path.join(this.hieraDir, 'lib') +
-      this.pathEnvSeparator() +
-      path.join(this.mcoDir, 'lib');
+    var p = new Array(
+      path.join(this.puppetDir, 'lib'),
+      path.join(this.facterDir, 'lib'),
+      // path.join(this.hieraDir, 'lib'),
+    ).join(this.pathEnvSeparator());
 
     if (process.platform === 'win32') {
       // Translate all slashes to / style to avoid puppet/ruby issue #11930
@@ -98,31 +112,16 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
     return p;
   }
 
-  get sslCertDir(): string {
-    return path.join(this.puppetDir, 'ssl', 'certs');
-  }
-
-  get sslCertFile(): string {
-    return path.join(this.puppetDir, 'ssl', 'cert.pem');
-  }
-
+  // PATH=%PUPPET_DIR%\bin;%FACTERDIR%\bin;%HIERA_DIR%\bin;%PL_BASEDIR%\bin;%RUBY_DIR%\bin;%PL_BASEDIR%\sys\tools\bin;%PATH%
   get environmentPath(): string {
-    return (
-      path.join(this.puppetDir, 'bin') +
-      this.pathEnvSeparator() +
-      path.join(this.facterDir, 'bin') +
-      this.pathEnvSeparator() +
-      path.join(this.hieraDir, 'bin') +
-      this.pathEnvSeparator() +
-      path.join(this.mcoDir, 'bin') +
-      this.pathEnvSeparator() +
-      path.join(this.puppetAgentDir, 'bin') +
-      this.pathEnvSeparator() +
-      path.join(this.rubydir, 'bin') +
-      this.pathEnvSeparator() +
-      path.join(this.puppetAgentDir, 'sys', 'tools', 'bin') +
-      this.pathEnvSeparator()
-    );
+    return new Array(
+      path.join(this.puppetDir, 'bin'),
+      path.join(this.facterDir, 'bin'),
+      // path.join(this.hieraDir, 'bin'),
+      path.join(this.puppetBaseDir, 'bin'),
+      path.join(this.rubydir, 'bin'),
+      path.join(this.puppetBaseDir, 'sys', 'tools', 'bin')
+    ).join(this.pathEnvSeparator());
   }
 
   get languageServerPath(): string {

src/interfaces.ts

@@ -30,7 +30,7 @@ export interface IConnectionConfiguration {
   timeout: number;
   enableFileCache: boolean;
   debugFilePath: string;
-  puppetAgentDir: string;
+  puppetBaseDir: string;
   languageServerPath: string;
   rubydir: string;
   rubylib: string;

src/rubyHelper.ts

@@ -52,7 +52,7 @@ export class RubyHelper {
       result.options.env.RUBYLIB = '';
     }
     result.options.env.RUBY_DIR = connectionConfiguration.rubydir;
-    result.options.env.PATH =connectionConfiguration.environmentPath + result.options.env.PATH;
+    result.options.env.PATH =connectionConfiguration.environmentPath + this.pathEnvSeparator() + result.options.env.PATH;
     result.options.env.RUBYLIB = connectionConfiguration.rubylib + this.pathEnvSeparator() + result.options.env.RUBYLIB;
     result.options.env.RUBYOPT = 'rubygems';
     result.options.env.SSL_CERT_FILE = connectionConfiguration.sslCertFile;