Skip to content

Commit

Permalink
Merge pull request #148 from chocolatey/typo
Browse files Browse the repository at this point in the history
Correcting Typos
  • Loading branch information
ferventcoder committed Mar 6, 2015
2 parents 00acd81 + 92b5296 commit e8c5baf
Show file tree
Hide file tree
Showing 21 changed files with 48 additions and 47 deletions.
4 changes: 2 additions & 2 deletions src/chocolatey.console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private static void Main(string[] args)

trap_exit_scenarios(config);

if (config.RegularOuptut)
if (config.RegularOutput)
{
"logfile".Log().Info(() => "".PadRight(60, '='));
#if DEBUG
Expand All @@ -83,7 +83,7 @@ private static void Main(string[] args)
}


if (warnings.Count != 0 && config.RegularOuptut)
if (warnings.Count != 0 && config.RegularOutput)
{
foreach (var warning in warnings.or_empty_list_if_null())
{
Expand Down
1 change: 1 addition & 0 deletions src/chocolatey.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ limitations under the License.</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=474957be_002Df1f1_002D44f8_002Da1ba_002D6fbd8a61587b/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Public" Description="Properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=b229e86b_002D47e7_002D493e_002D9c0f_002D2b53080cdad9/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Methods, Events"&gt;&lt;ElementKinds&gt;&lt;Kind Name="METHOD" /&gt;&lt;Kind Name="EVENT" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/LocationType/@EntryValue">SOLUTION_FOLDER</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
</wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion src/chocolatey.tests.integration/Scenario.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private static ChocolateyConfiguration baseline_configuration()
config.OverrideArguments = false;
config.Prerelease = false;
config.PromptForConfirmation = false;
config.RegularOuptut = true;
config.RegularOutput = true;
config.SkipPackageInstallProvider = false;
config.Sources = _fileSystem.get_full_path(_fileSystem.combine_paths(get_top_level(), "packages"));
config.Version = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public void should_not_create_a_shim_for_mismatched_case_ignored_executable_in_t
}

[Fact]
public void should_not_create_an_extensions_folder_for_the_pacakge()
public void should_not_create_an_extensions_folder_for_the_package()
{
var extensionsDirectory = Path.Combine(Scenario.get_top_level(), "extensions", Configuration.PackageNames);

Expand Down
8 changes: 4 additions & 4 deletions src/chocolatey.tests/GetChocolateySpecs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ public override void Because()
}

[Fact]
public void should_get_chocolotey()
public void should_get_chocolatey()
{
_chocolatey.ShouldNotBeNull();
}

[Fact]
public void should_conigure_log4net()
public void should_configure_log4net()
{
LogManager.GetRepository().Configured.ShouldBeTrue();
}
Expand All @@ -61,13 +61,13 @@ public override void Because()
}

[Fact]
public void should_get_instantiated_chocolotey1()
public void should_get_instantiated_chocolatey1()
{
_chocolatey1.ShouldNotBeNull();
}

[Fact]
public void should_get_instantiated_chocolotey2()
public void should_get_instantiated_chocolatey2()
{
_chocolatey2.ShouldNotBeNull();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void should_not_be_empty()
}

[Fact]
public void should_be_transferrable_to_Version()
public void should_be_transferable_to_Version()
{
new Version(result).ShouldNotBeNull();
}
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey/EnumerableExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static IEnumerable or_empty_list_if_null(this IEnumerable source)
}

/// <summary>
/// Joins the specified IEnumerables.
/// Joins the specified IEnumerable to required separator.
/// </summary>
/// <param name="source">The source.</param>
/// <param name="separator">The value to put in between elements</param>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ private static void set_global_options(IList<string> args, ChocolateyConfigurati
"NoOp - Don't actually do anything.",
option => config.Noop = option != null)
.Add("r|limitoutput|limit-output",
"LimitOuptut - Limit the output to essential information",
option => config.RegularOuptut = option == null)
"LimitOutput - Limit the output to essential information",
option => config.RegularOutput = option == null)
.Add("execution-timeout=",
"CommandExecutionTimeoutSeconds - Override the default execution timeout in the configuration of {0} seconds.".format_with(config.CommandExecutionTimeoutSeconds.to_string()),
option => config.CommandExecutionTimeoutSeconds = int.Parse(option))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void run(ChocolateyConfiguration configuration)
{
_configSettingsService.get_api_key(configuration, (key) =>
{
if (configuration.RegularOuptut)
if (configuration.RegularOutput)
{
this.Log().Info(() => "{0} - {1}".format_with(key.Source, key.Key));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void configure_argument_parser(OptionSet optionSet, ChocolateyConfigurati
"Prerelease - Include Prereleases? Defaults to false.",
option => configuration.Prerelease = option != null)
.Add("p|includeprograms|include-programs",
"IncludePrograms - Used in conjuction with LocalOnly, filters out apps chocolatey has listed as packages and includes those in the list. Defaults to false.",
"IncludePrograms - Used in conjunction with LocalOnly, filters out apps chocolatey has listed as packages and includes those in the list. Defaults to false.",
option => configuration.ListCommand.IncludeRegistryPrograms = option != null)
.Add("a|all|allversions|all-versions",
"AllVersions - include results from all versions.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public virtual void configure_argument_parser(OptionSet optionSet, ChocolateyCon
"Skip Powershell - Do not run chocolateyInstall.ps1. Defaults to false.",
option => configuration.SkipPackageInstallProvider = option != null)
.Add("failonunfound|fail-on-unfound",
"Fail On Unfound Packages - If a pacakge is not found in feeds specified, fail instead of warn.",
"Fail On Unfound Packages - If a package is not found in feeds specified, fail instead of warn.",
option => configuration.UpgradeCommand.FailOnUnfound = option != null)
;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ChocolateyConfiguration
{
public ChocolateyConfiguration()
{
RegularOuptut = true;
RegularOutput = true;
PromptForConfirmation = true;
Information = new InformationCommandConfiguration();
Features = new FeaturesConfiguration();
Expand Down Expand Up @@ -150,7 +150,7 @@ private void append_output(StringBuilder propertyValues, string append)
public bool Force { get; set; }
public bool Noop { get; set; }
public bool HelpRequested { get; set; }
public bool RegularOuptut { get; set; }
public bool RegularOutput { get; set; }
public bool PromptForConfirmation { get; set; }
public bool AcceptLicense { get; set; }
public bool AllowUnofficialBuild { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey/infrastructure.app/runners/GenericRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ now be in a bad state. Only official builds are to be trusted.

if (config.Noop)
{
if (config.RegularOuptut)
if (config.RegularOutput)
{
this.Log().Info("_ {0}:{1} - Noop Mode _".format_with(ApplicationParameters.Name, command.GetType().Name));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void list_run(ChocolateyConfiguration config, bool logResults)
else
{
var list = _nugetService.list_run(config, logResults: true);
if (config.RegularOuptut)
if (config.RegularOutput)
{
this.Log().Warn(() => @"{0} packages {1}.".format_with(list.Count, config.ListCommand.LocalOnly ? "installed" : "found"));

Expand Down Expand Up @@ -330,7 +330,7 @@ private IEnumerable<ChocolateyConfiguration> get_packages_from_config(string pac
public void upgrade_noop(ChocolateyConfiguration config)
{
var noopUpgrades = _nugetService.upgrade_noop(config, (pkg) => _powershellService.install_noop(pkg));
if (config.RegularOuptut)
if (config.RegularOutput)
{
var upgradeWarnings = noopUpgrades.Count(p => p.Value.Warning);
this.Log().Warn(() => @"{0}{1} can upgrade {2}/{3} package(s). {4}{0} See the log for details.".format_with(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public interface INugetService
void list_noop(ChocolateyConfiguration config);

/// <summary>
/// Lists/searches for pacakge against nuget related feeds.
/// Lists/searches for package against nuget related feeds.
/// </summary>
/// <param name="config">The configuration.</param>
/// <param name="logResults">Should results be logged?</param>
Expand Down
Loading

0 comments on commit e8c5baf

Please sign in to comment.