Merge pull request #692 from JunoLab/sp/cyclerimprovements

cycler improvements

Author: pfitzseb

lib/connection/client.coffee

@@ -170,6 +170,8 @@ module.exports =
     startupArgs = atom.config.get 'julia-client.juliaOptions.startupArguments'
     if startupArgs.length > 0
       as = as.concat startupArgs
+    as = as.map (arg) => arg.trim()
+    as = as.filter (arg) => arg.length > 0
     as
 
   connectedError: (action = 'do that') ->

lib/connection/local.coffee

@@ -84,9 +84,6 @@ module.exports =
     [path, args] = [paths.jlpath(), client.clargs()]
     check = paths.getVersion()
 
-    args = args.map (arg) => arg.trim()
-    args = args.filter (arg) => arg.length > 0
-
     if provider is 'Remote'
       check = Promise.resolve()
     else

lib/connection/process/cycler.coffee

@@ -1,4 +1,5 @@
 {isEqual} = require 'underscore-plus'
+hash = require 'object-hash'
 basic = require './basic'
 
 IPC = require '../ipc'
@@ -11,7 +12,7 @@ module.exports =
 
   procs: {}
 
-  key: (path, args) -> [path, args...].join ' '
+  key: (path, args) -> hash([path, args...].join(' ').trim())
 
   cache: (path, args) -> @procs[@key(path, args)] ?= []
 
@@ -33,16 +34,17 @@ module.exports =
       p.proc
 
   start: (path, args) ->
+    allArgs = [args, atom.config.get('julia-client.juliaOptions')]
     @provider().lock (release) =>
-      if @cache(path, args).length < @cacheLength
+      if @cache(path, allArgs).length < @cacheLength
         p = @provider().get_(path, args).then (proc) =>
-          obj = {path, args, proc: proc}
+          obj = {path, allArgs, proc: proc}
           @monitor proc
           @warmup obj
-          @toCache path, args, obj
+          @toCache path, allArgs, obj
           proc.socket
-            .then => @start path, args
-            .catch (e) => @removeFromCache path, args, obj
+            .then => @start path, allArgs
+            .catch (e) => @removeFromCache path, allArgs, obj
           release proc.socket
         p.catch (err) =>
           release()
@@ -82,7 +84,8 @@ module.exports =
       .catch ->
 
   get: (path, args) ->
-    if (proc = @fromCache path, args) then p = proc
+    allArgs = [args, atom.config.get('julia-client.juliaOptions')]
+    if (proc = @fromCache path, allArgs) then p = proc
     else p = @provider().get path, args
     @start path, args
     p

package-lock.json

@@ -25,11 +25,12 @@
     "atom": ">=1.39.0 <2.0.0"
   },
   "dependencies": {
-    "node-pty-prebuilt-multiarch": "0.9.0",
     "atom-package-deps": "*",
     "atom-space-pen-views": "^2.0.0",
     "etch": "^0.14",
     "fuzzaldrin-plus": "^0.6.0",
+    "node-pty-prebuilt-multiarch": "0.9.0",
+    "object-hash": "^2.0.3",
     "physical-cpu-count": "*",
     "semver": "^6.3.0",
     "ssh2": "^0.8.4",

package.json

@@ -58,12 +58,13 @@ try
   Atom.handle("junorc") do path
     cd(path)
     ispath(junorc) && include(junorc)
+
+    if outdated != false
+      Atom.msg("versionwarning", outdated)
+    end
     nothing
   end
   Atom.connect(port)
-  if outdated != false
-    Atom.msg("versionwarning", outdated)
-  end
 catch
   if outdated != false
     printstyled("Outdated version of Atom.jl detected.\n", outdated, "\n", color = Base.error_color())