Merge branch 'master' into fixes/readme-pdf-in-package

Author: StanleyGoldman

README.md

@@ -13,7 +13,7 @@ You can reach the team right here by opening a [new issue](https://github.com/gi
 
 ## Notices
 
-This software is currently alpha quality. Please refer to the [list of known issues](https://github.com/github-for-unity/Unity/issues?q=is%3Aissue+is%3Aopen+label%3Abug), and make sure you have backups of your work before trying it out.
+Please refer to the [list of known issues](https://github.com/github-for-unity/Unity/issues?q=is%3Aissue+is%3Aopen+label%3Abug), and make sure you have backups of your work before trying it out.
 
 From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running. Also, remember to update your `.gitignore` file.
 

common/SolutionInfo.cs

@@ -32,8 +32,8 @@ namespace System
 {
     internal static class AssemblyVersionInformation {
         // this is for the AssemblyVersion and AssemblyVersion attributes, which can't handle alphanumerics
-        internal const string VersionForAssembly = "0.99.0";
+        internal const string VersionForAssembly = "1.0.0";
         // Actual real version
-        internal const string Version = "1.0.0.0-rc1";
+        internal const string Version = "1.0.0";
     }
 }

src/GitHub.Api/Application/ApiClient.cs

@@ -40,14 +40,9 @@ public ApiClient(UriString hostUrl, IKeychain keychain, IProcessManager processM
                 octorunScript: octorunScriptPath);
         }
 
-        public async Task Logout(UriString host)
+        public ITask Logout(UriString host)
         {
-            await LogoutInternal(host);
-        }
-
-        private async Task LogoutInternal(UriString host)
-        {
-            await loginManager.Logout(host);
+            return loginManager.Logout(host);
         }
 
         public async Task CreateRepository(string name, string description, bool isPrivate, Action<GitHubRepository, Exception> callback, string organization = null)

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -12,7 +12,8 @@ abstract class ApplicationManagerBase : IApplicationManager
         protected static ILogging Logger { get; } = LogHelper.GetLogger<IApplicationManager>();
 
         private RepositoryManager repositoryManager;
-        private Progress progressReporter;
+        private ProgressReporter progressReporter = new ProgressReporter();
+        private Progress progress = new Progress(TaskBase.Default);
         protected bool isBusy;
         private bool firstRun;
         protected bool FirstRun { get { return firstRun; } set { firstRun = value; } }        
@@ -27,13 +28,13 @@ public event Action<IProgress> OnProgress
 
         public ApplicationManagerBase(SynchronizationContext synchronizationContext)
         {
-            progressReporter = new Progress();
             SynchronizationContext = synchronizationContext;
             SynchronizationContext.SetSynchronizationContext(SynchronizationContext);
             ThreadingHelper.SetUIThread();
             UIScheduler = TaskScheduler.FromCurrentSynchronizationContext();
             ThreadingHelper.MainThreadScheduler = UIScheduler;
             TaskManager = new TaskManager(UIScheduler);
+            progress.OnProgress += progressReporter.UpdateProgress;
         }
 
         protected void Initialize()
@@ -51,6 +52,7 @@ protected void Initialize()
         public void Run()
         {
             isBusy = true;
+            progress.UpdateProgress(0, 100, "Initializing...");
 
             var thread = new Thread(() =>
             {
@@ -72,8 +74,13 @@ public void Run()
                         }
                     }
 
-                    var installer = new GitInstaller(Environment, ProcessManager, CancellationToken)
-                                                    { Progress = progressReporter };
+                    progress.UpdateProgress(20, 100, "Setting up octorun...");
+
+                    Environment.OctorunScriptPath = new OctorunInstaller(Environment, TaskManager)
+                        .SetupOctorunIfNeeded();
+
+                    progress.UpdateProgress(50, 100, "Setting up git...");
+
                     state = Environment.GitInstallationState;
                     if (!state.GitIsValid && !state.GitLfsIsValid && FirstRun)
                     {
@@ -88,6 +95,9 @@ public void Run()
                         }
                     }
 
+
+                    var installer = new GitInstaller(Environment, ProcessManager, CancellationToken);
+                    installer.Progress.OnProgress += progressReporter.UpdateProgress;
                     if (state.GitIsValid && state.GitLfsIsValid)
                     {
                         if (firstRun)
@@ -100,25 +110,26 @@ public void Run()
                         }
                     }
 
-                    Environment.OctorunScriptPath = new OctorunInstaller(Environment, TaskManager)
-                        .SetupOctorunIfNeeded();
-
                     if (!state.GitIsValid || !state.GitLfsIsValid)
                     {
                         state = installer.SetupGitIfNeeded();
                     }
 
                     SetupGit(state);
 
+                    progress.UpdateProgress(80, 100, "Initializing repository...");
+
                     if (state.GitIsValid && state.GitLfsIsValid)
                     {
                         RestartRepository();
                     }
 
+                    progress.UpdateProgress(100, 100, "Initialization failed");
                 }
                 catch (Exception ex)
                 {
                     Logger.Error(ex, "A problem ocurred setting up Git");
+                    progress.UpdateProgress(90, 100, "Initialization failed");
                 }
 
                 new ActionTask<bool>(CancellationToken, (s, gitIsValid) =>
@@ -204,6 +215,7 @@ public void SetupGit(GitInstaller.GitInstallationState state)
         public void InitializeRepository()
         {
             isBusy = true;
+            progress.UpdateProgress(0, 100, "Initializing...");
             var thread = new Thread(() =>
             {
                 var success = true;
@@ -218,27 +230,37 @@ public void InitializeRepository()
                     var filesForInitialCommit = new List<string> { gitignore, gitAttrs, assetsGitignore };
 
                     GitClient.Init().RunWithReturn(true);
+                    progress.UpdateProgress(10, 100, "Initializing...");
 
                     ConfigureMergeSettings();
+                    progress.UpdateProgress(20, 100, "Initializing...");
+
                     GitClient.LfsInstall().RunWithReturn(true);
+                    progress.UpdateProgress(30, 100, "Initializing...");
+
                     AssemblyResources.ToFile(ResourceType.Generic, ".gitignore", targetPath, Environment);
                     AssemblyResources.ToFile(ResourceType.Generic, ".gitattributes", targetPath, Environment);
                     assetsGitignore.CreateFile();
                     GitClient.Add(filesForInitialCommit).RunWithReturn(true);
+                    progress.UpdateProgress(60, 100, "Initializing...");
                     GitClient.Commit("Initial commit", null).RunWithReturn(true);
+                    progress.UpdateProgress(70, 100, "Initializing...");
                     Environment.InitializeRepository();
                     UsageTracker.IncrementProjectsInitialized();
                 }
                 catch (Exception ex)
                 {
                     Logger.Error(ex, "A problem ocurred initializing the repository");
+                    progress.UpdateProgress(90, 100, "Failed to initialize repository");
                     success = false;
                 }
 
                 if (success)
                 {
+                    progress.UpdateProgress(90, 100, "Initializing...");
                     RestartRepository();
                     TaskManager.RunInUI(InitializeUI);
+                    progress.UpdateProgress(100, 100, "Initialized");
                 }
                 isBusy = false;
             });

src/GitHub.Api/Application/IApiClient.cs

@@ -12,7 +12,7 @@ Task CreateRepository(string name, string description, bool isPrivate,
         Task GetOrganizations(Action<Organization[]> onSuccess, Action<Exception> onError = null);
         Task Login(string username, string password, Action<LoginResult> need2faCode, Action<bool, string> result);
         Task ContinueLogin(LoginResult loginResult, string code);
-        Task Logout(UriString host);
+        ITask Logout(UriString host);
         Task GetCurrentUser(Action<GitHubUser> onSuccess, Action<Exception> onError = null);
     }
 }

src/GitHub.Api/Authentication/ILoginManager.cs

@@ -25,6 +25,6 @@ interface ILoginManager
         /// </summary>
         /// <param name="hostAddress">The address of the server.</param>
         /// <inheritdoc/>
-        Task Logout(UriString hostAddress);
+        ITask Logout(UriString hostAddress);
     }
 }

src/GitHub.Api/Authentication/LoginManager.cs

@@ -134,11 +134,11 @@ public async Task<LoginResultData> ContinueLogin(LoginResultData loginResultData
         }
 
         /// <inheritdoc/>
-        public async Task Logout(UriString hostAddress)
+        public ITask Logout(UriString hostAddress)
         {
             Guard.ArgumentNotNull(hostAddress, nameof(hostAddress));
 
-            await new ActionTask(keychain.Clear(hostAddress, true)).StartAwait();
+            return new ActionTask(keychain.Clear(hostAddress, true)) { Message = "Signing out" }.Start();
         }
 
         private async Task<LoginResultData> TryLogin(

src/GitHub.Api/Cache/CacheContainer.cs

@@ -30,9 +30,7 @@ public void InvalidateAll()
         {
             foreach (var cache in caches.Values)
             {
-                // force an invalidation if the cache is valid, otherwise it will do it on its own
-                if (cache.Value.ValidateData())
-                    cache.Value.InvalidateData();
+                cache.Value.InvalidateData();
             }
         }
 

src/GitHub.Api/Git/IRepository.cs

@@ -78,5 +78,6 @@ public interface IRepository : IEquatable<IRepository>, IDisposable, IBackedByCa
         ITask CreateBranch(string branch, string baseBranch);
         ITask SwitchBranch(string branch);
         void Refresh(CacheType cacheType);
+        event Action<IProgress> OnProgress;
     }
 }

src/GitHub.Api/Git/Repository.cs

@@ -24,6 +24,7 @@ sealed class Repository : IEquatable<Repository>, IRepository
         private string name;
         private HashSet<CacheType> cacheInvalidationRequests = new HashSet<CacheType>();
         private Dictionary<CacheType, Action<CacheUpdateEvent>> cacheUpdateEvents;
+        private ProgressReporter progressReporter = new ProgressReporter();
 
         public event Action<CacheUpdateEvent> LogChanged;
         public event Action<CacheUpdateEvent> TrackingStatusChanged;
@@ -35,6 +36,11 @@ sealed class Repository : IEquatable<Repository>, IRepository
         public event Action<CacheUpdateEvent> LocksChanged;
         public event Action<CacheUpdateEvent> RemoteBranchListChanged;
         public event Action<CacheUpdateEvent> LocalAndRemoteBranchListChanged;
+        public event Action<IProgress> OnProgress
+        {
+            add { progressReporter.OnProgress += value; }
+            remove { progressReporter.OnProgress -= value; }
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Repository"/> class.
@@ -89,6 +95,15 @@ public void Initialize(IRepositoryManager theRepositoryManager, ITaskManager the
             this.repositoryManager.LocalBranchesUpdated += RepositoryManagerOnLocalBranchesUpdated;
             this.repositoryManager.RemoteBranchesUpdated += RepositoryManagerOnRemoteBranchesUpdated;
             this.repositoryManager.DataNeedsRefreshing += RefreshCache;
+            try
+            {
+                this.taskManager.OnProgress += progressReporter.UpdateProgress;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Error(ex);
+            }
+
         }
 
         public void Start()
@@ -170,12 +185,9 @@ private void RefreshCache(CacheType cacheType)
         }
 
         public void Refresh(CacheType cacheType)
-            {
-                var cache = cacheContainer.GetCache(cacheType);
-                // if the cache has valid data, we need to force an invalidation to refresh it
-                // if it doesn't have valid data, it will trigger an invalidation automatically
-                if (cache.ValidateData())
-                    cache.InvalidateData();
+        {
+            var cache = cacheContainer.GetCache(cacheType);
+            cache.InvalidateData();
         }
 
         private void CacheHasBeenInvalidated(CacheType cacheType)
@@ -190,32 +202,32 @@ private void CacheHasBeenInvalidated(CacheType cacheType)
             switch (cacheType)
             {
                 case CacheType.Branches:
-                    repositoryManager?.UpdateBranches();
+                    repositoryManager?.UpdateBranches().Start();
                     break;
 
                 case CacheType.GitLog:
-                    repositoryManager?.UpdateGitLog();
+                    repositoryManager?.UpdateGitLog().Start();
                     break;
 
                 case CacheType.GitAheadBehind:
-                    repositoryManager?.UpdateGitAheadBehindStatus();
+                    repositoryManager?.UpdateGitAheadBehindStatus().Start();
                     break;
 
                 case CacheType.GitLocks:
                     if (CurrentRemote != null)
-                        repositoryManager?.UpdateLocks();
+                        repositoryManager?.UpdateLocks().Start();
                     break;
 
                 case CacheType.GitUser:
                     // user handles its own invalidation event
                     break;
 
                 case CacheType.RepositoryInfo:
-                    repositoryManager?.UpdateRepositoryInfo();
+                    repositoryManager?.UpdateRepositoryInfo().Start();
                     break;
 
                 case CacheType.GitStatus:
-                    repositoryManager?.UpdateGitStatus();
+                    repositoryManager?.UpdateGitStatus().Start();
                     break;
 
                 default: