reverted breaking change to ScriptExector by restoring constructor overload and added null checks

adamralph · adamralph · commit 85775d51e358 · 2015-03-22T02:36:36.000+01:00
diff --git a/src/ScriptCs.Core/NullScriptLibraryComposer.cs b/src/ScriptCs.Core/NullScriptLibraryComposer.cs
@@ -0,0 +1,17 @@
+﻿using ScriptCs.Contracts;
+using System.Text;
+
+namespace ScriptCs
+{
+    public class NullScriptLibraryComposer : IScriptLibraryComposer
+    {
+        public void Compose(string workingDirectory, StringBuilder builder = null)
+        {
+        }
+
+        public string ScriptLibrariesFile
+        {
+            get { return string.Empty; }
+        }
+    }
+}
diff --git a/src/ScriptCs.Core/ScriptCs.Core.csproj b/src/ScriptCs.Core/ScriptCs.Core.csproj
@@ -52,6 +52,7 @@
     <Compile Include="AssemblyResolver.cs" />
     <Compile Include="AssemblyUtility.cs" />
     <Compile Include="FileSystemMigrator.cs" />
+    <Compile Include="NullScriptLibraryComposer.cs" />
     <Compile Include="ScriptLibraryComposer.cs" />
     <Compile Include="ScriptLibraryWrapper.cs" />
     <Compile Include="ReplCommands\AliasCommand.cs" />
diff --git a/src/ScriptCs.Core/ScriptExecutor.cs b/src/ScriptCs.Core/ScriptExecutor.cs
@@ -53,6 +53,12 @@ public class ScriptExecutor : IScriptExecutor
 
         public IScriptLibraryComposer ScriptLibraryComposer { get; protected set; }
 
+        public ScriptExecutor(
+            IFileSystem fileSystem, IFilePreProcessor filePreProcessor, IScriptEngine scriptEngine, ILog logger)
+            : this(fileSystem, filePreProcessor, scriptEngine, logger, new NullScriptLibraryComposer())
+        {
+        }
+
         public ScriptExecutor(
             IFileSystem fileSystem,
             IFilePreProcessor filePreProcessor,
@@ -202,6 +208,11 @@ IDictionary<string, object> state
 
         protected internal virtual FilePreProcessorResult LoadScriptLibraries(string workingDirectory)
         {
+            if (string.IsNullOrWhiteSpace(ScriptLibraryComposer.ScriptLibrariesFile))
+            {
+                return null;
+            }
+
             var scriptLibrariesPath = Path.Combine(workingDirectory, FileSystem.PackagesFolder,
                 ScriptLibraryComposer.ScriptLibrariesFile);
 
diff --git a/src/ScriptCs.Core/ScriptLibraryComposer.cs b/src/ScriptCs.Core/ScriptLibraryComposer.cs
@@ -65,6 +65,11 @@ public virtual string ScriptLibrariesFile
 
         public void Compose(string workingDirectory, StringBuilder builder = null)
         {
+            if (string.IsNullOrWhiteSpace(ScriptLibrariesFile))
+            {
+                return;
+            }
+
             var namespaces = new List<string>();
             var references = new List<string>();
 
diff --git a/src/ScriptCs/Command/InstallCommand.cs b/src/ScriptCs/Command/InstallCommand.cs
@@ -43,12 +43,15 @@ public CommandResult Execute()
             _logger.Info("Installing packages...");
 
             var packagesFolder = Path.Combine(_fileSystem.CurrentDirectory, _fileSystem.PackagesFolder);
-            var scriptLibrariesFile = Path.Combine(packagesFolder, _composer.ScriptLibrariesFile);
-
-            if (_fileSystem.DirectoryExists(packagesFolder))
+            if (!string.IsNullOrWhiteSpace(_composer.ScriptLibrariesFile))
             {
-                _logger.DebugFormat("Deleting: {0}", scriptLibrariesFile);
-                _fileSystem.FileDelete(scriptLibrariesFile);
+                var scriptLibrariesFile = Path.Combine(packagesFolder, _composer.ScriptLibrariesFile);
+
+                if (_fileSystem.FileExists(scriptLibrariesFile))
+                {
+                    _logger.DebugFormat("Deleting: {0}", scriptLibrariesFile);
+                    _fileSystem.FileDelete(scriptLibrariesFile);
+                }
             }
 
             var packages = GetPackages(_fileSystem.CurrentDirectory);
diff --git a/test/ScriptCs.Core.Tests/ScriptExecutorTests.cs b/test/ScriptCs.Core.Tests/ScriptExecutorTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Common.Logging;
 using Moq;
 using Moq.Protected;
 using Ploeh.AutoFixture.Xunit;
@@ -504,13 +505,21 @@ public class TheLoadScriptLibrariesMethod
         {
             [Theory, ScriptCsAutoData]
             public void ShouldPreProcessTheScriptLibrariesFileIfPresent(
-                [Frozen] Mock<IFilePreProcessor> preProcessor,
                 [Frozen] Mock<IFileSystem> fileSystem,
-                ScriptExecutor executor)
+                [Frozen] Mock<IFilePreProcessor> preProcessor,
+                [Frozen] Mock<IScriptEngine> engine,
+                [Frozen] Mock<ILog> logger,
+                [Frozen] Mock<IScriptLibraryComposer> composer)
             {
-                preProcessor.Setup(p => p.ProcessFile(It.IsAny<string>())).Returns(new FilePreProcessorResult());
+                // arrange
                 fileSystem.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(true);
+                var executor = new ScriptExecutor(
+                    fileSystem.Object, preProcessor.Object, engine.Object, logger.Object,composer.Object);
+
+                // act
                 executor.LoadScriptLibraries("");
+                
+                // assert
                 preProcessor.Verify(p => p.ProcessFile(It.IsAny<string>()));
             }
         }
