Added appget list command. Towards appget#22

stackriot-labs · Feb 18, 2019 · 208eb65 · 208eb65
1 parent 3a01715
commit 208eb65
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 16 deletions.
diff --git a/src/AppGet/AppGet.csproj b/src/AppGet/AppGet.csproj
@@ -111,6 +111,8 @@
     <Compile Include="Commands\IVariableInteractivityCommand.cs" />
     <Compile Include="Commands\Clean\CleanCommandHandler.cs" />
     <Compile Include="Commands\Clean\CleanOptions.cs" />
+    <Compile Include="Commands\List\ListCommandHandler.cs" />
+    <Compile Include="Commands\List\ListOptions.cs" />
     <Compile Include="Commands\UpdateAll\UpdateAllCommandHandler.cs" />
     <Compile Include="Commands\UpdateAll\UpdateAllOptions.cs" />
     <Compile Include="Commands\Update\UpdateCommandHandler.cs" />

diff --git a/src/AppGet/CommandLine/TableHelper.cs b/src/AppGet/CommandLine/TableHelper.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using AppGet.Manifest;
 using AppGet.Update;
 
@@ -21,13 +20,27 @@ public static void ShowTable(this IEnumerable<PackageManifest> packages)
         }
 
 
-        public static void ShowTable(this IEnumerable<PackageUpdate> updates)
+        public static void ShowTable(this IEnumerable<PackageUpdate> updates, bool printStatus = true)
         {
-            var table = new ConsoleTable("Name", "Package ID", "Installed Version", "Available Version");
+            var columns = new List<string> { "Name", "Package ID", "Installed Version", "Available Version" };
 
-            foreach (var update in updates.OrderBy(c => c.PackageId))
+            if (printStatus)
             {
-                table.AddRow(update.Name, update.PackageId, update.InstalledVersion, update.AvailableVersion);
+                columns.Add("Status");
+            }
+
+            var table = new ConsoleTable(columns.ToArray());
+
+            foreach (var update in updates)
+            {
+                var cols = new List<object> { update.Name, update.PackageId, update.InstalledVersion, update.AvailableVersion };
+
+                if (printStatus)
+                {
+                    cols.Add(update.Status);
+                }
+
+                table.AddRow(cols.ToArray());
             }
 
             Print(table);

diff --git a/src/AppGet/Commands/List/ListCommandHandler.cs b/src/AppGet/Commands/List/ListCommandHandler.cs
@@ -0,0 +1,42 @@
+using System.Linq;
+using System.Threading.Tasks;
+using AppGet.CommandLine;
+using AppGet.Infrastructure.Composition;
+using AppGet.Update;
+using Colorful;
+using NLog;
+
+namespace AppGet.Commands.List
+{
+    [Handles(typeof(ListOptions))]
+    public class ListCommandHandler : ICommandHandler
+    {
+        private readonly UpdateService _updateService;
+        private readonly Logger _logger;
+
+        public ListCommandHandler(UpdateService updateService, Logger logger)
+        {
+            _updateService = updateService;
+            _logger = logger;
+        }
+
+
+        public async Task Execute(AppGetOption commandOptions)
+        {
+            var matches = await _updateService.GetUpdates();
+
+            var sorted = matches.OrderByDescending(c => c.Status);
+
+            sorted.ShowTable();
+
+            Console.WriteLine();
+            _logger.Info($"Total Applications: {matches.Count:n0}   Updates Available: {matches.Count(c => c.Status == UpdateStatus.Available):n0}");
+            Console.WriteLine();
+
+            if (matches.Any(c => c.Status == UpdateStatus.Available))
+            {
+                Console.WriteLine("Run 'appget update-all' to apply all updates.");
+            }
+        }
+    }
+}
diff --git a/src/AppGet/Commands/List/ListOptions.cs b/src/AppGet/Commands/List/ListOptions.cs
@@ -0,0 +1,9 @@
+using CommandLine;
+
+namespace AppGet.Commands.List
+{
+    [Verb("list", HelpText = "List all currently installed packages known to AppGet")]
+    public class ListOptions : AppGetOption
+    {
+    }
+}
diff --git a/src/AppGet/Commands/Outdated/OutdatedCommandHandler.cs b/src/AppGet/Commands/Outdated/OutdatedCommandHandler.cs
@@ -5,6 +5,7 @@
 using AppGet.Infrastructure.Composition;
 using AppGet.Update;
 using Colorful;
+using NLog;
 
 namespace AppGet.Commands.Outdated
 {
@@ -13,22 +14,28 @@ namespace AppGet.Commands.Outdated
     public class OutdatedCommandHandler : ICommandHandler
     {
         private readonly UpdateService _updateService;
+        private readonly Logger _logger;
 
-        public OutdatedCommandHandler(UpdateService updateService)
+        public OutdatedCommandHandler(UpdateService updateService, Logger logger)
         {
             _updateService = updateService;
+            _logger = logger;
         }
 
 
         public async Task Execute(AppGetOption commandOptions)
         {
             var matches = await _updateService.GetUpdates();
 
-            var updates = matches.Where(c => c.Status == UpdateStatus.Available).ToList();
+            var updates = matches
+                .Where(c => c.Status == UpdateStatus.Available)
+                .OrderBy(c => c.PackageId)
+                .ToList();
+
             if (updates.Any())
             {
-                Console.WriteLine("{0} Available Updates:", updates.Count);
-                updates.ShowTable();
+                Console.WriteLine($"{updates.Count} Available Updates:");
+                updates.ShowTable(false);
 
                 Console.WriteLine("");
             }
@@ -43,11 +50,17 @@ public async Task Execute(AppGetOption commandOptions)
                 Console.WriteLine("");
                 Console.WriteLine("Latest Version Already Installed:", Color.Green);
 
-                var upToDate = matches.Where(c => c.Status == UpdateStatus.UpToDate);
+                var upToDate = matches
+                    .Where(c => c.Status == UpdateStatus.UpToDate)
+                    .OrderBy(c => c.PackageId);
 
-                upToDate.ShowTable();
+                upToDate.ShowTable(false);
             }
 
+            Console.WriteLine();
+            _logger.Info($"Total Applications: {matches.Count:n0}   Updates Available: {matches.Count(c => c.Status == UpdateStatus.Available):n0}");
+            Console.WriteLine();
+
             if (updates.Any())
             {
                 Console.WriteLine("Run 'appget update-all' to apply all updates.");

diff --git a/src/AppGet/Update/UpdateService.cs b/src/AppGet/Update/UpdateService.cs
@@ -37,13 +37,9 @@ public async Task<List<PackageUpdate>> GetUpdates()
             _logger.Debug("Getting list of installed application");
             var records = _windowsInstallerClient.GetRecords();
 
-            _logger.Info("Getting list of available updates...");
+            _logger.Info("Getting list of matching packages...");
             var updates = await _novoClient.GetUpdates(records);
 
-            Console.WriteLine();
-            _logger.Info("Total Applications: {0:n0}   Updates Available: {1:n0}", updates.Count, updates.Count(c => c.Status == UpdateStatus.Available));
-            Console.WriteLine();
-
             return updates;
         }