Merge pull request #47 from criticalmanufacturing/main-36-bump-comman…

…d-showing-wrong-message fix: #36 bump command showing wrong message
criticalmanufacturing · Oct 15, 2021 · 4ee11b3 · 4ee11b3
2 parents 54d213b + a5790ba
commit 4ee11b3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/cmf-cli/Commands/bump/BumpCommand.cs b/cmf-cli/Commands/bump/BumpCommand.cs
@@ -115,11 +115,10 @@ public void Execute(CmfPackage cmfPackage, string version, string buildNr, strin
                     // TODO :: Uncomment if the cmfpackage.json support build number
                     // dependency.Version = GenericUtilities.RetrieveNewVersion(dependency.Version, version, buildNr);
 
-                    dependency.Version = !string.IsNullOrWhiteSpace(version) ? version : dependency.Version;
-
                     if (subCmfPackageWithDependency != null)
                     {
                         Execute(subCmfPackageWithDependency, version, buildNr, root, all);
+                        dependency.Version = !string.IsNullOrWhiteSpace(version) ? version : dependency.Version;
                     }
                     else
                     {
@@ -137,18 +136,21 @@ public void Execute(CmfPackage cmfPackage, string version, string buildNr, strin
                     // TODO :: Uncomment if the cmfpackage.json support build number
                     // dependency.Version = GenericUtilities.RetrieveNewVersion(dependency.Version, version, buildNr);
 
-                    dependency.Version = !string.IsNullOrWhiteSpace(version) ? version : dependency.Version;
-
                     if (subCmfPackageWithDependency != null)
                     {
-                        Execute(subCmfPackageWithDependency, version, buildNr, root, all);
+                        Execute(subCmfPackageWithDependency, version, buildNr, root, all);
+                        dependency.Version = !string.IsNullOrWhiteSpace(version) ? version : dependency.Version;
                     }
                     else
                     {
                         Log.Warning($"Dependency {dependency.Id}.{dependency.Version} not found");
                     }
                 }
-            }
+            }
+
+            // will save with new version
+            cmfPackage.SaveCmfPackage();
+
             #endregion
         }
     }

diff --git a/cmf-cli/Handlers/PackageType/PackageTypeHandler.cs b/cmf-cli/Handlers/PackageType/PackageTypeHandler.cs
@@ -22,6 +22,7 @@ namespace Cmf.Common.Cli.Handlers
     public abstract class PackageTypeHandler : IPackageTypeHandler
     {
         #region Protected Properties
+
         /// <summary>
         /// the underlying file system
         /// </summary>
@@ -71,6 +72,7 @@ public abstract class PackageTypeHandler : IPackageTypeHandler
         /// </summary>
         /// <exception cref="CliException"></exception>
         public PackageTypeHandler(CmfPackage cmfPackage) : this(cmfPackage, new FileSystem()) { }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PackageTypeHandler" /> class.
         /// </summary>
@@ -298,7 +300,6 @@ internal virtual void FinalArchive(IDirectoryInfo packageOutputDir, IDirectoryIn
             this.fileSystem.File.Move(tempzipPath, destZipPath, true);
         }
 
-
         /// <summary>
         /// Get Content To pack
         /// </summary>
@@ -463,9 +464,6 @@ public virtual void Bump(string version, string buildNr, Dictionary<string, obje
                 CmfPackage.SetVersion(!string.IsNullOrWhiteSpace(version) ? version : CmfPackage.Version);
 
                 Log.Information($"Will bump {CmfPackage.PackageId} from version {currentVersion} to version {CmfPackage.Version}");
-
-                // will save with new version
-                CmfPackage.SaveCmfPackage();
             }
                 }
 
@@ -501,6 +499,5 @@ public virtual void Pack(IDirectoryInfo packageOutputDir, IDirectoryInfo outputD
         }
 
         #endregion
-
     }
 }
diff --git a/cmf-cli/Handlers/PackageType/PresentationPackageTypeHandler.cs b/cmf-cli/Handlers/PackageType/PresentationPackageTypeHandler.cs
@@ -176,7 +176,7 @@ public override void Bump(string version, string buildNr, Dictionary<string, obj
 
                 if (jsonObj["version"] == null)
                 {
-                    throw new CliException(string.Format(CliMessages.MissingMandatoryProperty, "version", fileName));
+                    throw new CliException(string.Format(CliMessages.MissingMandatoryPropertyInFile, "version", fileName));
                 }
 
                 jsonObj["version"] = GenericUtilities.RetrieveNewPresentationVersion(jsonObj["version"].ToString(), version, buildNr);

diff --git a/cmf-cli/cmf.csproj b/cmf-cli/cmf.csproj
@@ -15,7 +15,7 @@
     <DefaultDocumentationFileNameMode>Name</DefaultDocumentationFileNameMode>
     <DefaultDocumentationNestedTypeVisibility>Namespace</DefaultDocumentationNestedTypeVisibility>
     <DefaultDocumentationGeneratedPages>Namespaces</DefaultDocumentationGeneratedPages>
-    <Version>1.1.1</Version>
+    <Version>1.1.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/npm/package-lock.json b/npm/package-lock.json
diff --git a/npm/package.json b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@criticalmanufacturing/cli",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Critical Manufacturing command line client",
   "bin": {
     "cmf": "./run.js"

diff --git a/tests/tests.csproj b/tests/tests.csproj
@@ -18,5 +18,4 @@
   <ItemGroup>
     <ProjectReference Include="..\cmf-cli\cmf.csproj" />
   </ItemGroup>
-
 </Project>