Skip to content

Commit

Permalink
Revert "Adding the temporary fix for HelpAnalyzer."
Browse files Browse the repository at this point in the history 
This reverts commit 630830b.
  • Loading branch information
@NayantaraD
NayantaraD committed Aug 2, 2017
1 parent 2171e87 commit e04d6cb
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 81 deletions.
97 changes: 44 additions & 53 deletions tools/StaticAnalysis/BreakingChangeAnalyzer/BreakingChangeAnalyzer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,82 +109,73 @@ public void Analyze(
" -BindingVariable ModuleMetadata; $ModuleMetadata.NestedModules");

var cmdletResult = powershell.Invoke();
var cmdletFiles = cmdletResult.Select(c => c.ToString().Substring(2));

if (cmdletResult.Count > 1)
if (cmdletFiles.Any())
{
var cmdletFiles = cmdletResult.Select(c => c.ToString().Substring(2));

if (cmdletFiles.Any())
foreach (var cmdletFileName in cmdletFiles)
{
foreach (var cmdletFileName in cmdletFiles)
var cmdletFileFullPath = Path.Combine(directory, Path.GetFileName(cmdletFileName));

if (File.Exists(cmdletFileFullPath))
{
var cmdletFileFullPath = Path.Combine(directory, Path.GetFileName(cmdletFileName));

if (File.Exists(cmdletFileFullPath))
{
issueLogger.Decorator.AddDecorator(a => a.AssemblyFileName = cmdletFileFullPath, "AssemblyFileName");
processedHelpFiles.Add(cmdletFileName);
var proxy =
EnvironmentHelpers.CreateProxy<CmdletBreakingChangeLoader>(directory, out _appDomain);
var newModuleMetadata = proxy.GetModuleMetadata(cmdletFileFullPath);
issueLogger.Decorator.AddDecorator(a => a.AssemblyFileName = cmdletFileFullPath, "AssemblyFileName");
processedHelpFiles.Add(cmdletFileName);
var proxy =
EnvironmentHelpers.CreateProxy<CmdletBreakingChangeLoader>(directory, out _appDomain);
var newModuleMetadata = proxy.GetModuleMetadata(cmdletFileFullPath);

string fileName = cmdletFileName + ".json";
string executingPath =
Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);
string fileName = cmdletFileName + ".json";
string executingPath =
Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);

string filePath = executingPath + "\\SerializedCmdlets\\" + fileName;
bool serialize = false;
string filePath = executingPath + "\\SerializedCmdlets\\" + fileName;
bool serialize = false;

if (serialize)
if (serialize)
{
SerializeCmdlets(filePath, newModuleMetadata);
}
else
{
if (!File.Exists(filePath))
{
SerializeCmdlets(filePath, newModuleMetadata);
continue;
}
else
{
if (!File.Exists(filePath))
{
continue;
}

var oldModuleMetadata = DeserializeCmdlets(filePath);
var oldModuleMetadata = DeserializeCmdlets(filePath);

if (cmdletFilter != null)
{
string output = string.Format("Before filter\nOld module cmdlet count: {0}\nNew module cmdlet count: {1}",
oldModuleMetadata.Cmdlets.Count, newModuleMetadata.Cmdlets.Count);

output += string.Format("\nCmdlet file: {0}", cmdletFileFullPath);
if (cmdletFilter != null)
{
string output = string.Format("Before filter\nOld module cmdlet count: {0}\nNew module cmdlet count: {1}",
oldModuleMetadata.Cmdlets.Count, newModuleMetadata.Cmdlets.Count);

oldModuleMetadata.FilterCmdlets(cmdletFilter);
newModuleMetadata.FilterCmdlets(cmdletFilter);
output += string.Format("\nCmdlet file: {0}", cmdletFileFullPath);

output += string.Format("After filter\nOld module cmdlet count: {0}\nNew module cmdlet count: {1}",
oldModuleMetadata.Cmdlets.Count, newModuleMetadata.Cmdlets.Count);
oldModuleMetadata.FilterCmdlets(cmdletFilter);
newModuleMetadata.FilterCmdlets(cmdletFilter);

foreach (var cmdlet in oldModuleMetadata.Cmdlets)
{
output += string.Format("\n\tOld cmdlet - {0}", cmdlet.Name);
}
output += string.Format("After filter\nOld module cmdlet count: {0}\nNew module cmdlet count: {1}",
oldModuleMetadata.Cmdlets.Count, newModuleMetadata.Cmdlets.Count);

foreach (var cmdlet in newModuleMetadata.Cmdlets)
{
output += string.Format("\n\tNew cmdlet - {0}", cmdlet.Name);
}
foreach (var cmdlet in oldModuleMetadata.Cmdlets)
{
output += string.Format("\n\tOld cmdlet - {0}", cmdlet.Name);
}

issueLogger.WriteMessage(output + Environment.NewLine);
foreach (var cmdlet in newModuleMetadata.Cmdlets)
{
output += string.Format("\n\tNew cmdlet - {0}", cmdlet.Name);
}

RunBreakingChangeChecks(oldModuleMetadata, newModuleMetadata, issueLogger);
issueLogger.WriteMessage(output + Environment.NewLine);
}

RunBreakingChangeChecks(oldModuleMetadata, newModuleMetadata, issueLogger);
}
}
}
}

if (cmdletResult.Count == 0)
{
return;
}
}
}
}
Expand Down
47 changes: 19 additions & 28 deletions tools/StaticAnalysis/HelpAnalyzer/HelpAnalyzer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,40 +194,31 @@ private void AnalyzeMarkdownHelp(
" -FileName " + psd1FileName +
" -BindingVariable ModuleMetadata; $ModuleMetadata.NestedModules");
var cmdletResult = powershell.Invoke();
if (cmdletResult.Count > 1)
{
var cmdletFiles = cmdletResult.Select(c => c.ToString().Substring(2));
if (cmdletFiles.Any())
var cmdletFiles = cmdletResult.Select(c => c.ToString().Substring(2));
if (cmdletFiles.Any())
{
List<CmdletHelpMetadata> allCmdlets = new List<CmdletHelpMetadata>();
foreach (var cmdletFileName in cmdletFiles)
{
List<CmdletHelpMetadata> allCmdlets = new List<CmdletHelpMetadata>();
foreach (var cmdletFileName in cmdletFiles)
var cmdletFileFullPath = Path.Combine(directory, Path.GetFileName(cmdletFileName));
if (File.Exists(cmdletFileFullPath))
{
var cmdletFileFullPath = Path.Combine(directory, Path.GetFileName(cmdletFileName));
if (File.Exists(cmdletFileFullPath))
helpLogger.Decorator.AddDecorator((h) =>
{
helpLogger.Decorator.AddDecorator((h) =>
{
h.HelpFile = cmdletFileFullPath;
h.Assembly = cmdletFileFullPath;
}, "Cmdlet");
processedHelpFiles.Add(cmdletFileName);
var proxy =
EnvironmentHelpers.CreateProxy<CmdletLoader>(directory, out _appDomain);
var cmdlets = proxy.GetCmdlets(cmdletFileFullPath);
allCmdlets.AddRange(cmdlets);
helpLogger.Decorator.Remove("Cmdlet");
AppDomain.Unload(_appDomain);
}
h.HelpFile = cmdletFileFullPath;
h.Assembly = cmdletFileFullPath;
}, "Cmdlet");
processedHelpFiles.Add(cmdletFileName);
var proxy =
EnvironmentHelpers.CreateProxy<CmdletLoader>(directory, out _appDomain);
var cmdlets = proxy.GetCmdlets(cmdletFileFullPath);
allCmdlets.AddRange(cmdlets);
helpLogger.Decorator.Remove("Cmdlet");
AppDomain.Unload(_appDomain);
}

ValidateHelpRecords(allCmdlets, helpFiles, helpLogger);
}
}

if (cmdletResult.Count == 0)
{
return;
ValidateHelpRecords(allCmdlets, helpFiles, helpLogger);
}

Directory.SetCurrentDirectory(savedDirectory);
Expand Down

0 comments on commit e04d6cb

Please sign in to comment.