Merge pull request #626 from github-for-unity/fixes/octorun-refactor-contents-path

StanleyGoldman · web-flow · commit 67891649bb21 · 2018-03-15T11:18:46.000-07:00
Adding a field in Environment to locate Unity's content's path
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -88,9 +88,7 @@ public ITask InitializeRepository()
 
             var targetPath = NPath.CurrentDirectory;
 
-            var unityYamlMergeExec = Environment.IsWindows
-                ? Environment.UnityApplication.Parent.Combine("Data", "Tools", "UnityYAMLMerge.exe")
-                : Environment.UnityApplication.Combine("Contents", "Tools", "UnityYAMLMerge");
+            var unityYamlMergeExec = Environment.UnityApplicationContents.Combine("Tools", "UnityYAMLMerge" + Environment.ExecutableExtension);
 
             var yamlMergeCommand = Environment.IsWindows
                 ? $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED"""
diff --git a/src/GitHub.Api/Platform/DefaultEnvironment.cs b/src/GitHub.Api/Platform/DefaultEnvironment.cs
@@ -42,10 +42,11 @@ public DefaultEnvironment(ICacheContainer cacheContainer)
             this.CacheContainer = cacheContainer;
         }
 
-        public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath assetsPath)
+        public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityApplicationPath, NPath unityApplicationContentsPath, NPath assetsPath)
         {
             ExtensionInstallPath = extensionInstallPath;
-            UnityApplication = unityPath;
+            UnityApplication = unityApplicationPath;
+            UnityApplicationContents = unityApplicationContentsPath;
             UnityAssetsPath = assetsPath;
             UnityProjectPath = assetsPath.Parent;
             UnityVersion = unityVersion;
@@ -109,6 +110,7 @@ public string GetEnvironmentVariable(string variable)
         public IFileSystem FileSystem { get { return NPath.FileSystem; } set { NPath.FileSystem = value; } }
         public string UnityVersion { get; set; }
         public NPath UnityApplication { get; set; }
+        public NPath UnityApplicationContents { get; set; }
         public NPath UnityAssetsPath { get; set; }
         public NPath UnityProjectPath { get; set; }
         public NPath ExtensionInstallPath { get; set; }
@@ -140,9 +142,8 @@ public NPath NodeJsExecutablePath
             {
                 if (!nodeJsExecutablePath.IsInitialized)
                 {
-                    nodeJsExecutablePath = IsWindows
-                        ? UnityApplication.Parent.Combine("Data", "Tools", "nodejs", "node.exe")
-                        : UnityApplication.Combine("Contents", "Tools", "nodejs", "node");
+                    nodeJsExecutablePath =
+                        UnityApplicationContents.Combine("Tools", "nodejs", "node" + ExecutableExtension);
                 }
 
                 return nodeJsExecutablePath;
@@ -207,7 +208,7 @@ public static bool OnMac
             }
             set { onMac = value; }
         }
-        public string ExecutableExtension { get { return IsWindows ? ".exe" : null; } }
+        public string ExecutableExtension { get { return IsWindows ? ".exe" : string.Empty; } }
         protected static ILogging Logger { get; } = LogHelper.GetLogger<DefaultEnvironment>();
     }
 }
diff --git a/src/GitHub.Api/Platform/IEnvironment.cs b/src/GitHub.Api/Platform/IEnvironment.cs
@@ -4,7 +4,7 @@ namespace GitHub.Unity
 {
     public interface IEnvironment
     {
-        void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath assetsPath);
+        void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityApplicationPath, NPath unityApplicationContentsPath, NPath assetsPath);
         void InitializeRepository(NPath? expectedRepositoryPath = null);
         string ExpandEnvironmentVariables(string name);
         string GetEnvironmentVariable(string v);
@@ -20,6 +20,7 @@ public interface IEnvironment
         bool IsMac { get; }
         string UnityVersion { get; }
         NPath UnityApplication { get; }
+        NPath UnityApplicationContents { get; }
         NPath UnityAssetsPath { get; }
         NPath UnityProjectPath { get; }
         NPath ExtensionInstallPath { get; }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
@@ -81,13 +81,15 @@ sealed class EnvironmentCache : ScriptObjectSingleton<EnvironmentCache>
         [SerializeField] private string extensionInstallPath;
         [SerializeField] private string repositoryPath;
         [SerializeField] private string unityApplication;
+        [SerializeField] private string unityApplicationContents;
         [SerializeField] private string unityAssetsPath;
         [SerializeField] private string unityVersion;
 
         public void Flush()
         {
             repositoryPath = Environment.RepositoryPath;
             unityApplication = Environment.UnityApplication;
+            unityApplicationContents = Environment.UnityApplicationContents;
             unityAssetsPath = Environment.UnityAssetsPath;
             extensionInstallPath = Environment.ExtensionInstallPath;
             Save(true);
@@ -114,11 +116,12 @@ public IEnvironment Environment
                     {
                         unityAssetsPath = Application.dataPath;
                         unityApplication = EditorApplication.applicationPath;
+                        unityApplicationContents = EditorApplication.applicationContentsPath;
                         extensionInstallPath = DetermineInstallationPath();
                         unityVersion = Application.unityVersion;
                     }
                     environment.Initialize(unityVersion, extensionInstallPath.ToNPath(), unityApplication.ToNPath(),
-                        unityAssetsPath.ToNPath());
+                        unityApplicationContents.ToNPath(), unityAssetsPath.ToNPath());
                     NPath? path = null;
                     if (!String.IsNullOrEmpty(repositoryPath))
                         path = repositoryPath.ToNPath();
diff --git a/src/tests/IntegrationTests/IntegrationTestEnvironment.cs b/src/tests/IntegrationTests/IntegrationTestEnvironment.cs
@@ -33,7 +33,7 @@ public IntegrationTestEnvironment(ICacheContainer cacheContainer,
 
             var installPath = solutionDirectory.Parent.Parent.Combine("src", "GitHub.Api");
 
-            Initialize(UnityVersion, installPath, solutionDirectory, repoPath.Combine("Assets"));
+            Initialize(UnityVersion, installPath, solutionDirectory, NPath.Default, repoPath.Combine("Assets"));
 
             if (initializeRepository)
                 InitializeRepository();
@@ -47,9 +47,9 @@ public IntegrationTestEnvironment(ICacheContainer cacheContainer,
             }
         }
 
-        public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath assetsPath)
+        public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath unityContentsPath, NPath assetsPath)
         {
-            defaultEnvironment.Initialize(unityVersion, extensionInstallPath, unityPath, assetsPath);
+            defaultEnvironment.Initialize(unityVersion, extensionInstallPath, unityPath, unityContentsPath, assetsPath);
         }
 
         public void InitializeRepository(NPath? expectedPath = null)
@@ -114,6 +114,8 @@ public NPath GitExecutablePath
 
         public NPath UnityApplication => defaultEnvironment.UnityApplication;
 
+        public NPath UnityApplicationContents => defaultEnvironment.UnityApplicationContents;
+
         public NPath UnityAssetsPath => defaultEnvironment.UnityAssetsPath;
 
         public NPath UnityProjectPath => defaultEnvironment.UnityProjectPath;

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,11 @@ public DefaultEnvironment(ICacheContainer cacheContainer)`
`42`	`42`	`this.CacheContainer = cacheContainer;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath assetsPath)`
	`45`	`+ public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityApplicationPath, NPath unityApplicationContentsPath, NPath assetsPath)`
`46`	`46`	`{`
`47`	`47`	`ExtensionInstallPath = extensionInstallPath;`
`48`		`- UnityApplication = unityPath;`
	`48`	`+ UnityApplication = unityApplicationPath;`
	`49`	`+ UnityApplicationContents = unityApplicationContentsPath;`
`49`	`50`	`UnityAssetsPath = assetsPath;`
`50`	`51`	`UnityProjectPath = assetsPath.Parent;`
`51`	`52`	`UnityVersion = unityVersion;`
`@@ -109,6 +110,7 @@ public string GetEnvironmentVariable(string variable)`
`109`	`110`	`public IFileSystem FileSystem { get { return NPath.FileSystem; } set { NPath.FileSystem = value; } }`
`110`	`111`	`public string UnityVersion { get; set; }`
`111`	`112`	`public NPath UnityApplication { get; set; }`
	`113`	`+ public NPath UnityApplicationContents { get; set; }`
`112`	`114`	`public NPath UnityAssetsPath { get; set; }`
`113`	`115`	`public NPath UnityProjectPath { get; set; }`
`114`	`116`	`public NPath ExtensionInstallPath { get; set; }`
`@@ -140,9 +142,8 @@ public NPath NodeJsExecutablePath`
`140`	`142`	`{`
`141`	`143`	`if (!nodeJsExecutablePath.IsInitialized)`
`142`	`144`	`{`
`143`		`- nodeJsExecutablePath = IsWindows`
`144`		`- ? UnityApplication.Parent.Combine("Data", "Tools", "nodejs", "node.exe")`
`145`		`- : UnityApplication.Combine("Contents", "Tools", "nodejs", "node");`
	`145`	`+ nodeJsExecutablePath =`
	`146`	`+ UnityApplicationContents.Combine("Tools", "nodejs", "node" + ExecutableExtension);`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`return nodeJsExecutablePath;`
`@@ -207,7 +208,7 @@ public static bool OnMac`
`207`	`208`	`}`
`208`	`209`	`set { onMac = value; }`
`209`	`210`	`}`
`210`		`- public string ExecutableExtension { get { return IsWindows ? ".exe" : null; } }`
	`211`	`+ public string ExecutableExtension { get { return IsWindows ? ".exe" : string.Empty; } }`
`211`	`212`	`protected static ILogging Logger { get; } = LogHelper.GetLogger<DefaultEnvironment>();`
`212`	`213`	`}`
`213`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public IntegrationTestEnvironment(ICacheContainer cacheContainer,`
`33`	`33`
`34`	`34`	`var installPath = solutionDirectory.Parent.Parent.Combine("src", "GitHub.Api");`
`35`	`35`
`36`		`- Initialize(UnityVersion, installPath, solutionDirectory, repoPath.Combine("Assets"));`
	`36`	`+ Initialize(UnityVersion, installPath, solutionDirectory, NPath.Default, repoPath.Combine("Assets"));`
`37`	`37`
`38`	`38`	`if (initializeRepository)`
`39`	`39`	`InitializeRepository();`
`@@ -47,9 +47,9 @@ public IntegrationTestEnvironment(ICacheContainer cacheContainer,`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath assetsPath)`
	`50`	`+ public void Initialize(string unityVersion, NPath extensionInstallPath, NPath unityPath, NPath unityContentsPath, NPath assetsPath)`
`51`	`51`	`{`
`52`		`- defaultEnvironment.Initialize(unityVersion, extensionInstallPath, unityPath, assetsPath);`
	`52`	`+ defaultEnvironment.Initialize(unityVersion, extensionInstallPath, unityPath, unityContentsPath, assetsPath);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public void InitializeRepository(NPath? expectedPath = null)`
`@@ -114,6 +114,8 @@ public NPath GitExecutablePath`
`114`	`114`
`115`	`115`	`public NPath UnityApplication => defaultEnvironment.UnityApplication;`
`116`	`116`
	`117`	`+ public NPath UnityApplicationContents => defaultEnvironment.UnityApplicationContents;`
	`118`	`+`
`117`	`119`	`public NPath UnityAssetsPath => defaultEnvironment.UnityAssetsPath;`
`118`	`120`
`119`	`121`	`public NPath UnityProjectPath => defaultEnvironment.UnityProjectPath;`