Adds #204 - unpack from zip

Author: scottdurow

spkl/SparkleXrm.Tasks/Tasks/SolutionPackagerTask.cs

@@ -45,8 +45,10 @@ protected override void ExecuteInternal(string folder, OrganizationServiceContex
                     case "unpack":
                         UnPack(ctx, config);
                         break;
+                    case "unpacksolution":
+                        UnPackFromSolutionZip(config);
+                        break;
                     case "pack":
-                        
                         Pack(ctx, config, false);
                         break;
                     case "import":
@@ -74,6 +76,17 @@ public void UnPack(OrganizationServiceContext ctx, ConfigFile config)
             }
         }
 
+        public void UnPackFromSolutionZip(ConfigFile config)
+        {
+            var configs = config.GetSolutionConfig(this.Profile);
+            foreach (var solutionPackagerConfig in configs)
+            {
+                var solutionZip = Path.Combine(config.filePath, solutionPackagerConfig.solutionpath);
+                var movetoFolder = Path.Combine(config.filePath, solutionPackagerConfig.packagepath);
+                UnpackSolutionZip(solutionPackagerConfig, movetoFolder, solutionZip);
+            }
+        }
+
         public void Pack(OrganizationServiceContext ctx, ConfigFile config, bool import)
         {
             var configs = config.GetSolutionConfig(this.Profile);
@@ -84,7 +97,7 @@ public void Pack(OrganizationServiceContext ctx, ConfigFile config, bool import)
 
                 var version = GetSolutionVersion(packageFolder);
 
-                // Create the solution zip in the root or the location specified in the spkl.jsomn
+                // Create the solution zip in the root or the location specified in the spkl.json
                 if (solutionPackagerConfig.solutionpath != null)
                 {
                     solutionZipPath = String.Format(solutionPackagerConfig.solutionpath, 
@@ -223,7 +236,7 @@ private string GetRandomFolder()
 
         private string UnPackSolution(SolutionPackageConfig solutionPackagerConfig, string targetFolder)
         {
-           
+
             // Extract solution
             var request = new ExportSolutionRequest
             {
@@ -247,7 +260,14 @@ private string UnPackSolution(SolutionPackageConfig solutionPackagerConfig, stri
             // Save solution 
             var solutionZipPath = Path.GetTempFileName();
             File.WriteAllBytes(solutionZipPath, response.ExportSolutionFile);
-         
+
+            UnpackSolutionZip(solutionPackagerConfig, targetFolder, solutionZipPath);
+
+            return targetFolder;
+        }
+
+        private void UnpackSolutionZip(SolutionPackageConfig solutionPackagerConfig, string targetFolder, string solutionZipPath)
+        {
             var binPath = GetPackagerFolder();
             var binFolder = new FileInfo(binPath).DirectoryName;
 
@@ -262,11 +282,8 @@ private string UnPackSolution(SolutionPackageConfig solutionPackagerConfig, stri
                 );
 
             RunPackager(binPath, binFolder, parameters);
-
-            return targetFolder;
         }
 
-       
 
         private string PackSolution(string rootPath, SolutionPackageConfig solutionPackagerConfig, string solutionZipPath)
         {

spkl/spkl/Program.cs

@@ -339,6 +339,12 @@ private static void RunTask(CommandLineArgs arguments, IOrganizationService serv
                     packager.command = command;
                     task = packager;
                     break;
+                case "unpacksolution":
+                    trace.WriteLine("Unpacking solution Zip");
+                    var unpackfromsolution = new SolutionPackagerTask(service, trace);
+                    unpackfromsolution.command = command;
+                    task = unpackfromsolution;
+                    break;
                 case "pack":
                     trace.WriteLine("Packing Solution");
                     var pack = new SolutionPackagerTask(service, trace);