Merge pull request #316 from github/fixes/settings

Fix location of settings files on mac/linux

Author: shana

src/GitHub.Api/ApplicationManagerBase.cs

@@ -25,19 +25,19 @@ public ApplicationManagerBase(SynchronizationContext synchronizationContext)
         protected void Initialize(IUIDispatcher uiDispatcher)
         {
             // accessing Environment triggers environment initialization if it hasn't happened yet
-            LocalSettings = new LocalSettings(Environment);
-            UserSettings = new UserSettings(Environment);
-            SystemSettings = new SystemSettings(Environment);
-
-            LocalSettings.Initialize();
+            Platform = new Platform(Environment, FileSystem, uiDispatcher);
 
+            UserSettings = new UserSettings(Environment);
             UserSettings.Initialize();
-
             Logging.TracingEnabled = UserSettings.Get("EnableTraceLogging", false);
 
+            LocalSettings = new LocalSettings(Environment);
+            LocalSettings.Initialize();
+
+            SystemSettings = new SystemSettings(Environment);
             SystemSettings.Initialize();
 
-            Platform = new Platform(Environment, FileSystem, uiDispatcher);
+
             ProcessManager = new ProcessManager(Environment, Platform.GitEnvironment, CancellationToken);
             Platform.Initialize(Environment, ProcessManager);
         }

src/GitHub.Api/DefaultEnvironment.cs

@@ -28,7 +28,6 @@ public string GetEnvironmentVariable(string variable)
         public string ExtensionInstallPath { get; set; }
         public NPath UserCachePath { get; set; }
         public NPath SystemCachePath { get; set; }
-        public string UserProfilePath { get { return Environment.GetEnvironmentVariable("USERPROFILE"); } }
         public string Path { get { return Environment.GetEnvironmentVariable("PATH"); } }
         public string NewLine { get { return Environment.NewLine; } }
 

src/GitHub.Api/IEnvironment.cs

@@ -9,7 +9,6 @@ interface IEnvironment
         string GetSpecialFolder(Environment.SpecialFolder folder);
 
         string Path { get; }
-        string UserProfilePath { get; }
         string NewLine { get; }
         string GitExecutablePath { get; set; }
         bool IsWindows { get; }

src/GitHub.Api/LocalSettings.cs

@@ -45,6 +45,7 @@ public JsonBackedSettings()
         public override void Initialize()
         {
             cachePath = SettingsPath.Combine(SettingsFileName);
+            logger.Trace("Initializing settings file at {0}", cachePath);
             LoadFromCache(cachePath);
         }
 

src/GitHub.Api/Platform/Platform.cs

@@ -1,4 +1,3 @@
-using GitHub.Unity;
 using System.Threading.Tasks;
 
 namespace GitHub.Unity
@@ -10,18 +9,30 @@ public Platform(IEnvironment environment, IFileSystem filesystem, IUIDispatcher
             Environment = environment;
             UIDispatcher = uiDispatcher;
 
+            NPath localAppData;
+            NPath commonAppData;
             if (environment.IsWindows)
             {
                 GitEnvironment = new WindowsGitEnvironment(environment, filesystem);
+                localAppData = Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath();
+                commonAppData = Environment.GetSpecialFolder(System.Environment.SpecialFolder.CommonApplicationData).ToNPath();
             }
             else if (environment.IsMac)
             {
                 GitEnvironment = new MacGitEnvironment(environment, filesystem);
+                localAppData = NPath.HomeDirectory.Combine("Library", "Application Support");
+                // there is no such thing on the mac that is guaranteed to be user accessible (/usr/local might not be)
+                commonAppData = Environment.GetSpecialFolder(System.Environment.SpecialFolder.ApplicationData).ToNPath();
             }
             else
             {
                 GitEnvironment = new LinuxGitEnvironment(environment, filesystem);
+                localAppData = Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath();
+                commonAppData = "/usr/local/share/";
             }
+
+            Environment.UserCachePath = localAppData.Combine(ApplicationInfo.ApplicationName);
+            Environment.SystemCachePath = commonAppData.Combine(ApplicationInfo.ApplicationName);
         }
 
         public Task<IPlatform> Initialize(IEnvironment environment, IProcessManager processManager)

src/IntegrationTests/Git/IntegrationTestEnvironment.cs

@@ -105,26 +105,11 @@ public string UnityProjectPath
         public string ExtensionInstallPath
         {
             get { return extensionInstallPath; }
-            set { throw new NotImplementedException(); }
+            set {}
         }
 
-        public NPath UserCachePath
-        {
-            get
-            {
-                return GetSpecialFolder(Environment.SpecialFolder.LocalApplicationData).ToNPath().Combine(ApplicationInfo.ApplicationName);
-            }
-            set { throw new NotImplementedException(); }
-        }
-
-        public NPath SystemCachePath
-        {
-            get
-            {
-                return GetSpecialFolder(Environment.SpecialFolder.CommonApplicationData).ToNPath().Combine(ApplicationInfo.ApplicationName);
-            }
-            set { throw new NotImplementedException(); }
-        }
+        public NPath UserCachePath { get; set; }
+        public NPath SystemCachePath { get; set; }
 
         public string RepositoryPath { get; set; }
 

src/TestUtils/Substitutes/SubstituteFactory.cs

@@ -25,7 +25,6 @@ public IEnvironment CreateEnvironment(CreateEnvironmentOptions createEnvironment
             var environment = Substitute.For<IEnvironment>();
             environment.RepositoryPath.Returns(createEnvironmentOptions.RepositoryPath);
             environment.ExtensionInstallPath.Returns(createEnvironmentOptions.Extensionfolder);
-            environment.UserProfilePath.Returns(createEnvironmentOptions.UserProfilePath);
             environment.UnityProjectPath.Returns(createEnvironmentOptions.UnityProjectPath);
             environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).Returns(localAppData);
             environment.GetSpecialFolder(System.Environment.SpecialFolder.ApplicationData).Returns(appData);

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationManager.cs

@@ -84,13 +84,6 @@ protected override void InitializeEnvironment()
             Environment.UnityAssetsPath = assetsPath.ToString(SlashMode.Forward);
             Environment.UnityProjectPath = projectPath.ToString(SlashMode.Forward);
 
-            Environment.UserCachePath = Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData)
-                                             .ToNPath()
-                                             .Combine(ApplicationInfo.ApplicationName);
-            Environment.SystemCachePath = Environment.GetSpecialFolder(System.Environment.SpecialFolder.CommonApplicationData)
-                                             .ToNPath()
-                                             .Combine(ApplicationInfo.ApplicationName);
-
             base.InitializeEnvironment();
         }