From ca5e6af4f26dcbbc388e9cf61663b22d37afd869 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Thu, 22 Jul 2010 22:21:41 -0700
Subject: [PATCH] Rename "Packaging" commands

--HG--
branch : dev
---
 .../Commands/PackagingCommands.cs             | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
index 5b28a7cff..8e555268e 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
@@ -2,21 +2,24 @@
 using Orchard.Commands;
 using Orchard.Environment.Extensions;
 using Orchard.Packaging.Services;
+using Orchard.UI.Notify;
 
 namespace Orchard.Packaging.Commands {
     [OrchardFeature("Packaging")]
     public class PackagingCommands : DefaultOrchardCommandHandler {
         private readonly IPackageManager _packageManager;
+        private readonly INotifier _notifier;
 
-        public PackagingCommands(IPackageManager packageManager) {
+        public PackagingCommands(IPackageManager packageManager, INotifier notifier) {
             _packageManager = packageManager;
+            _notifier = notifier;
         }
 
         [OrchardSwitch]
         public string Filename { get; set; }
 
-        [CommandHelp("module create package <moduleName> [/Filename:filename.zip]\r\n\t" + "Create a package for the module <moduleName>. The default filename is <moduleName>-<moduleVersion>.zip.")]
-        [CommandName("module create package")]
+        [CommandHelp("packaging create package <moduleName>\r\n\t" + "Create a package for the module <moduleName>. The default filename is <moduleName>-<moduleVersion>.zip.")]
+        [CommandName("packaging create package")]
         [OrchardSwitches("Filename")]
         public void CreatePackage(string moduleName) {
             var packageData = _packageManager.Harvest(moduleName);
@@ -25,10 +28,7 @@ namespace Orchard.Packaging.Commands {
                 return;
             }
 
-            var filename = Filename;
-            if(string.IsNullOrEmpty(filename)) {
-                filename = string.Format("{0}-{1}.zip", packageData.ExtensionName, packageData.ExtensionVersion);
-            }
+            var filename = string.Format("{0}-{1}.zip", packageData.ExtensionName, packageData.ExtensionVersion);
 
             using(var stream = File.Create(filename)) {
                 packageData.PackageStream.CopyTo(stream);
@@ -36,11 +36,14 @@ namespace Orchard.Packaging.Commands {
             }
 
             var fileInfo = new FileInfo(filename);
+            foreach (var entry in _notifier.List()) {
+                Context.Output.WriteLine(entry.Message);
+            }
             Context.Output.WriteLine(T("Package \"{0}\" successfully created", fileInfo.FullName));
         }
 
-        [CommandHelp("module install package <filename>\r\n\t" + "Install a module from a package <filename>.")]
-        [CommandName("module install package")]
+        [CommandHelp("packaging install package <filename>\r\n\t" + "Install a module from a package <filename>.")]
+        [CommandName("packaging install package")]
         public void InstallPackage(string filename) {
             if (!File.Exists(filename)) {
                 Context.Output.WriteLine(T("File \"{0}\" does not exist.", filename));
@@ -48,7 +51,9 @@ namespace Orchard.Packaging.Commands {
 
             using (var stream = File.Open(filename, FileMode.Open, FileAccess.Read)) {
                 var packageInfo = _packageManager.Install(stream);
-                Context.Output.WriteLine(T("Package \"{0}\" successfully installed at \"{1}\"", packageInfo.ExtensionName, packageInfo.ExtensionPath));
+                foreach (var entry in _notifier.List()) {
+                    Context.Output.WriteLine(entry.Message);
+                }
             }
         }
     }