Merge pull request #80 from FilippoPolo/master

More strict installer

Author: cgravill

.gitignore

@@ -1,6 +1,8 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+.vs/
+
 # User-specific files
 *.suo
 *.user

ipython-profile/kernel.js

@@ -1,9 +1,11 @@
 define(function () {
 
+    var staticFolder = "/kernelspecs/ifsharp/static/";
+
     var link = document.createElement("link");
     link.type = "text/css";
     link.rel = "stylesheet";
-    link.href = "/kernelspecs/ifsharp/static/custom/fsharp.css";
+    link.href = staticFolder + "custom/fsharp.css";
     document.getElementsByTagName("head")[0].appendChild(link);
 
     require(['codemirror/addon/mode/loadmode']);
@@ -19,7 +21,7 @@ define(function () {
             console.log('add metadata hint that language is fsharp...');
         }
 
-        require(['/kernelspecs/ifsharp/static/custom/fsharp.js']);
+        require([staticFolder + 'custom/fsharp.js']);
 
         IPython.CodeCell.options_default.cm_config.mode = 'fsharp';
 
@@ -62,7 +64,7 @@ define(function () {
             return results;
         }
 
-        require(['/kernelspecs/ifsharp/static/custom/webintellisense.js', '/kernelspecs/ifsharp/static/custom/webintellisense-codemirror.js'], function () {
+        require([staticFolder + 'custom/webintellisense.js', staticFolder + 'custom/webintellisense-codemirror.js'], function () {
             // applies intellisense hooks onto a cell
             function applyIntellisense(cell) {
                 if (cell.cell_type !== 'code') { return; }
@@ -156,7 +158,7 @@ define(function () {
 
         // replace the image
         var img = $('.container img')[0];
-        img.src = "/kernelspecs/ifsharp/static/custom/ifsharp_logo.png";
+        img.src = staticFolder + "custom/ifsharp_logo.png";
 
     }
 

paket.lock

@@ -21,4 +21,4 @@ NUGET
       xunit.abstractions (2.0)
     xunit.extensibility.execution (2.1) - framework: >= net451
       xunit.extensibility.core (2.1) - framework: >= net45, dnx451, dnxcore50, monoandroid, monotouch, xamarinios, winv4.5, wpv8.0, wpav8.1
-    xunit.runner.console (2.1) - framework: >= net451
+xunit.runner.console (2.1) - framework: >= net451

src/IfSharp.Kernel/App.fs

@@ -143,7 +143,7 @@ module App =
         Kernel.Value.AddPayload(text.ToString())
 
     /// Installs the ifsharp files if they do not exist, then starts jupyter with the ifsharp profile
-    let InstallAndStart(forceInstall) = 
+    let InstallAndStart(forceInstall, start) = 
 
         let thisExecutable = Assembly.GetEntryAssembly().Location
         let userDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
@@ -161,12 +161,31 @@ module App =
         createDir tempDir
         createDir customDir
 
-        let configFile = Path.Combine(kernelDir, "ipython_config.py")
-        let configqtFile = Path.Combine(kernelDir, "ipython_qtconsole_config.py")
-        let kernelFile = Path.Combine(kernelDir, "kernel.json")
-        if forceInstall || (File.Exists(configFile) = false) then
+        let allFiles = new System.Collections.Generic.List<string>()
+        let addFile fn = allFiles.Add(fn); fn
+        let configFile = Path.Combine(kernelDir, "ipython_config.py") |> addFile
+        let configqtFile = Path.Combine(kernelDir, "ipython_qtconsole_config.py") |> addFile
+        let kernelFile = Path.Combine(kernelDir, "kernel.json") |> addFile
+        let logoFile = Path.Combine(customDir, "ifsharp_logo.png") |> addFile
+        let kjsFile = Path.Combine(kernelDir, "kernel.js") |> addFile
+        let fjsFile = Path.Combine(customDir, "fsharp.js") |> addFile
+        let wjsFile = Path.Combine(customDir, "webintellisense.js") |> addFile
+        let wcjsFile = Path.Combine(customDir, "webintellisense-codemirror.js") |> addFile
+        let logo64File = Path.Combine(kernelDir, "logo-64x64.png") |> addFile
+        let logo32File = Path.Combine(kernelDir, "logo-32x32.png") |> addFile
+        let versionFile = Path.Combine(kernelDir, "version.txt") |> addFile
+        let missingFiles = Seq.exists (fun fn -> File.Exists(fn) = false) allFiles
+        
+        let differentVersion = File.Exists(versionFile) && File.ReadAllText(versionFile) <> Config.Version
+
+        if forceInstall then printfn "Force install required, performing install..."
+        else if missingFiles then printfn "One or more files are missing, performing install..."
+        else if differentVersion then printfn "Different version found, performing install..."
+
+        if forceInstall || missingFiles || differentVersion then
 
-            printfn "Config file does not exist, performing install..."
+            // write the version file
+            File.WriteAllText(versionFile, Config.Version);
 
             // write the startup script
             let codeTemplate = IfSharpResources.ipython_config()
@@ -184,7 +203,6 @@ module App =
             File.WriteAllText(configqtFile, codeqt)
 
             // write custom logo file
-            let logoFile = Path.Combine(customDir, "ifsharp_logo.png")
             printfn "Saving custom logo [%s]" logoFile
             IfSharpResources.ifsharp_logo().Save(logoFile)
 
@@ -194,24 +212,20 @@ module App =
             File.WriteAllText(cssFile, IfSharpResources.fsharp_css())
 
             // write kernel js file
-            let jsFile = Path.Combine(kernelDir, "kernel.js")
-            printfn "Saving kernel js [%s]" jsFile
-            File.WriteAllText(jsFile, IfSharpResources.kernel_js())
+            printfn "Saving kernel js [%s]" kjsFile
+            File.WriteAllText(kjsFile, IfSharpResources.kernel_js())
 
             // write fsharp js file
-            let jsFile = Path.Combine(customDir, "fsharp.js")
-            printfn "Saving fsharp js [%s]" jsFile
-            File.WriteAllText(jsFile, IfSharpResources.fsharp_js())
+            printfn "Saving fsharp js [%s]" fjsFile
+            File.WriteAllText(fjsFile, IfSharpResources.fsharp_js())
 
             // write webintellisense js file
-            let jsFile = Path.Combine(customDir, "webintellisense.js")
-            printfn "Saving webintellisense js [%s]" jsFile
-            File.WriteAllText(jsFile, IfSharpResources.webintellisense_js())
+            printfn "Saving webintellisense js [%s]" wjsFile
+            File.WriteAllText(wjsFile, IfSharpResources.webintellisense_js())
 
             // write webintellisense-codemirror js file
-            let jsFile = Path.Combine(customDir, "webintellisense-codemirror.js")
-            printfn "Saving webintellisense-codemirror js [%s]" jsFile
-            File.WriteAllText(jsFile, IfSharpResources.webintellisense_codemirror_js())
+            printfn "Saving webintellisense-codemirror js [%s]" wcjsFile
+            File.WriteAllText(wcjsFile, IfSharpResources.webintellisense_codemirror_js())
 
             // Make the Kernel info folder 
             let jsonTemplate = IfSharpResources.ifsharp_kernel_json()
@@ -224,31 +238,35 @@ module App =
             printfn "Saving custom kernel.json file [%s]" kernelFile
             File.WriteAllText(kernelFile, code)
 
-            let logo64File = Path.Combine(kernelDir, "logo-64x64.png")
             printfn "Saving kernel icon [%s]" logo64File
             IfSharpResources.ifsharp_64logo().Save(logo64File)
 
-            let logo32File = Path.Combine(kernelDir, "logo-32x32.png")
             printfn "Saving kernel icon [%s]" logo32File
             IfSharpResources.ifsharp_32logo().Save(logo32File)
 
-        printfn "Starting Jupyter notebook..."
-        let p = new Process()
-        p.StartInfo.FileName <- "jupyter"
-        p.StartInfo.Arguments <- "notebook"
-        p.StartInfo.WorkingDirectory <- userDir
+        if start then
+          (
+          printfn "Starting ipython..."
+          let p = new Process()
+          p.StartInfo.FileName <- "jupyter"
+          p.StartInfo.Arguments <- "notebook"
+          p.StartInfo.WorkingDirectory <- userDir
 
-        // tell the user something bad happened
-        if p.Start() = false then printfn "Unable to start jupyter, please install jupyter first"
+          // tell the user something bad happened
+          if p.Start() = false then printfn "Unable to start jupyter, please install jupyter first"
+          )
 
     /// First argument must be an ipython connection file, blocks forever
     let Start (args : array<string>) = 
 
         if args.Length = 0 then
 
-            InstallAndStart(true)
+            InstallAndStart(true, true)
 
         else
+            // Verify kernel installation status
+            InstallAndStart(false, false)
+
             // Clear the temporary folder
             try
               if Directory.Exists(Config.TempDir) then Directory.Delete(Config.TempDir, true)

src/IfSharp.Kernel/Config.fs

@@ -44,4 +44,6 @@ let KernelDir =
   let kernelDir = Path.Combine(kernelsDir, "ifsharp")
   kernelDir
 let StaticDir = Path.Combine(KernelDir, "static")
-let TempDir = Path.Combine(StaticDir, "temp");
+let TempDir = Path.Combine(StaticDir, "temp")
+
+let Version = "1"

src/IfSharp.Kernel/Kernel.fs

@@ -511,7 +511,7 @@ type IfSharpKernel(connectionInformation : ConnectionInformation) =
         try
             while true do
                 let hb = hbSocket.ReceiveMultipartBytes() in
-                hbSocket.SendMultipartBytes(hb)
+                hbSocket.SendMultipartBytes hb
         with
         | ex -> handleException ex