Not merge all scripts (#12)

ExecuteScript called for every csx file to support using alias directives.

Author: beolutz

src/ScriptCs.ComponentModel.Composition.Test/ScriptCsCatalogFacts.cs

@@ -1,4 +1,4 @@
-using Moq;
+using Moq;
 using ScriptCs.Contracts;
 using Should;
 using System;
@@ -70,6 +70,25 @@ public void ShouldWorkWithMultipleScripts()
                 mefHost.Plugins[1].DoSomething().ShouldEqual("Double");
             }
 
+            [Fact]
+            public void ShouldWorkWithMultipleScriptsNotMerged()
+            {
+                // arrange
+                var scriptName = @"c:\workingdirectory\SimpleScript.csx";
+                var scriptName2 = @"c:\workingdirectory\DoubleScript.csx";
+                var scriptCsCatalog = new ScriptCsCatalog(new[] { scriptName, scriptName2 },
+                    GetOptions(fileSystem: GetMockFileSystem(new[] { scriptName, scriptName2 }, new[] { Scripts.SimpleScript, Scripts.DoubleScript }).Object, keepScriptsSeparated: true));
+
+                // act
+                var mefHost = GetComposedMefHost(scriptCsCatalog);
+
+                // assert
+                mefHost.Plugins.ShouldNotBeNull();
+                mefHost.Plugins.Count.ShouldEqual(2);
+                mefHost.Plugins[0].DoSomething().ShouldEqual("Simple");
+                mefHost.Plugins[1].DoSomething().ShouldEqual("Double");
+            }
+
             [Fact]
             public void ShouldThrowExceptionIfNullPassedForScriptsFiles()
             {
@@ -732,13 +751,14 @@ private static MEFHost GetComposedMefHost(ScriptCsCatalog catalog)
             return mefHost;
         }
 
-        private static ScriptCsCatalogOptions GetOptions(string[] scriptArgs = null, Type[] references = null, IFileSystem fileSystem = null)
+        private static ScriptCsCatalogOptions GetOptions(string[] scriptArgs = null, Type[] references = null, IFileSystem fileSystem = null, bool keepScriptsSeparated = false)
         {
             return new ScriptCsCatalogOptions
             {
                 FileSystem = fileSystem,
                 References = references,
-                ScriptArgs = scriptArgs
+                ScriptArgs = scriptArgs,
+                KeepScriptsSeparated = keepScriptsSeparated
             };
         }
 
@@ -787,4 +807,4 @@ private static void UpdateFileSystem(Mock<IFileSystem> fileSystem, string[] file
             }
         }
     }
-}
+}

src/ScriptCs.ComponentModel.Composition.Test/ScriptCsCatalogOptionsFacts.cs

@@ -57,6 +57,7 @@ public void ShouldOverridesNullScriptArgs()
                 var options = new ScriptCsCatalogOptions { ScriptArgs = null };
 
                 // act
+
                 var result = options.OverridesNullByDefault();
 
                 // assert
@@ -119,6 +120,20 @@ public void ShouldNotOverridesValuedFileSystem()
                 result.FileSystem.ShouldNotBeNull();
                 result.FileSystem.ShouldEqual(fileSystemMock);
             }
+            
+            
+            [Fact]
+            public void ShouldNotOverridesValuedKeepScriptsSeparated()
+            {
+                // arrange
+                var options = new ScriptCsCatalogOptions { KeepScriptsSeparated = true };
+
+                // act
+                var result = options.OverridesNullByDefault();
+
+                // assert
+                result.KeepScriptsSeparated.ShouldEqual(true);
+            }
         }
     }
-}
+}

src/ScriptCs.ComponentModel.Composition/ScriptCsCatalog.cs

@@ -1,4 +1,4 @@
-using ScriptCs.Contracts;
+using ScriptCs.Contracts;
 using ScriptCs.Hosting;
 using System;
 using System.Collections.Generic;
@@ -406,8 +406,33 @@ private AssemblyCatalog ExecuteScripts(IEnumerable<string> scriptFiles)
         {
             var services = CreateScriptServices();
 
-            var loader = GetLoader(scriptFiles);
+            ScriptResult result = null;
+            if (_options.KeepScriptsSeparated)
+            {
+                foreach (var scriptFile in scriptFiles)
+                {
+                    var loader = GetLoader(new[] { scriptFile });
+                    result = ExecuteScript(services, loader);
+                }
+            }
+            else
+            {
+                var loader = GetLoader(scriptFiles);
+                result = ExecuteScript(services, loader);
+            }
 
+            AssemblyCatalog catalog = null;
+            var marker = result.ReturnValue as Type;
+            if (marker != null)
+            {
+                catalog = new AssemblyCatalog(marker.Assembly, this);
+            }
+
+            return catalog;
+        }
+
+        private ScriptResult ExecuteScript(ScriptServices services, string loader)
+        {
             var result = services.Executor.ExecuteScript(loader);
 
             if (result.CompileExceptionInfo != null)
@@ -420,15 +445,7 @@ private AssemblyCatalog ExecuteScripts(IEnumerable<string> scriptFiles)
                 result.ExecuteExceptionInfo.Throw();
             }
 
-            var marker = result.ReturnValue as Type;
-
-            AssemblyCatalog catalog = null;
-            if (marker != null)
-            {
-                catalog = new AssemblyCatalog(marker.Assembly, this);
-            }
-
-            return catalog;
+            return result;
         }
 
         private string GetFullPath(string path)
@@ -459,11 +476,11 @@ private string GetDisplayName()
         private string GetLoader(IEnumerable<string> scriptFiles)
         {
             var builder = new StringBuilder();
-            foreach (var script in scriptFiles)
+
+            foreach (var scriptFile in scriptFiles)
             {
-                builder.AppendFormat("#load {0}{1}", script, Environment.NewLine);
+                builder.AppendFormat("#load {0}{1}", scriptFile, Environment.NewLine);
             }
-
             builder.AppendLine("public class Marker {}");
             builder.AppendLine("typeof(Marker)");
 
@@ -499,4 +516,4 @@ private ScriptServices CreateScriptServices()
             return scriptServices;
         }
     }
-}
+}

src/ScriptCs.ComponentModel.Composition/ScriptCsCatalogOptions.cs

@@ -28,15 +28,21 @@ public class ScriptCsCatalogOptions
         /// </summary>
         public string[] Modules { get; set; }
 
+        /// <summary>
+        /// Prevents the scripts from beeing merged.
+        /// </summary>
+        public bool KeepScriptsSeparated { get; set; }
+
         internal ScriptCsCatalogOptions OverridesNullByDefault()
         {
             return new ScriptCsCatalogOptions
             {
                 References = References,
                 ScriptArgs = ScriptArgs ?? new string[0],
                 FileSystem = FileSystem ?? new FileSystem(),
-                Modules = Modules ?? new string[0]
+                Modules = Modules ?? new string[0],
+                KeepScriptsSeparated = KeepScriptsSeparated
             };
         }
     }
-}
+}