Merge branch 'master' of https://github.com/Advance-Technologies-Foun…

…dation/bpmcli
Advance-Technologies-Foundation · Feb 13, 2020 · 009cda0 · 009cda0
2 parents dda71de + 0fcbe5d
commit 009cda0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/clio/Common/ITemplateUtilities.cs → clio/Common/ITemplateProvider.cs b/clio/Common/ITemplateUtilities.cs → clio/Common/ITemplateProvider.cs
@@ -1,6 +1,6 @@
 namespace Clio.Common
 {
-	public interface ITemplateUtilities
+	public interface ITemplateProvider
 	{
 		string GetTemplate(string relativeTplPath);
 	}

diff --git a/clio/Common/TemplateUtilities.cs → clio/Common/TemplateProvider.cs b/clio/Common/TemplateUtilities.cs → clio/Common/TemplateProvider.cs
@@ -3,7 +3,7 @@
 
 namespace Clio.Common
 {
-	public class TemplateUtilities : ITemplateUtilities
+	public class TemplateProvider : ITemplateProvider
 	{
 		private string ExecutingDirectorybyAppDomain => AppDomain.CurrentDomain.BaseDirectory;
 

diff --git a/clio/Package/NuspecFilesGenerator.cs b/clio/Package/NuspecFilesGenerator.cs
@@ -14,10 +14,10 @@ public class NuspecFilesGenerator : INuspecFilesGenerator
 		private const string DependencyRecordTemplate = "      <dependency id=\"$id$\"$version$ />";
 		private const string DependencyVersionTemplate = " version=\"$version$\"";
 		private static readonly string PackageNuspecTpl = $"tpl{Path.DirectorySeparatorChar}{PackageNuspecName}.tpl";
-		private readonly ITemplateUtilities _templateUtilities;
+		private readonly ITemplateProvider _templateProvider;
 
-		public NuspecFilesGenerator(ITemplateUtilities templateUtilities) {
-			_templateUtilities = templateUtilities ?? throw new ArgumentException(nameof(templateUtilities));
+		public NuspecFilesGenerator(ITemplateProvider templateProvider) {
+			_templateProvider = templateProvider ?? throw new ArgumentException(nameof(templateProvider));
 		}
 
 		private string GetNuspecFileName(PackageInfo packageInfo) {
@@ -40,9 +40,10 @@ public class NuspecFilesGenerator : INuspecFilesGenerator
 				IDictionary<string, PackageInfo> packagesInfo) {
 			var sb = new StringBuilder();
 			foreach (string dependency in packageInfo.Depends) {
-				string dependencyVersion = packagesInfo.ContainsKey(dependency)
-					? DependencyVersionTemplate.Replace("$version$", version)
-					: string.Empty;
+				if (!packagesInfo.ContainsKey(dependency)) {
+					continue;
+				}
+				string dependencyVersion = DependencyVersionTemplate.Replace("$version$", version);
 				string fileRecord = DependencyRecordTemplate
 					.Replace("$id$", dependency)
 					.Replace("$version$", dependencyVersion);
@@ -64,7 +65,7 @@ public class NuspecFilesGenerator : INuspecFilesGenerator
 
 		private void CreateFromTpl(string filePath, string version, PackageInfo packageInfo,  string files,
 				string dependencies) {
-			string template = _templateUtilities.GetTemplate(PackageNuspecTpl);
+			string template = _templateProvider.GetTemplate(PackageNuspecTpl);
 			string nuspecFileContent = ReplaceMacro(template, version, packageInfo, files, dependencies);
 			File.WriteAllText(filePath, nuspecFileContent);
 		}

diff --git a/clio/Program.cs b/clio/Program.cs
@@ -262,7 +262,7 @@ private static CreatioClient CreatioClient
 					(CompileOptions opts) => CompileWorkspaceCommand.Compile(opts),
 					(PushNuGetPkgsOptions opts) => CreateCommand<PushNuGetPackagesCommand>(
 						GetEnvironmentSettings(opts), new PackageFinder(), 
-						new NuspecFilesGenerator(new TemplateUtilities())).Execute(opts),
+						new NuspecFilesGenerator(new TemplateProvider())).Execute(opts),
 					errs => 1);
 		}