Rename DSC in switch name to Dsc and change module handler usage

ModuleDependencyHandler class usage is changed to utilize the IDisposable pattern. It is instantiated only before analyzing the files and disposed right after that.

Author: Kapil Borle

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -192,12 +192,12 @@ public object Settings
         /// Resolve DSC resoure dependency
         /// </summary>        
         [Parameter(Mandatory = false)]
-        public SwitchParameter ResolveDSCResourceDependency
+        public SwitchParameter ResolveDscResourceDependency
         {
-            get { return resolveDSCResourceDependency; }
-            set { resolveDSCResourceDependency = value; }
+            get { return resolveDscResourceDependency; }
+            set { resolveDscResourceDependency = value; }
         }
-        private bool resolveDSCResourceDependency;
+        private bool resolveDscResourceDependency;
         #endregion Parameters
 
         #region Overrides
@@ -224,7 +224,7 @@ protected override void BeginProcessing()
                 this.severity,
                 null == rulePaths ? true : this.includeDefaultRules,
                 this.suppressedOnly,
-                resolveDSCResourceDependency: resolveDSCResourceDependency);
+                resolveDscResourceDependency: resolveDscResourceDependency);
         }
 
         /// <summary>

Engine/ScriptAnalyzer.cs

@@ -45,13 +45,12 @@ public sealed class ScriptAnalyzer
         List<Regex> includeRegexList;
         List<Regex> excludeRegexList;
         bool suppressedOnly;
+        private bool resolveDscResourceDependency;
         #endregion
 
         #region Singleton
         private static object syncRoot = new Object();
-
         private static ScriptAnalyzer instance;
-
         public static ScriptAnalyzer Instance
         {
             get
@@ -103,7 +102,7 @@ internal void Initialize<TCmdlet>(
             string[] severity = null,
             bool includeDefaultRules = false,
             bool suppressedOnly = false,
-            bool resolveDSCResourceDependency = false)
+            bool resolveDscResourceDependency = false)
             where TCmdlet : PSCmdlet, IOutputWriter
         {
             if (cmdlet == null)
@@ -121,7 +120,7 @@ internal void Initialize<TCmdlet>(
                 severity,
                 includeDefaultRules,
                 suppressedOnly,
-                resolveDSCResourceDependency: resolveDSCResourceDependency);
+                resolveDscResourceDependency: resolveDscResourceDependency);
         }
 
         /// <summary>
@@ -470,14 +469,15 @@ private void Initialize(
             bool includeDefaultRules = false,
             bool suppressedOnly = false,
             string profile = null,
-            bool resolveDSCResourceDependency = false)
+            bool resolveDscResourceDependency = false)
         {
             if (outputWriter == null)
             {
                 throw new ArgumentNullException("outputWriter");
             }
 
             this.outputWriter = outputWriter;
+            this.resolveDscResourceDependency = resolveDscResourceDependency;
 
             #region Verifies rule extensions and loggers path
 
@@ -1165,22 +1165,36 @@ public IEnumerable<DiagnosticRecord> AnalyzePath(string path, bool searchRecursi
             // is an optimization over doing the whole operation at once
             // and calling .Concat on IEnumerables to join results.
             this.BuildScriptPathList(path, searchRecursively, scriptFilePaths);
-            using (var rsp = RunspaceFactory.CreateRunspace())
+            if (resolveDscResourceDependency)
             {
-                rsp.Open();
-                using (var moduleHandler = new ModuleDependencyHandler(rsp))
+                using (var rsp = RunspaceFactory.CreateRunspace())
                 {
-                    foreach (string scriptFilePath in scriptFilePaths)
+                    rsp.Open();
+                    using (var moduleHandler = new ModuleDependencyHandler(rsp))
                     {
-                        // Yield each record in the result so that the
-                        // caller can pull them one at a time
-                        foreach (var diagnosticRecord in this.AnalyzeFile(scriptFilePath, moduleHandler))
-                        {
-                            yield return diagnosticRecord;
-                        }
+                        return AnalyzePaths(scriptFilePaths, moduleHandler);
                     }
+                } // disposing the runspace also closes it if it not already closed
+            }
+            else
+            {
+                return AnalyzePaths(scriptFilePaths, null);
+            }
+        }
+
+        private IEnumerable<DiagnosticRecord> AnalyzePaths(
+            IEnumerable<string> scriptFilePaths,
+            ModuleDependencyHandler moduleHandler)
+        {
+            foreach (string scriptFilePath in scriptFilePaths)
+            {
+                // Yield each record in the result so that the
+                // caller can pull them one at a time
+                foreach (var diagnosticRecord in this.AnalyzeFile(scriptFilePath, moduleHandler))
+                {
+                    yield return diagnosticRecord;
                 }
-            } // disposing the runspace also closes it if it not already closed
+            }
         }
 
         /// <summary>