Re-organise vpk commands to sub folders

src/Velopack.Vpk/Commands/Deployment/AzureBaseCommand.cs

@@ -1,5 +1,4 @@
-
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public class AzureBaseCommand : OutputCommand
 {
@@ -26,38 +25,13 @@ public class AzureBaseCommand : OutputCommand
 
         AddOption<string>((v) => ContainerName = v, "--container")
             .SetDescription("Azure container name")
-         .SetArgumentHelpName("CONTAINER")
-         .SetRequired();
+            .SetArgumentHelpName("NAME")
+            .SetRequired();
 
         AddOption<Uri>((v) => Endpoint = v.ToAbsoluteOrNull(), "--endpoint")
             .SetDescription("Service url (eg. https://<storage-account-name>.blob.core.windows.net)")
             .SetArgumentHelpName("URL")
             .MustBeValidHttpUri()
             .SetRequired();
-
-    }
-}
-
-public class AzureDownloadCommand : AzureBaseCommand
-{
-    public AzureDownloadCommand()
-        : base("az", "Download latest release from an AZ container.")
-    {
-    }
-}
-
-public class AzureUploadCommand : AzureBaseCommand
-{
-    public int KeepMaxReleases { get; private set; }
-
-    public AzureUploadCommand()
-        : base("az", "Upload releases to an Azure container.")
-    {
-        AddOption<int>((x) => KeepMaxReleases = x, "--keepMaxReleases")
-            .SetDescription("The maximum number of releases to keep in the bucket, anything older will be deleted.")
-            .SetArgumentHelpName("COUNT");
-
-        ReleaseDirectoryOption.SetRequired();
-        ReleaseDirectoryOption.MustNotBeEmpty();
     }
 }

src/Velopack.Vpk/Commands/Deployment/AzureDownloadCommand.cs

@@ -0,0 +1,9 @@
+namespace Velopack.Vpk.Commands.Deployment;
+
+public class AzureDownloadCommand : AzureBaseCommand
+{
+    public AzureDownloadCommand()
+        : base("az", "Download latest release from an Azure Blob Storage container.")
+    {
+    }
+}

src/Velopack.Vpk/Commands/Deployment/AzureUploadCommand.cs

@@ -0,0 +1,17 @@
+namespace Velopack.Vpk.Commands.Deployment;
+
+public class AzureUploadCommand : AzureBaseCommand
+{
+    public int KeepMaxReleases { get; private set; }
+
+    public AzureUploadCommand()
+        : base("az", "Upload releases to an Azure Blob Storage container.")
+    {
+        AddOption<int>((x) => KeepMaxReleases = x, "--keepMaxReleases")
+            .SetDescription("The maximum number of releases to keep in the bucket, anything older will be deleted.")
+            .SetArgumentHelpName("COUNT");
+
+        ReleaseDirectoryOption.SetRequired();
+        ReleaseDirectoryOption.MustNotBeEmpty();
+    }
+}

src/Velopack.Vpk/Commands/Deployment/GitHubBaseCommand.cs

@@ -1,4 +1,4 @@
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public abstract class GitHubBaseCommand : OutputCommand
 {

src/Velopack.Vpk/Commands/Deployment/GitHubDownloadCommand.cs

@@ -1,4 +1,4 @@
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public class GitHubDownloadCommand : GitHubBaseCommand
 {

src/Velopack.Vpk/Commands/Deployment/GitHubUploadCommand.cs

@@ -1,4 +1,4 @@
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public class GitHubUploadCommand : GitHubBaseCommand
 {

src/Velopack.Vpk/Commands/Deployment/HttpDownloadCommand.cs

@@ -1,4 +1,4 @@
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public class HttpDownloadCommand : OutputCommand
 {

src/Velopack.Vpk/Commands/Deployment/LocalDownloadCommand.cs

@@ -1,4 +1,4 @@
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public class LocalDownloadCommand : OutputCommand
 {

src/Velopack.Vpk/Commands/Deployment/S3BaseCommand.cs

@@ -1,5 +1,4 @@
-
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public class S3BaseCommand : OutputCommand
 {

src/Velopack.Vpk/Commands/Deployment/S3DownloadCommand.cs

@@ -1,5 +1,4 @@
-
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public class S3DownloadCommand : S3BaseCommand
 {

src/Velopack.Vpk/Commands/Deployment/S3UploadCommand.cs

@@ -1,5 +1,4 @@
-
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Deployment;
 
 public class S3UploadCommand : S3BaseCommand
 {

src/Velopack.Vpk/Commands/Flow/LoginCommand.cs

@@ -0,0 +1,8 @@
+namespace Velopack.Vpk.Commands.Flow;
+public class LoginCommand : VelopackServiceCommand
+{
+    public LoginCommand()
+        : base("login", "Login to Velopack Flow.")
+    {
+    }
+}

src/Velopack.Vpk/Commands/Flow/LoginCommandRunner.cs

@@ -1,12 +1,11 @@
 using Velopack.Packaging.Abstractions;
 using Velopack.Packaging.Flow;
 
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Flow;
 #nullable enable
 
 public class LoginCommandRunner(IVelopackFlowServiceClient Client) : ICommand<LoginOptions>
 {
-
     public async Task Run(LoginOptions options)
     {
         await Client.LoginAsync(new() {

src/Velopack.Vpk/Commands/Flow/LoginOptions.cs

@@ -0,0 +1,5 @@
+using Velopack.Packaging.Flow;
+
+namespace Velopack.Vpk.Commands.Flow;
+
+public sealed class LoginOptions : VelopackServiceOptions;

src/Velopack.Vpk/Commands/Flow/LogoutCommand.cs

@@ -0,0 +1,8 @@
+namespace Velopack.Vpk.Commands.Flow;
+public class LogoutCommand : VelopackServiceCommand
+{
+    public LogoutCommand()
+        : base("logout", "Remove stored credentials for Velopack Flow.")
+    {
+    }
+}

src/Velopack.Vpk/Commands/Flow/LogoutCommandRunner.cs

@@ -2,7 +2,7 @@
 using Velopack.Packaging.Flow;
 
 #nullable enable
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Flow;
 
 internal class LogoutCommandRunner(IVelopackFlowServiceClient Client) : ICommand<LogoutOptions>
 {

src/Velopack.Vpk/Commands/Flow/LogoutOptions.cs

@@ -0,0 +1,5 @@
+using Velopack.Packaging.Flow;
+
+namespace Velopack.Vpk.Commands.Flow;
+
+public sealed class LogoutOptions : VelopackServiceOptions;

src/Velopack.Vpk/Commands/Flow/VelopackBaseCommand.cs

@@ -1,4 +1,4 @@
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Flow;
 #nullable enable
 
 public abstract class VelopackBaseCommand : OutputCommand
@@ -7,7 +7,7 @@ public abstract class VelopackBaseCommand : OutputCommand
 
     public string? ProjectName { get; private set; }
 
-    protected VelopackBaseCommand(string name, string description) 
+    protected VelopackBaseCommand(string name, string description)
         : base(name, description)
     {
         AddOption<string>((v) => TeamName = v, "--team-name", "-t")
@@ -19,14 +19,3 @@ public abstract class VelopackBaseCommand : OutputCommand
             .SetRequired();
     }
 }
-
-public class VelopackPublishCommand : VelopackBaseCommand
-{
-    public string? Version { get; set; }
-
-    public VelopackPublishCommand()
-        : base ("publish", "Uploads a release to Velopack's hosted service")
-    {
-        
-    }
-}

src/Velopack.Vpk/Commands/Flow/VelopackPublishCommand.cs

@@ -0,0 +1,13 @@
+namespace Velopack.Vpk.Commands.Flow;
+#nullable enable
+
+public class VelopackPublishCommand : VelopackBaseCommand
+{
+    public string? Version { get; set; }
+
+    public VelopackPublishCommand()
+        : base("publish", "Uploads a release to Velopack's hosted service")
+    {
+
+    }
+}

src/Velopack.Vpk/Commands/Flow/VelopackServiceCommand.cs

@@ -1,6 +1,6 @@
 using Velopack.Packaging.Flow;
 
-namespace Velopack.Vpk.Commands;
+namespace Velopack.Vpk.Commands.Flow;
 
 public abstract class VelopackServiceCommand : BaseCommand
 {

src/Velopack.Vpk/Commands/LoginCommand.cs

@@ -1,10 +0,0 @@
-namespace Velopack.Vpk.Commands;
-public class LoginCommand : VelopackServiceCommand
-{
-    public LoginCommand()
-        : base("login", "Login to Velopack's hosted service.")
-    {
-        //Just hiding this for now as it is not ready for mass consumption.
-        Hidden = true;
-    }
-}

src/Velopack.Vpk/Commands/LoginOptions.cs

@@ -1,5 +0,0 @@
-using Velopack.Packaging.Flow;
-
-namespace Velopack.Vpk.Commands;
-
-public sealed class LoginOptions: VelopackServiceOptions;

src/Velopack.Vpk/Commands/LogoutCommand.cs

@@ -1,10 +0,0 @@
-namespace Velopack.Vpk.Commands;
-public class LogoutCommand : VelopackServiceCommand
-{
-    public LogoutCommand()
-        : base("logout", "Remove any stored credential to the Velopack service.")
-    {
-        //Just hiding this for now as it is not ready for mass consumption.
-        Hidden = true;
-    }
-}

src/Velopack.Vpk/Commands/LogoutOptions.cs

@@ -1,5 +0,0 @@
-using Velopack.Packaging.Flow;
-
-namespace Velopack.Vpk.Commands;
-
-public sealed class LogoutOptions: VelopackServiceOptions;

src/Velopack.Vpk/OptionMapper.cs

@@ -4,6 +4,8 @@ using Velopack.Packaging.Commands;
 using Velopack.Packaging.Unix.Commands;
 using Velopack.Packaging.Windows.Commands;
 using Velopack.Vpk.Commands;
+using Velopack.Vpk.Commands.Deployment;
+using Velopack.Vpk.Commands.Flow;
 
 namespace Velopack.Vpk;
 

src/Velopack.Vpk/Program.cs

@@ -12,6 +12,8 @@ using Velopack.Packaging.Flow;
 using Velopack.Packaging.Unix.Commands;
 using Velopack.Packaging.Windows.Commands;
 using Velopack.Vpk.Commands;
+using Velopack.Vpk.Commands.Deployment;
+using Velopack.Vpk.Commands.Flow;
 using Velopack.Vpk.Converters;
 using Velopack.Vpk.Logging;
 using Velopack.Vpk.Updates;

test/Velopack.CommandLine.Tests/Commands/AzureCommandTests.cs

@@ -1,5 +1,5 @@
 using System.CommandLine;
-using Velopack.Vpk.Commands;
+using Velopack.Vpk.Commands.Deployment;
 
 namespace Velopack.CommandLine.Tests.Commands;
 

test/Velopack.CommandLine.Tests/Commands/GitHubCommandTests.cs

@@ -1,5 +1,5 @@
 using System.CommandLine;
-using Velopack.Vpk.Commands;
+using Velopack.Vpk.Commands.Deployment;
 
 namespace Velopack.CommandLine.Tests.Commands;
 

test/Velopack.CommandLine.Tests/Commands/HttpDownloadCommandTests.cs

@@ -1,6 +1,6 @@
 
 using System.CommandLine;
-using Velopack.Vpk.Commands;
+using Velopack.Vpk.Commands.Deployment;
 
 namespace Velopack.CommandLine.Tests.Commands;
 

test/Velopack.CommandLine.Tests/Commands/LocalDownloadCommandTests.cs

@@ -1,5 +1,5 @@
 using System.CommandLine;
-using Velopack.Vpk.Commands;
+using Velopack.Vpk.Commands.Deployment;
 
 namespace Velopack.CommandLine.Tests.Commands;
 public class LocalDownloadCommandTests : BaseCommandTests<LocalDownloadCommand>

test/Velopack.CommandLine.Tests/Commands/S3CommandTests.cs

@@ -1,5 +1,5 @@
 using System.CommandLine;
-using Velopack.Vpk.Commands;
+using Velopack.Vpk.Commands.Deployment;
 
 namespace Velopack.CommandLine.Tests.Commands;