Added support for beta versions and fixed an issue where downloading …

…groovy files wasn't working Closes #2
dcmeglio · May 6, 2020 · c518a17 · c518a17
1 parent 6ba4869
commit c518a17
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 7 deletions.
diff --git a/HubitatPackageManagerTools/Executors/ManifestAddAppExecutor.cs b/HubitatPackageManagerTools/Executors/ManifestAddAppExecutor.cs
@@ -33,6 +33,8 @@ public int Execute(ManifestAddAppOptions options)
                 oauth = options.Oauth ?? false
             });
             SetNonNullPropertyIfSpecified(app, "version", options.Version);
+            SetNonNullPropertyIfSpecified(app, "betaVersion", options.BetaVersion);
+            SetNonNullPropertyIfSpecified(app, "betaLocation", options.BetaLocation);
             var alternateNames = BuildAlternateNames(options.AlternateNames);
             if (alternateNames != null)
                 app.Add("alternateNames", alternateNames);

diff --git a/HubitatPackageManagerTools/Executors/ManifestAddDriverExecutor.cs b/HubitatPackageManagerTools/Executors/ManifestAddDriverExecutor.cs
@@ -30,6 +30,8 @@ public int Execute(ManifestAddDriverOptions options)
                 required = options.Required ?? false
             });
             SetNonNullPropertyIfSpecified(driver, "version", options.Version);
+            SetNonNullPropertyIfSpecified(driver, "betaVersion", options.BetaVersion);
+            SetNonNullPropertyIfSpecified(driver, "betaLocation", options.BetaLocation);
             var alternateNames = BuildAlternateNames(options.AlternateNames);
             if (alternateNames != null)
                 driver.Add("alternateNames", alternateNames);

diff --git a/HubitatPackageManagerTools/Executors/ManifestExecutorBase.cs b/HubitatPackageManagerTools/Executors/ManifestExecutorBase.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text.RegularExpressions;
 
 namespace HubitatPackageManagerTools.Executors

diff --git a/HubitatPackageManagerTools/Executors/ManifestModifyAppExecutor.cs b/HubitatPackageManagerTools/Executors/ManifestModifyAppExecutor.cs
@@ -24,6 +24,8 @@ public int Execute(ManifestModifyAppOptions options)
             if (app != null)
             {
                 SetNullableProperty(app, "version", options.Version);
+                SetNullableProperty(app, "betaVersion", options.BetaVersion);
+                SetNullableProperty(app, "betaLocation", options.BetaLocation);
 
                 if (options.Required == true)
                     app["required"] = true;

diff --git a/HubitatPackageManagerTools/Executors/ManifestModifyDriverExecutor.cs b/HubitatPackageManagerTools/Executors/ManifestModifyDriverExecutor.cs
@@ -24,6 +24,8 @@ public int Execute(ManifestModifyDriverOptions options)
             if (driver != null)
             {
                 SetNullableProperty(driver, "version", options.Version);
+                SetNullableProperty(driver, "betaVersion", options.BetaVersion);
+                SetNullableProperty(driver, "betaLocation", options.BetaLocation);
 
                 if (options.Required == true)
                     driver["required"] = true;

diff --git a/HubitatPackageManagerTools/HubitatPackageManagerTools.csproj b/HubitatPackageManagerTools/HubitatPackageManagerTools.csproj
@@ -5,9 +5,9 @@
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
 		<AssemblyName>hpm</AssemblyName>
-		<Version>1.2.2</Version>
-		<AssemblyVersion>1.2.2</AssemblyVersion>
-		<FileVersion>1.2.2</FileVersion>
+		<Version>1.3.0</Version>
+		<AssemblyVersion>1.3.0</AssemblyVersion>
+		<FileVersion>1.3.0</FileVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -21,6 +21,8 @@
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
 	</ItemGroup>
 
-
+	<ItemGroup>
+		<TrimmerRootAssembly Include="System.ComponentModel.EventBasedAsync" />
+	</ItemGroup>
 
 </Project>
diff --git a/HubitatPackageManagerTools/Options/ManifestAddAppOptions.cs b/HubitatPackageManagerTools/Options/ManifestAddAppOptions.cs
@@ -9,8 +9,12 @@ internal class ManifestAddAppOptions : ManifestOptionsBase
     {
         [Option(HelpText = "The URL of the app's Groovy file.", Required = true)]
         public string Location { get; set; }
-        [Option(HelpText = "The version of the driver.")]
+        [Option(HelpText = "The URL of the app's beta Groovy file.")]
+        public string BetaLocation { get; set; }
+        [Option(HelpText = "The version of the app.")]
         public string Version { get; set; }
+        [Option(HelpText = "The beta version of the app.")]
+        public string BetaVersion { get; set; }
         [Option(HelpText = "Whether or not the app is required.")]
         public bool? Required { get; set; }
         [Option(HelpText = "Whether or not the app uses OAuth.")]

diff --git a/HubitatPackageManagerTools/Options/ManifestAddDriverOptions.cs b/HubitatPackageManagerTools/Options/ManifestAddDriverOptions.cs
@@ -9,8 +9,12 @@ internal class ManifestAddDriverOptions : ManifestOptionsBase
     {
         [Option(HelpText = "The URL of the driver's Groovy file.", Required = true)]
         public string Location { get; set; }
+        [Option(HelpText = "The URL of the driver's beta Groovy file.")]
+        public string BetaLocation { get; set; }
         [Option(HelpText = "The version of the driver.")]
         public string Version { get; set; }
+        [Option(HelpText = "The beta version of the driver.")]
+        public string BetaVersion { get; set; }
         [Option(HelpText = "Whether or not the driver is required.")]
         public bool? Required { get; set; }
 

diff --git a/HubitatPackageManagerTools/Options/ManifestModifyAppOptions.cs b/HubitatPackageManagerTools/Options/ManifestModifyAppOptions.cs
@@ -13,8 +13,12 @@ internal class ManifestModifyAppOptions : ManifestOptionsBase
         public string Id { get; set; }
         [Option(HelpText = "The URL of the app's Groovy file.", Group = "modify")]
         public string Location { get; set; }
-        [Option(HelpText = "The version of the driver.", Group = "modify")]
+        [Option(HelpText = "The URL of the app's beta Groovy file.")]
+        public string BetaLocation { get; set; }
+        [Option(HelpText = "The version of the app.", Group = "modify")]
         public string Version { get; set; }
+        [Option(HelpText = "The beta version of the app.")]
+        public string BetaVersion { get; set; }
         [Option(HelpText = "Whether or not the app is required.", Group = "modify", Default = null)]
         public bool? Required { get; set; }
         [Option(HelpText = "Whether or not the app uses OAuth.", Group = "modify", Default = null)]

diff --git a/HubitatPackageManagerTools/Options/ManifestModifyDriverOptions.cs b/HubitatPackageManagerTools/Options/ManifestModifyDriverOptions.cs
@@ -13,6 +13,10 @@ internal class ManifestModifyDriverOptions : ManifestOptionsBase
         public string Id { get; set; }
         [Option(HelpText = "The URL of the driver's Groovy file.", Group = "modify")]
         public string Location { get; set; }
+        [Option(HelpText = "The URL of the driver's beta Groovy file.")]
+        public string BetaLocation { get; set; }
+        [Option(HelpText = "The beta version of the driver.")]
+        public string BetaVersion { get; set; }
         [Option(HelpText = "The version of the driver.", Group = "modify")]
         public string Version { get; set; }
         [Option(HelpText = "Whether or not the driver is required.", Group = "modify")]