use CliHelper library

Etherna · Jul 2, 2024 · f479384 · f479384
1 parent 68d019e
commit f479384
Show file tree

Hide file tree

Showing 37 changed files with 71 additions and 1,051 deletions.
diff --git a/src/EthernaGatewayCli/Commands/Etherna/DownloadCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/DownloadCommand.cs
@@ -12,10 +12,12 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using Etherna.GatewayCli.Services;
 using Etherna.Sdk.Users.Clients;
 using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Etherna.GatewayCli.Commands.Etherna
@@ -28,11 +30,12 @@ public class DownloadCommand : CommandBase<DownloadCommandOptions>
 
         // Constructor.
         public DownloadCommand(
+            Assembly assembly,
             IAuthenticationService authService,
             IEthernaUserGatewayClient gatewayClient,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         {
             this.authService = authService;
             this.gatewayClient = gatewayClient;

diff --git a/src/EthernaGatewayCli/Commands/Etherna/DownloadCommandOptions.cs b/src/EthernaGatewayCli/Commands/Etherna/DownloadCommandOptions.cs
@@ -12,7 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
+using Etherna.CliHelper.Models.Commands;
 using System;
 using System.Collections.Generic;
 

diff --git a/src/EthernaGatewayCli/Commands/Etherna/Postage/CreateCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/Postage/CreateCommand.cs
@@ -13,9 +13,11 @@
 // If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
-using Etherna.GatewayCli.Models.Commands;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using Etherna.GatewayCli.Services;
 using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Etherna.GatewayCli.Commands.Etherna.Postage
@@ -28,11 +30,12 @@ public class CreateCommand : CommandBase<CreateCommandOptions>
 
         // Constructor.
         public CreateCommand(
+            Assembly assembly,
             IAuthenticationService authService,
             IGatewayService gatewayService,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         {
             this.authService = authService;
             this.gatewayService = gatewayService;

diff --git a/src/EthernaGatewayCli/Commands/Etherna/Postage/CreateCommandOptions.cs b/src/EthernaGatewayCli/Commands/Etherna/Postage/CreateCommandOptions.cs
@@ -13,8 +13,8 @@
 // If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Models.Commands.OptionRequirements;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Models.Commands.OptionRequirements;
 using System;
 using System.Collections.Generic;
 

diff --git a/src/EthernaGatewayCli/Commands/Etherna/Postage/InfoCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/Postage/InfoCommand.cs
@@ -14,10 +14,12 @@
 
 using Etherna.BeeNet.JsonConverters;
 using Etherna.BeeNet.Models;
-using Etherna.GatewayCli.Models.Commands;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using Etherna.GatewayCli.Services;
 using Etherna.Sdk.Common.GenClients.Gateway;
 using System;
+using System.Reflection;
 using System.Text.Json;
 using System.Threading.Tasks;
 
@@ -43,11 +45,12 @@ public class InfoCommand : CommandBase
 
         // Constructor.
         public InfoCommand(
+            Assembly assembly,
             IAuthenticationService authService,
             IGatewayService gatewayService,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         {
             this.authService = authService;
             this.gatewayService = gatewayService;

diff --git a/src/EthernaGatewayCli/Commands/Etherna/PostageCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/PostageCommand.cs
@@ -12,19 +12,21 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Services;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using System;
+using System.Reflection;
 
 namespace Etherna.GatewayCli.Commands.Etherna
 {
     public class PostageCommand : CommandBase
     {
         // Constructor.
         public PostageCommand(
+            Assembly assembly,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         { }
 
         // Properties.

diff --git a/src/EthernaGatewayCli/Commands/Etherna/Resource/DefundCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/Resource/DefundCommand.cs
@@ -12,19 +12,21 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Services;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Etherna.GatewayCli.Commands.Etherna.Resource
 {
     public class DefundCommand : CommandBase<DefundCommandOptions>
     {
         public DefundCommand(
+            Assembly assembly,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         {
         }
 

diff --git a/src/EthernaGatewayCli/Commands/Etherna/Resource/DefundCommandOptions.cs b/src/EthernaGatewayCli/Commands/Etherna/Resource/DefundCommandOptions.cs
@@ -12,8 +12,8 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Models.Commands.OptionRequirements;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Models.Commands.OptionRequirements;
 using System.Collections.Generic;
 
 namespace Etherna.GatewayCli.Commands.Etherna.Resource

diff --git a/src/EthernaGatewayCli/Commands/Etherna/Resource/FundCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/Resource/FundCommand.cs
@@ -12,9 +12,11 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using Etherna.GatewayCli.Services;
 using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Etherna.GatewayCli.Commands.Etherna.Resource
@@ -27,11 +29,12 @@ public class FundCommand : CommandBase<FundCommandOptions>
 
         // Constructor.
         public FundCommand(
+            Assembly assembly,
             IAuthenticationService authService,
             IGatewayService gatewayService,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         {
             this.authService = authService;
             this.gatewayService = gatewayService;

diff --git a/src/EthernaGatewayCli/Commands/Etherna/Resource/FundCommandOptions.cs b/src/EthernaGatewayCli/Commands/Etherna/Resource/FundCommandOptions.cs
@@ -12,8 +12,8 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Models.Commands.OptionRequirements;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Models.Commands.OptionRequirements;
 using System.Collections.Generic;
 
 namespace Etherna.GatewayCli.Commands.Etherna.Resource

diff --git a/src/EthernaGatewayCli/Commands/Etherna/Resource/ListCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/Resource/ListCommand.cs
@@ -12,19 +12,21 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Services;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Etherna.GatewayCli.Commands.Etherna.Resource
 {
     public class ListCommand : CommandBase
     {
         public ListCommand(
+            Assembly assembly,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         {
         }
 

diff --git a/src/EthernaGatewayCli/Commands/Etherna/ResourceCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/ResourceCommand.cs
@@ -12,19 +12,21 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Services;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using System;
+using System.Reflection;
 
 namespace Etherna.GatewayCli.Commands.Etherna
 {
     public class ResourceCommand : CommandBase
     {
         // Constructor.
         public ResourceCommand(
+            Assembly assembly,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         { }
 
         // Properties.

diff --git a/src/EthernaGatewayCli/Commands/Etherna/UploadCommand.cs b/src/EthernaGatewayCli/Commands/Etherna/UploadCommand.cs
@@ -13,11 +13,13 @@
 // If not, see <https://www.gnu.org/licenses/>.
 
 using Etherna.BeeNet.Models;
-using Etherna.GatewayCli.Models.Commands;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using Etherna.GatewayCli.Services;
 using Etherna.Sdk.Common.GenClients.Gateway;
 using System;
 using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Etherna.GatewayCli.Commands.Etherna
@@ -35,12 +37,13 @@ public class UploadCommand : CommandBase<UploadCommandOptions>
 
         // Constructor.
         public UploadCommand(
+            Assembly assembly,
             IAuthenticationService authService,
             IFileService fileService,
             IGatewayService gatewayService,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         {
             this.authService = authService;
             this.fileService = fileService;

diff --git a/src/EthernaGatewayCli/Commands/Etherna/UploadCommandOptions.cs b/src/EthernaGatewayCli/Commands/Etherna/UploadCommandOptions.cs
@@ -12,8 +12,8 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Models.Commands.OptionRequirements;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Models.Commands.OptionRequirements;
 using System;
 using System.Collections.Generic;
 

diff --git a/src/EthernaGatewayCli/Commands/EthernaCommand.cs b/src/EthernaGatewayCli/Commands/EthernaCommand.cs
@@ -12,10 +12,11 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using Etherna.GatewayCli.Services;
+using Etherna.CliHelper.Models.Commands;
+using Etherna.CliHelper.Services;
 using Etherna.GatewayCli.Utilities;
 using System;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Etherna.GatewayCli.Commands
@@ -24,9 +25,10 @@ public class EthernaCommand : CommandBase<EthernaCommandOptions>
     {
         // Constructor.
         public EthernaCommand(
+            Assembly assembly,
             IIoService ioService,
             IServiceProvider serviceProvider)
-            : base(ioService, serviceProvider)
+            : base(assembly, ioService, serviceProvider)
         { }
 
         // Properties.

diff --git a/src/EthernaGatewayCli/Commands/EthernaCommandOptions.cs b/src/EthernaGatewayCli/Commands/EthernaCommandOptions.cs
@@ -12,8 +12,7 @@
 // You should have received a copy of the GNU Affero General Public License along with Etherna Gateway CLI.
 // If not, see <https://www.gnu.org/licenses/>.
 
-using Etherna.GatewayCli.Models.Commands;
-using System;
+using Etherna.CliHelper.Models.Commands;
 using System.Collections.Generic;
 
 namespace Etherna.GatewayCli.Commands

diff --git a/src/EthernaGatewayCli/EthernaGatewayCli.csproj b/src/EthernaGatewayCli/EthernaGatewayCli.csproj
@@ -31,6 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Etherna.CliHelper" Version="0.1.0" />
     <PackageReference Include="EthernaSdk.Users.Native" Version="0.4.0-alpha.56" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
       <PrivateAssets>all</PrivateAssets>