fixes for node.js and npm custom path, added PATH in global settings

Author: pichillilorenzo

JavaScript Enhancements.sublime-settings

@@ -1,5 +1,6 @@
 {
   "enable_can_i_use_menu_option": true,
+  "PATH": "",
   "node_js_custom_path": "node",
   "npm_custom_path": "npm",
   "yarn_custom_path": "yarn",

_generated_2018_01_02_at_13_16_08.py renamed to _generated_2018_01_02_at_20_54_26.py

@@ -135,24 +135,6 @@ def stop(self):
 NODE_MODULES_PATH = os.path.join(PACKAGE_PATH, NODE_MODULES_FOLDER_NAME)
 NODE_MODULES_BIN_PATH = os.path.join(NODE_MODULES_PATH, ".bin")
 
-def get_node_js_custom_path():
-  json_file = Util.open_json(os.path.join(PACKAGE_PATH,  "JavaScript Enhancements.sublime-settings"))
-  if json_file and "node_js_custom_path" in json_file :
-    return json_file.get("node_js_custom_path").strip()
-  return ""
-
-def get_npm_custom_path():
-  json_file = Util.open_json(os.path.join(PACKAGE_PATH, "JavaScript Enhancements.sublime-settings"))
-  if json_file and "npm_custom_path" in json_file :
-    return json_file.get("npm_custom_path").strip()
-  return ""
-
-def get_yarn_custom_path():
-  json_file = Util.open_json(os.path.join(PACKAGE_PATH, "JavaScript Enhancements.sublime-settings"))
-  if json_file and "yarn_custom_path" in json_file :
-    return json_file.get("yarn_custom_path").strip()
-  return ""
-
 class NodeJS(object):
   def __init__(self, check_local = False):
     self.check_local = check_local
@@ -161,11 +143,11 @@ def __init__(self, check_local = False):
     if self.check_local :
       settings = get_project_settings()
       if settings :
-        self.node_js_path = settings["project_settings"]["node_js_custom_path"] or get_node_js_custom_path() or NODE_JS_EXEC
+        self.node_js_path = settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
       else :
-        self.node_js_path = get_node_js_custom_path() or NODE_JS_EXEC
+        self.node_js_path = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
     else :
-      self.node_js_path = get_node_js_custom_path() or NODE_JS_EXEC
+      self.node_js_path = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
 
   def eval(self, js, eval_type="eval", strict_mode=False):
 
@@ -308,26 +290,30 @@ def __init__(self, check_local = False):
     self.npm_path = ""
     self.yarn_path = ""
     self.cli_path = ""
+    self.node_js_path = ""
 
     if self.check_local :
       settings = get_project_settings()
       if settings :
-        self.npm_path = settings["project_settings"]["npm_custom_path"] or get_npm_custom_path() or NPM_EXEC
-        self.yarn_path = settings["project_settings"]["yarn_custom_path"] or get_yarn_custom_path() or YARN_EXEC
+        self.node_js_path = settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
+        self.npm_path = settings["project_settings"]["npm_custom_path"] or javascriptCompletions.get("npm_custom_path") or NPM_EXEC
+        self.yarn_path = settings["project_settings"]["yarn_custom_path"] or javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
 
         if settings["project_settings"]["use_yarn"] and self.yarn_path :
           self.cli_path = self.yarn_path
         else :
           self.cli_path = self.npm_path
 
       else :
-        self.npm_path = get_npm_custom_path() or NPM_EXEC
-        self.yarn_path = get_yarn_custom_path() or YARN_EXEC
+        self.node_js_path = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
+        self.npm_path = javascriptCompletions.get("npm_custom_path") or NPM_EXEC
+        self.yarn_path = javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
 
         self.cli_path = self.npm_path
     else :
-      self.npm_path = get_npm_custom_path() or NPM_EXEC
-      self.yarn_path = get_yarn_custom_path() or YARN_EXEC
+      self.node_js_path = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
+      self.npm_path = javascriptCompletions.get("npm_custom_path") or NPM_EXEC
+      self.yarn_path = javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
 
       self.cli_path = self.npm_path
 
@@ -338,7 +324,7 @@ def execute(self, command, command_args, chdir="", wait_terminate=True, func_std
     if sublime.platform() == 'windows':
       args = [self.cli_path, command] + command_args
     else :
-      args = [self.cli_path, command] + command_args
+      args = [self.node_js_path, self.cli_path, command] + command_args
 
     return Util.execute(args[0], args[1:], chdir=chdir, wait_terminate=wait_terminate, func_stdout=func_stdout, args_func_stdout=args_func_stdout)
 
@@ -377,7 +363,7 @@ def getCurrentNPMVersion(self) :
     if sublime.platform() == 'windows':
       args = [self.cli_path, "-v"]
     else :
-      args = [self.node_js_path, self.cli_path, "-v"]
+      args = [self.cli_path, "-v"]
 
     result = Util.execute(args[0], args[1:])
 
@@ -837,7 +823,11 @@ def execute(command, command_args, chdir="", wait_terminate=True, func_stdout=No
 
     if wait_terminate :
 
-      with subprocess.Popen(args, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=(None if not chdir else chdir)) as p:
+      env = os.environ.copy()
+      env["PATH"] = env["PATH"] + javascriptCompletions.get("PATH")
+      shell = os.getenv('SHELL')
+
+      with subprocess.Popen(args, shell=True, executable=shell, env=env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=(None if not chdir else chdir)) as p:
 
         lines_output = []
         lines_error = []
@@ -863,7 +853,11 @@ def execute(command, command_args, chdir="", wait_terminate=True, func_stdout=No
   @staticmethod
   def _wrapper_func_stdout(args, func_stdout, args_func_stdout=[], chdir=""):
 
-    with subprocess.Popen(args, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=1, preexec_fn=os.setsid, cwd=(None if not chdir else chdir)) as p:
+    env = os.environ.copy()
+    env["PATH"] = env["PATH"] + javascriptCompletions.get("PATH")
+    shell = os.getenv('SHELL')
+
+    with subprocess.Popen(args, shell=True, executable=shell, env=env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=1, preexec_fn=os.setsid, cwd=(None if not chdir else chdir)) as p:
 
       func_stdout(None, p, *args_func_stdout)
 
@@ -1550,12 +1544,12 @@ def run(self, **kwargs):
         self.working_directory =  self.settings[self.settings_name]["working_directory"]
 
       if self.isNode:
-        self.path_cli = self.settings["project_settings"]["node_js_custom_path"] or get_node_js_custom_path() or NODE_JS_EXEC
+        self.path_cli = self.settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
       elif self.isNpm:
         if self.settings["project_settings"]["use_yarn"]:
-          self.path_cli = self.settings["project_settings"]["yarn_custom_path"] or get_yarn_custom_path() or YARN_EXEC
+          self.path_cli = self.settings["project_settings"]["yarn_custom_path"] or javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
         else:
-          self.path_cli = self.settings["project_settings"]["npm_custom_path"] or get_npm_custom_path() or NPM_EXEC
+          self.path_cli = self.settings["project_settings"]["npm_custom_path"] or javascriptCompletions.get("npm_custom_path") or NPM_EXEC
       else:
         self.path_cli = self.settings[self.settings_name]["cli_custom_path"] if self.settings[self.settings_name]["cli_custom_path"] else ( javascriptCompletions.get(self.custom_name+"_custom_path") if javascriptCompletions.get(self.custom_name+"_custom_path") else self.cli )
       self.command = kwargs.get("command")
@@ -4863,7 +4857,7 @@ def start():
   try:
     sys.modules["TerminalView"]
   except Exception as err:
-    response = sublime.yes_no_cancel_dialog("TerminalView plugin is missing. TerminalView is required to be able to use \"JavaScript Enhancements\" plugin. Do you want open the github repo of it?", "Yes, open it", "No")
+    response = sublime.yes_no_cancel_dialog("TerminalView plugin is missing. TerminalView is required to be able to use \"JavaScript Enhancements\" plugin.\n\nDo you want open the github repo of it?", "Yes, open it", "No")
     if response == sublime.DIALOG_YES:
       sublime.active_window().run_command("open_url", args={"url": "https://github.com/Wramberg/TerminalView"})
     return
@@ -4877,9 +4871,22 @@ def start():
 
   node = NodeJS(check_local=True)
   try:
-    node.getCurrentNodeJSVersion()
+    print(node.getCurrentNodeJSVersion())
+  except Exception as err: 
+    print(err)
+    response = sublime.yes_no_cancel_dialog("Error during installation: \"node.js\" seems not installed on your system. Node.js and npm are required to be able to use JavaScript Enhancements plugin.\n\nIf you are using \"nvm\" or you have a different path for node.js and npm, please then change the path on:\n\nPreferences > Package Settings > JavaScript Enhancements > Settings\n\nand restart Sublime Text.\n\nIf this doesn't work then try also to add the path of their binaries in the PATH key-value on the same JavaScript Enhancements settings file. This variable will be used to add them in the $PATH environment variable, so put the symbol \":\" in front of your path.\n\nDo you want open the website of node.js?", "Yes, open it", "Or use nvm")
+    if response == sublime.DIALOG_YES:
+      sublime.active_window().run_command("open_url", args={"url": "https://nodejs.org"})
+    elif response == sublime.DIALOG_NO:
+      sublime.active_window().run_command("open_url", args={"url": "https://github.com/creationix/nvm"})
+    return
+
+  npm = NPM(check_local=True)
+  try:
+    print(npm.getCurrentNPMVersion())
   except Exception as err: 
-    response = sublime.yes_no_cancel_dialog("Error during installation: node.js is not installed on your system. Node.js and npm are required to be able to use JavaScript Enhancements plugin. Do you want open the website of node.js?", "Yes, open it", "Or use nvm")
+    print(err)
+    response = sublime.yes_no_cancel_dialog("Error during installation: \"npm\" seems not installed on your system. Node.js and npm are required to be able to use JavaScript Enhancements plugin.\n\nIf you are using \"nvm\" or you have a different path for node.js and npm, please change their custom path on:\n\nPreferences > Package Settings > JavaScript Enhancements > Settings\n\nand restart Sublime Text.\n\nIf this doesn't work then try also to add the path of their binaries in the PATH key-value on the same JavaScript Enhancements settings file. This variable will be used to add them in the $PATH environment variable, so put the symbol \":\" in front of your path.\n\nDo you want open the website of node.js?", "Yes, open it", "Or use nvm")
     if response == sublime.DIALOG_YES:
       sublime.active_window().run_command("open_url", args={"url": "https://nodejs.org"})
     elif response == sublime.DIALOG_NO:

changelog/0.1.10.txt

@@ -0,0 +1,83 @@
+v0.1.10
+
+## Fixes
+
+- fixed node.js and npm custom path
+- Added "PATH" key-value in the global setting 
+
+  see the Wiki - Fixing node.js and npm custom path for the explanation: 
+  https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki/Installation#fixing-nodejs-and-npm-custom-path
+
+
+=================================================================
+** THIS PLUGIN IS IN BETA! Thanks for your support in advance! **
+=================================================================
+
+If you like it, remember to star it ⭐ on GitHub: https://github.com/pichillilorenzo/JavaScriptEnhancements
+
+** USAGE **
+===========
+
+See how it works on the Wiki: 👉👉 https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki 👈👈
+
+
+** WHAT IS THIS? **
+===================
+
+This plugin uses Flow (javascript static type checker from Facebook) under the hood.
+
+It offers better javascript autocomplete and a lot of features about creating, 
+developing and managing javascript projects, such as:
+
+- Cordova projects (run cordova emulate, build, compile, serve, etc. directly from Sublime Text!)
+- Ionic v1 and v2 projects (same as Cordova projects!)
+- Angular v1 and v2 projects
+- React projects
+- Express projects
+- Yeoman generators
+- Local bookmarks project
+- JavaScript real-time errors
+- etc.
+
+You could use it also in existing projects (see the Wiki - https://github.com/pichillilorenzo/JavaScriptEnhancements/wiki)!
+
+It turns Sublime Text into a JavaScript IDE like!
+
+This project is based on my other Sublime Text plugin JavaScript Completions (https://github.com/pichillilorenzo/JavaScript-Completions)
+
+** NOTE **
+If you want use this plugin, you may want uninstall/disable the JavaScript Completions plugin, if installed.
+
+** OS SUPPORTED NOW **
+======================
+
+👉 Linux (64-bit)
+👉 Mac OS X 
+
+❗❗ Dependencies ❗❗
+=======================
+
+In order to work properly, this plugin has some dependencies:
+
+👉 Sublime Text 3 (build 3124 or newer)
+👉 Node.js and npm (https://nodejs.org or nvm (https://github.com/creationix/nvm))
+👉 TerminalView sublime text plugin (https://github.com/Wramberg/TerminalView)
+
+Not required, but useful for typescript files (Flow wont work on this type of files):
+
+👉 TypeScript sublime text plugin (https://github.com/Microsoft/TypeScript-Sublime-Plugin) 
+
+** Flow Requirements **
+=======================
+
+It use [Flow](https://github.com/facebook/flow) for type checking and auto-completions.
+
+👉 Mac OS X
+👉 Linux (64-bit)
+👉 Windows (64-bit)
+
+Email me for any questions or doubts about this new project on: [email protected]
+
+Thanks for your support! 😄😄
+
+MIT License

helper/node/main.py

@@ -9,24 +9,6 @@
 NODE_MODULES_PATH = os.path.join(PACKAGE_PATH, NODE_MODULES_FOLDER_NAME)
 NODE_MODULES_BIN_PATH = os.path.join(NODE_MODULES_PATH, ".bin")
 
-def get_node_js_custom_path():
-  json_file = Util.open_json(os.path.join(PACKAGE_PATH,  "JavaScript Enhancements.sublime-settings"))
-  if json_file and "node_js_custom_path" in json_file :
-    return json_file.get("node_js_custom_path").strip()
-  return ""
-
-def get_npm_custom_path():
-  json_file = Util.open_json(os.path.join(PACKAGE_PATH, "JavaScript Enhancements.sublime-settings"))
-  if json_file and "npm_custom_path" in json_file :
-    return json_file.get("npm_custom_path").strip()
-  return ""
-
-def get_yarn_custom_path():
-  json_file = Util.open_json(os.path.join(PACKAGE_PATH, "JavaScript Enhancements.sublime-settings"))
-  if json_file and "yarn_custom_path" in json_file :
-    return json_file.get("yarn_custom_path").strip()
-  return ""
-
 class NodeJS(object):
   def __init__(self, check_local = False):
     self.check_local = check_local
@@ -35,11 +17,11 @@ def __init__(self, check_local = False):
     if self.check_local :
       settings = get_project_settings()
       if settings :
-        self.node_js_path = settings["project_settings"]["node_js_custom_path"] or get_node_js_custom_path() or NODE_JS_EXEC
+        self.node_js_path = settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
       else :
-        self.node_js_path = get_node_js_custom_path() or NODE_JS_EXEC
+        self.node_js_path = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
     else :
-      self.node_js_path = get_node_js_custom_path() or NODE_JS_EXEC
+      self.node_js_path = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
 
   def eval(self, js, eval_type="eval", strict_mode=False):
 
@@ -182,26 +164,30 @@ def __init__(self, check_local = False):
     self.npm_path = ""
     self.yarn_path = ""
     self.cli_path = ""
+    self.node_js_path = ""
 
     if self.check_local :
       settings = get_project_settings()
       if settings :
-        self.npm_path = settings["project_settings"]["npm_custom_path"] or get_npm_custom_path() or NPM_EXEC
-        self.yarn_path = settings["project_settings"]["yarn_custom_path"] or get_yarn_custom_path() or YARN_EXEC
+        self.node_js_path = settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
+        self.npm_path = settings["project_settings"]["npm_custom_path"] or javascriptCompletions.get("npm_custom_path") or NPM_EXEC
+        self.yarn_path = settings["project_settings"]["yarn_custom_path"] or javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
 
         if settings["project_settings"]["use_yarn"] and self.yarn_path :
           self.cli_path = self.yarn_path
         else :
           self.cli_path = self.npm_path
 
       else :
-        self.npm_path = get_npm_custom_path() or NPM_EXEC
-        self.yarn_path = get_yarn_custom_path() or YARN_EXEC
+        self.node_js_path = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
+        self.npm_path = javascriptCompletions.get("npm_custom_path") or NPM_EXEC
+        self.yarn_path = javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
 
         self.cli_path = self.npm_path
     else :
-      self.npm_path = get_npm_custom_path() or NPM_EXEC
-      self.yarn_path = get_yarn_custom_path() or YARN_EXEC
+      self.node_js_path = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
+      self.npm_path = javascriptCompletions.get("npm_custom_path") or NPM_EXEC
+      self.yarn_path = javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
 
       self.cli_path = self.npm_path
 
@@ -212,7 +198,7 @@ def execute(self, command, command_args, chdir="", wait_terminate=True, func_std
     if sublime.platform() == 'windows':
       args = [self.cli_path, command] + command_args
     else :
-      args = [self.cli_path, command] + command_args
+      args = [self.node_js_path, self.cli_path, command] + command_args
 
     return Util.execute(args[0], args[1:], chdir=chdir, wait_terminate=wait_terminate, func_stdout=func_stdout, args_func_stdout=args_func_stdout)
 
@@ -251,7 +237,7 @@ def getCurrentNPMVersion(self) :
     if sublime.platform() == 'windows':
       args = [self.cli_path, "-v"]
     else :
-      args = [self.node_js_path, self.cli_path, "-v"]
+      args = [self.cli_path, "-v"]
 
     result = Util.execute(args[0], args[1:])
 

helper/util/main.py

@@ -449,7 +449,11 @@ def execute(command, command_args, chdir="", wait_terminate=True, func_stdout=No
 
     if wait_terminate :
 
-      with subprocess.Popen(args, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=(None if not chdir else chdir)) as p:
+      env = os.environ.copy()
+      env["PATH"] = env["PATH"] + javascriptCompletions.get("PATH")
+      shell = os.getenv('SHELL')
+
+      with subprocess.Popen(args, shell=True, executable=shell, env=env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=(None if not chdir else chdir)) as p:
 
         lines_output = []
         lines_error = []
@@ -475,7 +479,11 @@ def execute(command, command_args, chdir="", wait_terminate=True, func_stdout=No
   @staticmethod
   def _wrapper_func_stdout(args, func_stdout, args_func_stdout=[], chdir=""):
 
-    with subprocess.Popen(args, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=1, preexec_fn=os.setsid, cwd=(None if not chdir else chdir)) as p:
+    env = os.environ.copy()
+    env["PATH"] = env["PATH"] + javascriptCompletions.get("PATH")
+    shell = os.getenv('SHELL')
+
+    with subprocess.Popen(args, shell=True, executable=shell, env=env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, bufsize=1, preexec_fn=os.setsid, cwd=(None if not chdir else chdir)) as p:
 
       func_stdout(None, p, *args_func_stdout)