Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
* stable:
  (version) 0.9.9.11
  (doc) release notes for 0.9.9.11
  (GH-452) Fix broken pin command
  (GH-450)(specs) More integration specs for list
  (maint) Search methods MockLogger
  (maint) print choco version when no args

# Conflicts:
#	.uppercut
#	CHANGELOG.md
  • Loading branch information
ferventcoder committed Oct 6, 2015
2 parents 0ec22c8 + 2928e1d commit b9098ab
Show file tree
Hide file tree
Showing 11 changed files with 670 additions and 47 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Alternative sources (webpi, windowsfeature, cygwin, etc) are back (finally, righ

* AutoUninstaller is on by default - see [#308](https://github.com/chocolatey/choco/issues/308)

## [0.9.9.11](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.11+is%3Aclosed) (October 6, 2015)

### BUG FIXES

* Fix - Pin list is broken - see [#452](https://github.com/chocolatey/choco/issues/452)

## [0.9.9.10](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.9.10+is%3Aclosed) (October 3, 2015)

Not to be confused with 0.9.10 (this is not that version). This fixes a small but extremely significant issue with relation to configuration managers and other tools that use choco.
Expand Down
78 changes: 76 additions & 2 deletions Scenarios.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@
* should not have inconclusive package result
* should not have warning package result

### ChocolateyListCommand [ 2 Scenario(s), 9 Observation(s) ]
### ChocolateyListCommand [ 6 Scenario(s), 30 Observation(s) ]

#### when listing local packages happy path
#### when listing local packages

* should contain a summary
* should contain debugging messages
Expand All @@ -363,6 +363,80 @@
* should not contain packages and versions with a space between them
* should only have messages related to package information

#### when searching all available packages

* should contain a summary
* should contain debugging messages
* should contain packages and versions with a space between them
* should list available packages as many times as they show on the feed
* should not contain packages and versions with a pipe between them

#### when searching for a particular package

* should contain a summary
* should contain debugging messages
* should contain packages and versions with a space between them
* should not contain packages that do not match

#### when searching packages with no filter happy path

* should contain a summary
* should contain debugging messages
* should contain packages and versions with a space between them
* should list available packages only once
* should not contain packages and versions with a pipe between them

#### when searching packages with verbose

* should contain a summary
* should contain debugging messages
* should contain description
* should contain download counts
* should contain packages and versions with a space between them
* should contain tags
* should not contain packages and versions with a pipe between them

### ChocolateyPinCommand [ 9 Scenario(s), 12 Observation(s) ]

#### when listing pins with an existing pin

* should contain existing pin messages
* should not contain list results

#### when listing pins with existing pins

* should contain a pin message for each existing pin
* should not contain list results

#### when listing pins with no pins

* should not contain any pins by default
* should not contain list results

#### when removing a pin for a non installed package

* should throw an error about not finding the package

#### when removing a pin for a pinned package

* should contain success message

#### when removing a pin for an unpinned package

* should contain nothing to do message

#### when setting a pin for a non installed package

* should throw an error about not finding the package

#### when setting a pin for an already pinned package

* should contain nothing to do message

#### when setting a pin for an installed package

* should contain success message

### ChocolateyUninstallCommand [ 13 Scenario(s), 90 Observation(s) ]

#### when force uninstalling a package
Expand Down
6 changes: 6 additions & 0 deletions nuget/chocolatey/chocolatey.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ In that mess there is a link to the [Helper Reference](https://github.com/chocol
<releaseNotes>
See all - https://github.com/chocolatey/choco/blob/master/CHANGELOG.md

## 0.9.9.11

### BUG FIXES

* Fix - Pin list is broken - see [#452](https://github.com/chocolatey/choco/issues/452)

## 0.9.9.10

Not to be confused with 0.9.10 (this is not that version). This fixes a small but extremely significant issue with relation to configuration managers and other tools that use choco.
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey.console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private static void Main(string[] args)
#if DEBUG
"chocolatey".Log().Info(ChocolateyLoggers.Important, () => "{0} v{1} (DEBUG BUILD)".format_with(ApplicationParameters.Name, config.Information.ChocolateyProductVersion));
#else
if (config.Information.ChocolateyVersion == config.Information.ChocolateyProductVersion)
if (config.Information.ChocolateyVersion == config.Information.ChocolateyProductVersion && args.Any())
{
"logfile".Log().Info(() => "{0} v{1}".format_with(ApplicationParameters.Name, config.Information.ChocolateyProductVersion));
}
Expand Down
16 changes: 14 additions & 2 deletions src/chocolatey.tests.integration/Scenario.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ public static void install_package(ChocolateyConfiguration config, string packag

private static ChocolateyConfiguration baseline_configuration()
{
// note that this does not mean an empty configuration. It does get influenced by
// prior commands, so ensure that all items go back to the default values here
var config = NUnitSetup.Container.GetInstance<ChocolateyConfiguration>();

config.AcceptLicense = true;
Expand All @@ -133,6 +135,10 @@ private static ChocolateyConfiguration baseline_configuration()
config.Sources = _fileSystem.get_full_path(_fileSystem.combine_paths(get_top_level(), "packages"));
config.Version = null;
config.Debug = true;
config.AllVersions = false;
config.Verbose = false;
config.Input = config.PackageNames = string.Empty;
config.ListCommand.LocalOnly = false;

return config;
}
Expand Down Expand Up @@ -165,8 +171,14 @@ public static ChocolateyConfiguration list()
{
var config = baseline_configuration();
config.CommandName = CommandNameType.list.to_string();
config.ListCommand.LocalOnly = true;
config.Sources = ApplicationParameters.PackagesLocation;

return config;
}

public static ChocolateyConfiguration pin()
{
var config = baseline_configuration();
config.CommandName = CommandNameType.pin.to_string();

return config;
}
Expand Down
3 changes: 0 additions & 3 deletions src/chocolatey.tests.integration/TODO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ public class TODO
* - uninstall as a dependency
* - uninstall as a dependency with force
*
* List scenarios:
* - list local
* - list lp
*
*/
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<Compile Include="Scenario.cs" />
<Compile Include="scenarios\InstallScenarios.cs" />
<Compile Include="scenarios\ListScenarios.cs" />
<Compile Include="scenarios\PinScenarios.cs" />
<Compile Include="scenarios\UninstallScenarios.cs" />
<Compile Include="scenarios\UpgradeScenarios.cs" />
<Compile Include="TODO.cs" />
Expand Down
Loading

0 comments on commit b9098ab

Please sign in to comment.