fix ImportError: No module named 'six' #13 on Windows, fix evaluate_javascript feature also in non-project files

Author: pichillilorenzo

_generated_2018_01_14_at_01_20_41.py renamed to _generated_2018_01_14_at_17_26_33.py

@@ -3,7 +3,7 @@
 from shutil import copyfile
 from threading import Timer
 
-PLUGIN_VERSION = "0.13.0"
+PLUGIN_VERSION = "0.13.1"
 
 PACKAGE_PATH = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = os.path.basename(PACKAGE_PATH)
@@ -245,9 +245,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
       )
 
       if sublime.platform() == "windows" and use_fp_temp: 
-        if not fp.closed:
-          fp.close()
-        os.unlink(fp.name)
+        os.remove(fp.name)
 
       # reset the PATH environment variable
       os.environ.update(old_env)
@@ -299,9 +297,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
       os.environ.update(old_env)
 
       if sublime.platform() == "windows" and use_fp_temp: 
-        if not fp.closed:
-          fp.close()
-        os.unlink(fp.name)
+        os.remove(fp.name)
 
       try:
         result = json.loads(output.decode("utf-8", "ignore")) if is_output_json else output.decode("utf-8", "ignore")
@@ -323,9 +319,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
 
       if use_fp_temp :
         if sublime.platform() == "windows": 
-          if not fp.closed:
-            fp.close()
-          os.unlink(fp.name)
+          os.remove(fp.name)
         else:
           fp.close()
       return [False, None]
@@ -339,9 +333,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
 
       if use_fp_temp :
         if sublime.platform() == "windows": 
-          if not fp.closed:
-            fp.close()
-          os.unlink(fp.name)
+          os.remove(fp.name)
         else:
           fp.close()
       return [False, None]
@@ -436,7 +428,6 @@ def getCurrentNPMVersion(self) :
 
 import sublime, sublime_plugin
 import re, urllib, shutil, traceback, threading, time, os, hashlib, json, multiprocessing, shlex
-from six import iteritems
 
 class Util(object) :
 
@@ -1002,7 +993,7 @@ def _nested_lookup(key, values, document, wild=False):
                   yield result
 
       if isinstance(document, dict):
-          for k, v in iteritems(document):
+          for k, v in document.items():
               if values and v in values and (key == k or (wild and key.lower() in k.lower())):
                   yield document
               elif not values and key == k or (wild and key.lower() in k.lower()):
@@ -1621,7 +1612,7 @@ def on_load(self, view):
 
 
 import sublime, sublime_plugin
-import shlex, json
+import shlex, json, os
 
 class manage_cliCommand(sublime_plugin.WindowCommand):
 
@@ -1636,6 +1627,7 @@ class manage_cliCommand(sublime_plugin.WindowCommand):
   isNode = False
   isNpm = False
   isBinPath = False
+  alsoNonProject = False
 
   def run(self, **kwargs):
 
@@ -1665,6 +1657,34 @@ def run(self, **kwargs):
             self.command = ["$(which "+shlex.quote(self.path_cli)+")"]
           self.path_cli = self.settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path")
 
+      if not self.command:
+        self.command = kwargs.get("command")
+      else:
+        self.command += kwargs.get("command")
+
+      self.prepare_command(**kwargs)
+
+    elif self.alsoNonProject:
+
+      self.working_directory = os.path.expanduser("~")
+
+      if self.isNode:
+        self.path_cli = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
+      elif self.isNpm:
+        if self.settings["project_settings"]["use_yarn"]:
+          self.path_cli = javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
+        else:
+          self.path_cli = javascriptCompletions.get("npm_custom_path") or NPM_EXEC
+      else:
+        self.path_cli = javascriptCompletions.get(self.custom_name+"_custom_path") if javascriptCompletions.get(self.custom_name+"_custom_path") else self.cli
+
+        if sublime.platform() != "windows" and javascriptCompletions.get("node_js_custom_path"):
+          if os.path.isabs(self.path_cli) :
+            self.command = [shlex.quote(self.path_cli)]
+          else:
+            self.command = ["$(which "+shlex.quote(self.path_cli)+")"]
+          self.path_cli = javascriptCompletions.get("node_js_custom_path")
+
 
       if not self.command:
         self.command = kwargs.get("command")
@@ -1676,6 +1696,7 @@ def run(self, **kwargs):
     else :
       sublime.error_message("Error: can't get project settings")
 
+
   def prepare_command(self):
     pass
 
@@ -4738,6 +4759,7 @@ class navigate_flow_errorsCommand(navigate_regionsCommand, sublime_plugin.TextCo
 class evaluate_javascriptCommand(manage_cliCommand):
 
   isNode = True
+  alsoNonProject = True
 
   def prepare_command(self, **kwargs):
 

changelog/0.13.1.txt

@@ -0,0 +1,83 @@
+v0.13.1
+
+## Fixes
+
+- fix ImportError: No module named 'six' #13 on Windows
+- fix evaluate_javascript feature also in non-project files
+
+
+
+=================================================================
+** 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 (only about the creation for the moment)
+- React Native projects (only about the creation for the moment. I will add also NativeScript support)
+- Express projects (only about the creation for the moment)
+- 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/Using-it-with-an-existing-project)!
+
+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 
+👉 Windows (64-bit): released without the use of TerminalView plugin. For each feature (like also creating a project) will be used the cmd.exe shell (so during the creation of a project don't close it until it finishes!). Unfortunately the TerminalView plugin supports only Linux-based OS 😞. Has someone any advice or idea about that? Is there something similar to the TerminalView plugin for Windows?? Thanks!
+
+❗❗ 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 (only for Linux and Mac OS X) 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/evaluate_javascript_command.py

@@ -4,6 +4,7 @@
 class evaluate_javascriptCommand(manage_cliCommand):
 
   isNode = True
+  alsoNonProject = True
 
   def prepare_command(self, **kwargs):
 

helper/node/main.py

@@ -114,9 +114,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
       )
 
       if sublime.platform() == "windows" and use_fp_temp: 
-        if not fp.closed:
-          fp.close()
-        os.unlink(fp.name)
+        os.remove(fp.name)
 
       # reset the PATH environment variable
       os.environ.update(old_env)
@@ -168,9 +166,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
       os.environ.update(old_env)
 
       if sublime.platform() == "windows" and use_fp_temp: 
-        if not fp.closed:
-          fp.close()
-        os.unlink(fp.name)
+        os.remove(fp.name)
 
       try:
         result = json.loads(output.decode("utf-8", "ignore")) if is_output_json else output.decode("utf-8", "ignore")
@@ -192,9 +188,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
 
       if use_fp_temp :
         if sublime.platform() == "windows": 
-          if not fp.closed:
-            fp.close()
-          os.unlink(fp.name)
+          os.remove(fp.name)
         else:
           fp.close()
       return [False, None]
@@ -208,9 +202,7 @@ def execute_check_output(self, command, command_args, is_from_bin=False, use_fp_
 
       if use_fp_temp :
         if sublime.platform() == "windows": 
-          if not fp.closed:
-            fp.close()
-          os.unlink(fp.name)
+          os.remove(fp.name)
         else:
           fp.close()
       return [False, None]

helper/util/main.py

@@ -1,6 +1,5 @@
 import sublime, sublime_plugin
 import re, urllib, shutil, traceback, threading, time, os, hashlib, json, multiprocessing, shlex
-from six import iteritems
 
 class Util(object) :
 
@@ -566,7 +565,7 @@ def _nested_lookup(key, values, document, wild=False):
                   yield result
 
       if isinstance(document, dict):
-          for k, v in iteritems(document):
+          for k, v in document.items():
               if values and v in values and (key == k or (wild and key.lower() in k.lower())):
                   yield document
               elif not values and key == k or (wild and key.lower() in k.lower()):

make/_init.py

@@ -3,7 +3,7 @@
 from shutil import copyfile
 from threading import Timer
 
-PLUGIN_VERSION = "0.13.0"
+PLUGIN_VERSION = "0.13.1"
 
 PACKAGE_PATH = os.path.abspath(os.path.dirname(__file__))
 PACKAGE_NAME = os.path.basename(PACKAGE_PATH)

messages.json

@@ -9,5 +9,6 @@
   "0.11.0": "changelog/0.11.0.txt",
   "0.11.1": "changelog/0.11.1.txt",
   "0.11.11": "changelog/0.11.11.txt",
-  "0.13.0": "changelog/0.13.0.txt"
+  "0.13.0": "changelog/0.13.0.txt",
+  "0.13.1": "changelog/0.13.1.txt"
 }

project/manage_cli/manage_cli_command.py

@@ -1,5 +1,5 @@
 import sublime, sublime_plugin
-import shlex, json
+import shlex, json, os
 
 class manage_cliCommand(sublime_plugin.WindowCommand):
 
@@ -14,6 +14,7 @@ class manage_cliCommand(sublime_plugin.WindowCommand):
   isNode = False
   isNpm = False
   isBinPath = False
+  alsoNonProject = False
 
   def run(self, **kwargs):
 
@@ -43,6 +44,34 @@ def run(self, **kwargs):
             self.command = ["$(which "+shlex.quote(self.path_cli)+")"]
           self.path_cli = self.settings["project_settings"]["node_js_custom_path"] or javascriptCompletions.get("node_js_custom_path")
 
+      if not self.command:
+        self.command = kwargs.get("command")
+      else:
+        self.command += kwargs.get("command")
+
+      self.prepare_command(**kwargs)
+
+    elif self.alsoNonProject:
+
+      self.working_directory = os.path.expanduser("~")
+
+      if self.isNode:
+        self.path_cli = javascriptCompletions.get("node_js_custom_path") or NODE_JS_EXEC
+      elif self.isNpm:
+        if self.settings["project_settings"]["use_yarn"]:
+          self.path_cli = javascriptCompletions.get("yarn_custom_path") or YARN_EXEC
+        else:
+          self.path_cli = javascriptCompletions.get("npm_custom_path") or NPM_EXEC
+      else:
+        self.path_cli = javascriptCompletions.get(self.custom_name+"_custom_path") if javascriptCompletions.get(self.custom_name+"_custom_path") else self.cli
+
+        if sublime.platform() != "windows" and javascriptCompletions.get("node_js_custom_path"):
+          if os.path.isabs(self.path_cli) :
+            self.command = [shlex.quote(self.path_cli)]
+          else:
+            self.command = ["$(which "+shlex.quote(self.path_cli)+")"]
+          self.path_cli = javascriptCompletions.get("node_js_custom_path")
+
 
       if not self.command:
         self.command = kwargs.get("command")
@@ -54,6 +83,7 @@ def run(self, **kwargs):
     else :
       sublime.error_message("Error: can't get project settings")
 
+
   def prepare_command(self):
     pass