some fixes in pack command

Author: kunga

Commands/PackCommand.cs

@@ -1,8 +1,7 @@
-using System;
-using System.IO;
-using System.Linq;
 using Common;
 using Common.YamlParsers;
+using System.IO;
+using System.Linq;
 
 namespace Commands
 {
@@ -79,8 +78,9 @@ protected override void ParseArgs(string[] args)
         }
 
         public override string HelpMessage => @"
-    Pack project to nuget package. Replace file references to package references in csproj file and run 'dotnet pack' command.
-    Allows to publish nuget package to use outside of cement.
+    Packs project to nuget package. Replaces file references to package references in csproj file and runs 'dotnet pack' command.
+    Allows to publish nuget package to use outside of cement.
+    Searches cement deps in nuget by module name.
 
     Usage:
         cm pack [-v|--verbose|-w|-W|--warnings] [-p|--progress] [-c configName] <project-file>

Commands/ReadmeGenerator.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Commands
 {
@@ -47,6 +47,8 @@ public static string Generate()
 {commands["show-deps"].HelpMessage}
 ### cm usages
 {commands["usages"].HelpMessage}
+### cm pack
+{commands["pack"].HelpMessage}
 
 ### cm status
 {commands["status"].HelpMessage}";

Common/CompleteCommandAutomata.cs

@@ -1,9 +1,9 @@
-using System;
+using Common.YamlParsers;
+using log4net;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Common.YamlParsers;
-using log4net;
 
 namespace Common
 {
@@ -145,6 +145,9 @@ private TokensList RefAddComplete()
 
         private TokensList MoudleCsprojs()
         {
+            var workspace = Helper.GetWorkspaceDirectory(Directory.GetCurrentDirectory()) ?? Directory.GetCurrentDirectory();
+            Helper.SetWorkspace(workspace);
+
             var moduleDirectory = Helper.GetModuleDirectory(Directory.GetCurrentDirectory());
             if (moduleDirectory == null)
                 return null;
@@ -214,6 +217,7 @@ private void InitAutomata()
                         {"show", ModuleKeyWithModules}
                     }
                 },
+                {"pack", MoudleCsprojs },
                 "--version"
             };
 

Common/NuGetHelper.cs

@@ -1,12 +1,37 @@
-using System.IO;
 using log4net;
+using System;
+using System.IO;
 
 namespace Common
 {
     public static class NuGetHelper
     {
         private static readonly ILog Log = LogManager.GetLogger(typeof(NuGetHelper));
 
+        public static string GetNugetPackageVersion(string packageName, string nugetRunCommand)
+        {
+            var shellRunner = new ShellRunner();
+            ConsoleWriter.WriteProgressWithoutSave("Get package verion for " + packageName);
+
+            shellRunner.Run($"{nugetRunCommand} list {packageName} -NonInteractive");
+            foreach (var line in shellRunner.Output.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries))
+            {
+                var lineTokens = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                if (lineTokens.Length == 2 && lineTokens[0].Equals(packageName, StringComparison.InvariantCultureIgnoreCase))
+                {
+                    var msg = $"Got package version: {lineTokens[1]} for {packageName}";
+                    Log.Info(msg);
+                    ConsoleWriter.WriteInfo(msg);
+                    return lineTokens[1];
+                }
+            }
+
+            var message = "not found package version. nuget output: " + shellRunner.Output + shellRunner.Errors;
+            Log.Debug(message);
+            ConsoleWriter.WriteWarning(message);
+            return null;
+        }
+
         public static string GetNugetRunCommand()
         {
             var nuGetPath = GetNuGetPath();

Common/ProjectFile.cs

@@ -1,11 +1,9 @@
+using log4net;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml;
-using log4net;
 
 namespace Common
 {
@@ -187,7 +185,7 @@ public XmlDocument CreateCsProjWithNugetReferences(List<Dep> deps, string module
                 var includeAttr = patchedProjDoc.CreateAttribute("Include");
                 includeAttr.Value = dep.Name;
                 refElement.Attributes.Append(includeAttr);
-                var packageVersion = GetNugetPackageVersion(moduleDirectory, dep.Name, nugetRunCommand);
+                var packageVersion = NuGetHelper.GetNugetPackageVersion(dep.Name, nugetRunCommand);
                 if (!string.IsNullOrEmpty(packageVersion))
                 {
                     var versionAttr = patchedProjDoc.CreateAttribute("Version");
@@ -199,32 +197,7 @@ public XmlDocument CreateCsProjWithNugetReferences(List<Dep> deps, string module
 
             return patchedProjDoc;
         }
-
-        private string GetNugetPackageVersion(string directory, string packageName, string nugetRunCommand)
-        {
-            var shellRunner = new ShellRunner();
-            ConsoleWriter.WriteInfo("Get package verion for " + packageName);
-
-            shellRunner.RunInDirectory(directory, $"{nugetRunCommand} list {packageName} -NonInteractive");
-            foreach (var line in shellRunner.Output.Split(new[] { "\n" }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                var lineTokens = line.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-                if (lineTokens.Length == 2 &&
-                    lineTokens[0].Equals(packageName, StringComparison.InvariantCultureIgnoreCase))
-                {
-                    var msg = $"Got package version: {lineTokens[1]} for {packageName}";
-                    log.Info(msg);
-                    ConsoleWriter.WriteInfo(msg);
-                    return lineTokens[1];
-                }
-            }
-
-            var message = "not found package version. nuget output: " + shellRunner.Output + shellRunner.Errors;
-            log.Debug(message);
-            ConsoleWriter.WriteInfo(message);
-            return null;
-        }
-
+        
         public void Save()
         {
             XmlDocumentHelper.Save(Document, FilePath, lineEndings);

README-commands.md

@@ -34,6 +34,8 @@
 
 [cm usages](#cm-usages)
 
+[cm pack](#cm-pack)
+
 [cm status](#cm-status)
 
 
@@ -315,6 +317,22 @@
             cm usages grep "new Class" "Class.New" -- *.cs
                 show lines contains "new Class" or "Class.New" in modules linked to the current, only in *.cs files
 
+### cm pack
+
+    Packs project to nuget package. Replaces file references to package references in csproj file and runs 'dotnet pack' command.
+    Allows to publish nuget package to use outside of cement.
+    Searches cement deps in nuget by module name.
+
+    Usage:
+        cm pack [-v|--verbose|-w|-W|--warnings] [-p|--progress] [-c configName] <project-file>
+        -c/--configuration      - build package for specific configuration
+
+        -v/--verbose            - show full msbuild output
+        -w/--warnings           - show warnings
+        -W                      - show only obsolete warnings
+
+        -p/--progress           - show msbuild output in one line
+
 
 ### cm status