Added support for automatic download for node.js and npm on Windows, updated README.md and changelog/install.txt

Lorenzo · Lorenzo · commit 5b3976d8cdba · 2017-04-09T17:04:51.000+02:00
diff --git a/README.md b/README.md
@@ -10,16 +10,32 @@ It helps you to write your scripts more quickly with hints and completions.
 
 <h2>Announcement</h2>
 <p>
+
 I'm implementing new features thanks to <strong>Flow</strong> (static type checker from Facebook).
 With it I can implement other <strong>features</strong> and there will be a better <strong>autocomplete</strong>
 (<strong style="text-decoration: underline;">smart autocomplete based on the current context</strong>).
 
 This is in <strong>Beta version</strong> and I published it under another branch:
 <a href="https://github.com/pichillilorenzo/JavaScript-Completions/tree/v3-beta">https://github.com/pichillilorenzo/JavaScript-Completions/tree/v3-beta</a>
 
-But it isn’t ready for public testing and there isn’t a documentation at the moment!
+but I will move it on a new repository (<strong style="text-decoration: underline;">so it will be a new plugin on Sublime Text</strong>)
+because it will offer not only a better autocomplete but a lot of features about creating, 
+developing and managing javascript projects, such as:
+
+- Cordova projects (run Cordova emulator, build, compile, serve Cordova projects, add plugins and platforms, etc … directly on Sublime Text!)
+- Ionic projects (same as Cordova projects!)
+- Node.js projects
+- Local bookmarks project
+- Show javascript errors with Flow
+- etc, etc …
+
+It will be something like a <strong>JavaScript IDE</strong> on Sublime Text!
+
+It isn’t ready for public testing and there isn’t a documentation at the moment!
 I will let you know the moment I have any news!!
 
+Email me for any questions or doubts about this new project on: <a href="mailto:pichillilorenzo@gmail.com">pichillilorenzo@gmail.com</a>
+
 <strong>Thanks for your support!!!</strong>
 </p>
 
diff --git a/_generated_2017_04_09_at_16_06_42.py b/_generated_2017_04_09_at_16_06_42.py
@@ -1024,9 +1024,14 @@ def exec_node(self, folder_path, node_command_args) :
       node = NodeJS()
       animation_loader = AnimationLoader(["[=     ]", "[ =    ]", "[   =  ]", "[    = ]", "[     =]", "[    = ]", "[   =  ]", "[ =    ]"], 0.067, "Generating docs ")
       interval_animation = RepeatedTimer(animation_loader.sec, animation_loader.animate)
-      result = node.execute("jsdoc", node_command_args, True)
+      result = node.execute("jsdoc", node_command_args, is_from_bin=True)
+  
       if not result[0] :
         sublime.error_message(result[1])
+  
+      elif result[1].startswith("There are no input files to process") :
+        sublime.error_message(result[1])
+  
       animation_loader.on_complete()
       interval_animation.stop()
   
diff --git a/changelog/2.6.9.txt b/changelog/2.6.9.txt
@@ -0,0 +1,34 @@
+v2.6.9
+
+# Announcement
+
+I'm implementing new features thanks to Flow (static type checker from Facebook).
+With it I can implement other features and there will be a better autocomplete
+(smart autocomplete based on the current context).
+
+This is in Beta version and I published it on github (same repository but under another branch):
+https://github.com/pichillilorenzo/JavaScript-Completions/tree/v3-beta
+
+but I will move it on a new repository (so it will be a new plugin on Sublime Text)
+because it will offer not only a better autocomplete but a lot of features about creating, 
+developing and managing javascript projects, such as:
+
+- Cordova projects (run Cordova emulator, build, compile, serve Cordova projects, add plugins and platforms, etc … directly on Sublime Text!)
+- Ionic projects (same as Cordova projects!)
+- Node.js projects
+- Local bookmarks project
+- Show javascript errors with Flow
+- etc, etc …
+
+It will be something like a JavaScript IDE on Sublime Text!
+
+It isn’t ready for public testing and there isn’t a documentation at the moment!
+I will let you know the moment I have any news!!
+
+Email me for any questions or doubts about this new project on: pichillilorenzo@gmail.com
+
+Thanks to all your support!!!
+
+## Improvements
+
+- Added support for automatic download for node.js and npm on Windows
diff --git a/changelog/install.txt b/changelog/install.txt
@@ -1,6 +1,37 @@
 JavaScript Completions Package
 ===============================
 
+## ANNOUNCEMENT ##
+==================
+
+I'm implementing new features thanks to Flow (static type checker from Facebook).
+With it I can implement other features and there will be a better autocomplete
+(smart autocomplete based on the current context).
+
+This is in Beta version and I published it on github (same repository but under another branch):
+https://github.com/pichillilorenzo/JavaScript-Completions/tree/v3-beta
+
+but I will move it on a new repository (so it will be a new plugin on Sublime Text)
+because it will offer not only a better autocomplete but a lot of features about creating, 
+developing and managing javascript projects, such as:
+
+- Cordova projects (run Cordova emulator, build, compile, serve Cordova projects, add plugins and platforms, etc … directly on Sublime Text!)
+- Ionic projects (same as Cordova projects!)
+- Node.js projects
+- Local bookmarks project
+- Show javascript errors with Flow
+- etc, etc …
+
+It will be something like a JavaScript IDE on Sublime Text!
+
+It isn’t ready for public testing and there isn’t a documentation at the moment!
+I will let you know the moment I have any news!!
+
+Email me for any questions or doubts about this new project on: pichillilorenzo@gmail.com
+
+Thanks to all your support!!!
+
+
 How To USE
 ==========
 
diff --git a/helper/jsdoc/generate_jsdoc_command.py b/helper/jsdoc/generate_jsdoc_command.py
@@ -32,9 +32,14 @@ def exec_node(self, folder_path, node_command_args) :
     node = NodeJS()
     animation_loader = AnimationLoader(["[=     ]", "[ =    ]", "[   =  ]", "[    = ]", "[     =]", "[    = ]", "[   =  ]", "[ =    ]"], 0.067, "Generating docs ")
     interval_animation = RepeatedTimer(animation_loader.sec, animation_loader.animate)
-    result = node.execute("jsdoc", node_command_args, True)
+    result = node.execute("jsdoc", node_command_args, is_from_bin=True)
+
     if not result[0] :
       sublime.error_message(result[1])
+
+    elif result[1].startswith("There are no input files to process") :
+      sublime.error_message(result[1])
+
     animation_loader.on_complete()
     interval_animation.stop()
 
diff --git a/messages.json b/messages.json
@@ -4,5 +4,6 @@
   "2.6.6": "changelog/2.6.6.txt",
   "2.6.7": "changelog/2.6.7.txt",
   "2.6.8": "changelog/2.6.8.txt",
-  "2.6.81": "changelog/2.6.81.txt"
+  "2.6.81": "changelog/2.6.81.txt",
+  "2.6.9": "changelog/2.6.9.txt"
 }
diff --git a/node/installer.py b/node/installer.py
@@ -33,12 +33,12 @@ def __init__(self, node_version):
   def download(self):
     try :
       if os.path.exists(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM):
-        shutil.rmtree(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
+        self.rmtree(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
         os.makedirs(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
       else :
         os.makedirs(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
       if os.path.exists(node_variables.NODE_MODULES_PATH):
-        shutil.rmtree(node_variables.NODE_MODULES_PATH)
+        self.rmtree(node_variables.NODE_MODULES_PATH)
       request = urllib.request.Request(self.NODE_JS_BINARY_URL)
       request.add_header('User-agent', r'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/22.0.1207.1 Safari/537.1')
       with urllib.request.urlopen(request) as response :
@@ -62,13 +62,58 @@ def extract(self):
           member.name = sep.join(member.name.split(sep)[1:])
           tar.extract(member, node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
     else :
-      with zipfile.ZipFile(self.NODE_JS_BINARY_TARFILE_FULL_PATH, "r") as zip_file :
-        for member in zip_file.namelist() :
-          if member.endswith("/node.exe") :
-            with zip_file.open(member) as node_file:
-              with open(os.path.join(node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM, "node.exe"), "wb") as target :
-                shutil.copyfileobj(node_file, target)
-                break
+      if node_variables.NODE_JS_OS == "win" :
+        import string
+        from ctypes import windll, c_int, c_wchar_p
+        UNUSUED_DRIVE_LETTER = ""
+        for letter in string.ascii_uppercase:
+          if not os.path.exists(letter+":") :
+            UNUSUED_DRIVE_LETTER = letter+":"
+            break
+        if not UNUSUED_DRIVE_LETTER :
+          sublime.message_dialog("Can't install node.js and npm! UNUSUED_DRIVE_LETTER not found.")
+          return
+        DefineDosDevice = windll.kernel32.DefineDosDeviceW
+        DefineDosDevice.argtypes = [ c_int, c_wchar_p, c_wchar_p ]
+        DefineDosDevice(0, UNUSUED_DRIVE_LETTER, node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
+        try:
+          with zipfile.ZipFile(self.NODE_JS_BINARY_TARFILE_FULL_PATH, "r") as zip_file :
+            for member in zip_file.namelist() :
+              if not member.endswith("/") :
+                with zip_file.open(member) as node_file:
+                  with open(UNUSUED_DRIVE_LETTER + "\\"+ member.replace("node-"+self.NODE_JS_VERSION+"-"+node_variables.NODE_JS_OS+"-"+node_variables.NODE_JS_ARCHITECTURE+"/", ""), "wb+") as target :
+                    shutil.copyfileobj(node_file, target)
+              elif not member.endswith("node-"+self.NODE_JS_VERSION+"-"+node_variables.NODE_JS_OS+"-"+node_variables.NODE_JS_ARCHITECTURE+"/"):
+                os.mkdir(UNUSUED_DRIVE_LETTER + "\\"+ member.replace("node-"+self.NODE_JS_VERSION+"-"+node_variables.NODE_JS_OS+"-"+node_variables.NODE_JS_ARCHITECTURE+"/", ""))
+        except Exception as e:
+          print("Error: "+traceback.format_exc())
+        finally:
+          DefineDosDevice(2, UNUSUED_DRIVE_LETTER, node_variables.NODE_JS_BINARIES_FOLDER_PLATFORM)
+  
+  def rmtree(self, path) :
+    if node_variables.NODE_JS_OS == "win" :
+      import string
+      from ctypes import windll, c_int, c_wchar_p
+      UNUSUED_DRIVE_LETTER = ""
+      for letter in string.ascii_uppercase:
+        if not os.path.exists(letter+":") :
+          UNUSUED_DRIVE_LETTER = letter+":"
+          break
+      if not UNUSUED_DRIVE_LETTER :
+        sublime.message_dialog("Can't remove node.js! UNUSUED_DRIVE_LETTER not found.")
+        return
+      DefineDosDevice = windll.kernel32.DefineDosDeviceW
+      DefineDosDevice.argtypes = [ c_int, c_wchar_p, c_wchar_p ]
+      DefineDosDevice(0, UNUSUED_DRIVE_LETTER, path)
+      try:
+        shutil.rmtree(UNUSUED_DRIVE_LETTER)
+      except Exception as e:
+        print("Error: "+traceback.format_exc())
+      finally:
+        DefineDosDevice(2, UNUSUED_DRIVE_LETTER, path)  
+    else :
+      shutil.rmtree(path)      
+        
 
   def on_error(self, err):
     self.animation_loader.on_complete()
@@ -86,8 +131,6 @@ def on_complete(self):
     try :
       npm.getCurrentNPMVersion(True) 
     except Exception as e:
-      if node_variables.NODE_JS_OS == "win" :
-        sublime.error_message("Can't use \"npm\"! To use features that requires \"npm\", you must install it! Download it from https://nodejs.org site")
       print("Error: "+traceback.format_exc())
     try :
       npm.install_all() 
@@ -128,8 +171,6 @@ def updateNPMDependencies():
   try :
     npm.getCurrentNPMVersion(True)
   except Exception as e:
-    if node_variables.NODE_JS_OS == "win" :
-      sublime.active_window().status_message("Can't use \"npm\"! To use features that requires \"npm\", you must install it! Download it from https://nodejs.org site")
     print("Error: "+traceback.format_exc())
     return
     
@@ -158,10 +199,12 @@ def install(node_version=""):
   nodejs_already_installed = already_installed()
   if nodejs_can_start_download and not nodejs_already_installed :
     DownloadNodeJS( node_version ).start()
+    return
   elif nodejs_can_start_download and nodejs_already_installed :
     node_js = NodeJS()
     if node_version != node_js.getCurrentNodeJSVersion(True) :
       DownloadNodeJS( node_version ).start()
+      return
 
   if nodejs_already_installed :
-    create_and_start_thread(updateNPMDependencies, "checkUpgradeNPM")
+    create_and_start_thread(updateNPMDependencies, "updateNPMDependencies")
diff --git a/node/main.py b/node/main.py
diff --git a/node/node_variables.py b/node/node_variables.py

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@`
`4`	`4`	`"2.6.6": "changelog/2.6.6.txt",`
`5`	`5`	`"2.6.7": "changelog/2.6.7.txt",`
`6`	`6`	`"2.6.8": "changelog/2.6.8.txt",`
`7`		`- "2.6.81": "changelog/2.6.81.txt"`
	`7`	`+ "2.6.81": "changelog/2.6.81.txt",`
	`8`	`+ "2.6.9": "changelog/2.6.9.txt"`
`8`	`9`	`}`