Put paths in environment

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -46,27 +46,23 @@ public void Run(bool firstRun)
         {
             Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
 
-            var octorunPath = Environment.UserCachePath.Combine("octorun");
-            var octorunScriptPath = octorunPath.Combine("src", "bin", "app.js");
-            Logger.Trace("Using octorunScriptPath: {0}", octorunScriptPath);
-
-            var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();            
+            var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();
             if (gitExecutablePath.HasValue && gitExecutablePath.Value.FileExists()) // we have a git path
             {
                 Logger.Trace("Using git install path from settings: {0}", gitExecutablePath);
-                InitializeEnvironment(gitExecutablePath.Value, octorunScriptPath);
+                InitializeEnvironment(gitExecutablePath.Value);
             }
             else // we need to go find git
             {
                 Logger.Trace("No git path found in settings");
 
-                var initEnvironmentTask = new ActionTask<NPath>(CancellationToken, (_, path) => InitializeEnvironment(path, octorunScriptPath)) { Affinity = TaskAffinity.UI };
+                var initEnvironmentTask = new ActionTask<NPath>(CancellationToken, (_, path) => InitializeEnvironment(path)) { Affinity = TaskAffinity.UI };
                 var findExecTask = new FindExecTask("git", CancellationToken)
                     .FinallyInUI((b, ex, path) => {
                         if (b && path.IsInitialized)
                         {
                             Logger.Trace("FindExecTask Success: {0}", path);
-                            InitializeEnvironment(path, octorunScriptPath);
+                            InitializeEnvironment(path);
                         }
                         else
                         {
@@ -177,13 +173,12 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
         /// </summary>
         /// <param name="gitExecutablePath"></param>
         /// <param name="octorunScriptPath"></param>
-        private void InitializeEnvironment(NPath gitExecutablePath, NPath octorunScriptPath)
+        private void InitializeEnvironment(NPath gitExecutablePath)
         {
             var afterGitSetup = new ActionTask(CancellationToken, RestartRepository)
                 .ThenInUI(InitializeUI);
 
             Environment.GitExecutablePath = gitExecutablePath;
-            Environment.OctorunScriptPath = octorunScriptPath;
             Environment.User.Initialize(GitClient);
             SetupMetrics();
 

src/GitHub.Api/Installer/OctorunInstaller.cs

@@ -10,22 +10,18 @@ class OctorunInstaller
         private const string OctorunExtractedMD5 = "b7341015bc701a9f5bf83f51b1b596b7";
 
         private static readonly ILogging Logger = LogHelper.GetLogger<OctorunInstaller>();
-        private readonly CancellationToken cancellationToken;
 
-        private readonly IEnvironment environment;
+        private readonly IFileSystem fileSystem;
+        private readonly ITaskManager taskManager;
         private readonly IZipHelper sharpZipLibHelper;
         private readonly NPath octorunArchivePath;
         private NPath octorunPath;
 
-        public OctorunInstaller(IEnvironment environment, CancellationToken cancellationToken, NPath octorunPath,
-            NPath octorunArchivePath = default(NPath)) : this(environment, cancellationToken, octorunPath, ZipHelper.Instance,
-            octorunArchivePath)
-        { }
-
-        public OctorunInstaller(IEnvironment environment, CancellationToken cancellationToken, NPath octorunPath, IZipHelper sharpZipLibHelper, NPath octorunArchivePath = default (NPath))
+        public OctorunInstaller(IFileSystem fileSystem, ITaskManager taskManager,
+            NPath octorunPath, IZipHelper sharpZipLibHelper, NPath octorunArchivePath)
         {
-            this.environment = environment;
-            this.cancellationToken = cancellationToken;
+            this.fileSystem = fileSystem;
+            this.taskManager = taskManager;
             this.octorunPath = octorunPath;
             this.sharpZipLibHelper = sharpZipLibHelper;
             this.octorunArchivePath = octorunArchivePath;
@@ -54,8 +50,8 @@ private void ExtractOctorun(ActionTask<NPath> onSuccess, ITask onFailure)
             Logger.Trace("ExtractOctorun");
 
             var tempZipExtractPath = NPath.CreateTempDirectory("octorun_extract_archive_path");
-            var resultTask = new UnzipTask(cancellationToken, octorunArchivePath, tempZipExtractPath, sharpZipLibHelper,
-                environment.FileSystem, OctorunExtractedMD5)
+            var resultTask = new UnzipTask(taskManager.Token, octorunArchivePath, tempZipExtractPath, sharpZipLibHelper,
+                fileSystem, OctorunExtractedMD5)
                 .Then(s => MoveOctorun(tempZipExtractPath));
 
             resultTask.Then(onFailure, TaskRunOptions.OnFailure);

src/GitHub.Api/Platform/DefaultEnvironment.cs

@@ -8,8 +8,14 @@ namespace GitHub.Unity
     public class DefaultEnvironment : IEnvironment
     {
         private const string logFile = "github-unity.log";
+        private static bool? onWindows;
+        private static bool? onLinux;
+        private static bool? onMac;
+
+        private NPath gitExecutablePath;
+        private NPath nodeJsExecutablePath;
+        private NPath octorunScriptPath;
 
-        public NPath LogPath { get; }
         public DefaultEnvironment()
         {
             NPath localAppData;
@@ -36,12 +42,21 @@ public DefaultEnvironment()
             LogPath = UserCachePath.Combine(logFile);
         }
 
-        public DefaultEnvironment(ICacheContainer cacheContainer)
-            : this()
+        public DefaultEnvironment(ICacheContainer cacheContainer) : this()
         {
             this.CacheContainer = cacheContainer;
         }
 
+        /// <summary>
+        /// This is for tests to reset the static OS flags
+        /// </summary>
+        public static void Reset()
+        {
+            onWindows = null;
+            onLinux = null;
+            onMac = null;
+        }
+
         public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityApplicationPath, NPath unityApplicationContentsPath, NPath assetsPath)
         {
             ExtensionInstallPath = extensionInstallPath;
@@ -107,6 +122,7 @@ public string GetEnvironmentVariable(string variable)
             return Environment.GetEnvironmentVariable(variable);
         }
 
+        public NPath LogPath { get; }
         public IFileSystem FileSystem { get { return NPath.FileSystem; } set { NPath.FileSystem = value; } }
         public string UnityVersion { get; set; }
         public NPath UnityApplication { get; set; }
@@ -116,42 +132,43 @@ public string GetEnvironmentVariable(string variable)
         public NPath ExtensionInstallPath { get; set; }
         public NPath UserCachePath { get; set; }
         public NPath SystemCachePath { get; set; }
-        public NPath Path { get { return Environment.GetEnvironmentVariable("PATH").ToNPath(); } }
-        public string NewLine { get { return Environment.NewLine; } }
-        public NPath OctorunScriptPath { get; set; }
-
-        private NPath gitExecutablePath;
+        public NPath Path => Environment.GetEnvironmentVariable("PATH").ToNPath();
+        public string NewLine => Environment.NewLine;
+        public NPath OctorunScriptPath
+        {
+            get
+            {
+                if (!octorunScriptPath.IsInitialized)
+                    octorunScriptPath = UserCachePath.Combine("octorun", "src", "bin", "app.js");
+                return octorunScriptPath;
+            }
+            set
+            {
+                octorunScriptPath = value;
+            }
+        }
         public NPath GitExecutablePath
         {
             get { return gitExecutablePath; }
             set
             {
                 gitExecutablePath = value;
-                if (String.IsNullOrEmpty(gitExecutablePath))
+                if (!gitExecutablePath.IsInitialized)
                     GitInstallPath = NPath.Default;
                 else
                     GitInstallPath = GitExecutablePath.Resolve().Parent.Parent;
             }
         }
-
-        private NPath nodeJsExecutablePath;
-
         public NPath NodeJsExecutablePath
         {
             get
             {
                 if (!nodeJsExecutablePath.IsInitialized)
-                {
-                    nodeJsExecutablePath =
-                        UnityApplicationContents.Combine("Tools", "nodejs", "node" + ExecutableExtension);
-                }
-
+                    nodeJsExecutablePath = UnityApplicationContents.Combine("Tools", "nodejs", "node" + ExecutableExtension);
                 return nodeJsExecutablePath;
             }
         }
-
         public NPath GitInstallPath { get; private set; }
-
         public NPath RepositoryPath { get; private set; }
         public ICacheContainer CacheContainer { get; private set; }
         public IRepository Repository { get; set; }
@@ -161,17 +178,6 @@ public NPath NodeJsExecutablePath
         public bool IsLinux { get { return OnLinux; } }
         public bool IsMac { get { return OnMac; } }
 
-        /// <summary>
-        /// This is for tests to reset the static OS flags
-        /// </summary>
-        public static void Reset()
-        {
-            onWindows = null;
-            onLinux = null;
-            onMac = null;
-        }
-
-        private static bool? onWindows;
         public static bool OnWindows
         {
             get
@@ -183,7 +189,6 @@ public static bool OnWindows
             set { onWindows = value; }
         }
 
-        private static bool? onLinux;
         public static bool OnLinux
         {
             get
@@ -195,7 +200,6 @@ public static bool OnLinux
             set { onLinux = value; }
         }
 
-        private static bool? onMac;
         public static bool OnMac
         {
             get
@@ -208,6 +212,7 @@ public static bool OnMac
             }
             set { onMac = value; }
         }
+
         public string ExecutableExtension { get { return IsWindows ? ".exe" : string.Empty; } }
         protected static ILogging Logger { get; } = LogHelper.GetLogger<DefaultEnvironment>();
     }