Skip to content

Commit

Permalink
Merge branch 'hotfix/0.7.2'
Browse files Browse the repository at this point in the history
* hotfix/0.7.2:
  (build) Remove reference to gep13
  (GH-404) Return immediately on error
  (build) Fix tslint errors
  • Loading branch information
gep13 committed Aug 12, 2020
2 parents 106b6a9 + 775c9b4 commit de215e8
Show file tree
Hide file tree
Showing 9 changed files with 141 additions and 140 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ Snippets are provided for the following Chocolatey Helper Functions:

To use them, simply open your powershell file, and then type `choco` followed by `ctrl-space`. This will then show the available snippets...

![Available Chocolatey Snippets](https://raw.githubusercontent.com/gep13/chocolatey-vscode/master/images/Choco-Snippets.png)
![Available Chocolatey Snippets](https://raw.githubusercontent.com/chocolatey-community/chocolatey-vscode/master/images/Choco-Snippets.png)

and then simply arrow up/down to the one you want and press enter, or left mouse click. From there the PowerShell code for the helper function will be generated, and the cursor will be placed ready for you to start filling in the content of function...

![Expanded Chocolatey Snippet](https://raw.githubusercontent.com/gep13/chocolatey-vscode/master/images/Expanded-Choco-Snippet.png)
![Expanded Chocolatey Snippet](https://raw.githubusercontent.com/chocolatey-community/chocolatey-vscode/master/images/Expanded-Choco-Snippet.png)

## Dependencies

Expand All @@ -69,18 +69,18 @@ choco install chocolatey-vscode

## Documentation

You can find the documentation that is available for this project [here](https://gep13.github.io/chocolatey-vscode/).
You can find the documentation that is available for this project [here](https://chocolatey-community.github.io/chocolatey-vscode/).

## Thanks

The execution of the Chocolatey commands in this extension would not have been possible without the amazing work of the [Ember CLI VS Code extension](https://github.com/felixrieseberg/vsc-ember-cli), as this was used as the basis for creating this feature in this extension. Huge thanks to [Felix Rieseberg](https://github.com/felixrieseberg).

## Contributing

If you would like to see any other snippet or features added for this VS Code Extension, feel free to raise an [issue](https://github.com/gep13/chocolatey-vscode/issues), and if possible, a follow up pull request.
If you would like to see any other snippet or features added for this VS Code Extension, feel free to raise an [issue](https://github.com/chocolatey-community/chocolatey-vscode/issues), and if possible, a follow up pull request.

You can also join in the Gitter Chat [![Join the chat at https://gitter.im/gep13-oss/community](https://badges.gitter.im/gep13-oss/community.svg)](https://gitter.im/gep13-oss/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

## Releases

To find out what was released in each version of this extension, check out the [releases](https://github.com/gep13/chocolatey-vscode/releases) page.
To find out what was released in each version of this extension, check out the [releases](https://github.com/chocolatey-community/chocolatey-vscode/releases) page.
8 changes: 4 additions & 4 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Task("Install-Vsce")
Task("Create-Release-Notes")
.Does(() =>
{
GitReleaseManagerCreate(parameters.GitHub.UserName, parameters.GitHub.Password, "gep13", "chocolatey-vscode", new GitReleaseManagerCreateSettings {
GitReleaseManagerCreate(parameters.GitHub.UserName, parameters.GitHub.Password, "chocolatey-community", "chocolatey-vscode", new GitReleaseManagerCreateSettings {
Milestone = parameters.Version.Milestone,
Name = parameters.Version.Milestone,
Prerelease = true,
Expand Down Expand Up @@ -205,10 +205,10 @@ Task("Publish-GitHub-Release")

foreach (var package in packageFiles.Select(f => MakeAbsolute(f)))
{
GitReleaseManagerAddAssets(parameters.GitHub.UserName, parameters.GitHub.Password, "gep13", "chocolatey-vscode", parameters.Version.Milestone, package.ToString());
GitReleaseManagerAddAssets(parameters.GitHub.UserName, parameters.GitHub.Password, "chocolatey-community", "chocolatey-vscode", parameters.Version.Milestone, package.ToString());
}

GitReleaseManagerClose(parameters.GitHub.UserName, parameters.GitHub.Password, "gep13", "chocolatey-vscode", parameters.Version.Milestone);
GitReleaseManagerClose(parameters.GitHub.UserName, parameters.GitHub.Password, "chocolatey-community", "chocolatey-vscode", parameters.Version.Milestone);
})
.OnError(exception =>
{
Expand All @@ -232,7 +232,7 @@ Task("Publish-Chocolatey-Package")
.OnError(exception =>
{
Information("Publish-Chocolatey-Package Task failed, but continuing with next Task...");

// TODO: Don't fail build if failure to push package to Chocolatey, as this is known to cause
// some errors at the minute. An error can be returned, but the package is pushed correctly
// publishingError = true;
Expand Down
6 changes: 3 additions & 3 deletions build/parameters.cake
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public class BuildParameters
IsRunningOnWindows = context.IsRunningOnWindows(),
IsRunningOnAppVeyor = buildSystem.AppVeyor.IsRunningOnAppVeyor,
IsPullRequest = buildSystem.AppVeyor.Environment.PullRequest.IsPullRequest,
IsMasterRepo = StringComparer.OrdinalIgnoreCase.Equals("gep13/chocolatey-vscode", buildSystem.AppVeyor.Environment.Repository.Name),
IsMasterRepo = StringComparer.OrdinalIgnoreCase.Equals("chocolatey-community/chocolatey-vscode", buildSystem.AppVeyor.Environment.Repository.Name),
IsMasterBranch = StringComparer.OrdinalIgnoreCase.Equals("master", buildSystem.AppVeyor.Environment.Repository.Branch),
IsDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", buildSystem.AppVeyor.Environment.Repository.Branch),
IsReleaseBranch = buildSystem.AppVeyor.Environment.Repository.Branch.StartsWith("release", StringComparison.OrdinalIgnoreCase),
Expand Down Expand Up @@ -198,9 +198,9 @@ public class BuildParameters
WyamConfigurationFile = context.MakeAbsolute((FilePath)"config.wyam"),
WyamRecipe = "Docs",
WyamTheme = "Samson",
WebHost = "gep13.github.io",
WebHost = "chocolatey-community.github.io",
WebLinkRoot = "chocolatey-vscode",
WebBaseEditUrl = "https://github.com/gep13/chocolatey-vscode/tree/master/input/"
WebBaseEditUrl = "https://github.com/chocolatey-community/chocolatey-vscode/tree/master/input/"
};
}
}
Expand Down
14 changes: 7 additions & 7 deletions chocolatey/chocolatey-vscode.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<title>Chocolatey VSCode extension</title>
<authors>Gary Ewan Park</authors>
<!-- projectUrl is required for the community feed -->
<projectUrl>https://github.com/gep13/chocolatey-vscode</projectUrl>
<iconUrl>https://cdn.jsdelivr.net/gh/gep13/chocolatey-vscode@19e4cf675a962d39e0840907e041c21879f48d3b/images/chocolatey.png</iconUrl>
<projectUrl>https://github.com/chocolatey-community/chocolatey-vscode</projectUrl>
<iconUrl>https://cdn.jsdelivr.net/gh/chocolatey-community/chocolatey-vscode@19e4cf675a962d39e0840907e041c21879f48d3b/images/chocolatey.png</iconUrl>
<copyright>Copyright (c) 2016 Gary Ewan Park</copyright>
<licenseUrl>https://github.com/gep13/chocolatey-vscode/blob/develop/LICENSE</licenseUrl>
<licenseUrl>https://github.com/chocolatey-community/chocolatey-vscode/blob/develop/LICENSE</licenseUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<projectSourceUrl>https://github.com/gep13/chocolatey-vscode</projectSourceUrl>
<projectSourceUrl>https://github.com/chocolatey-community/chocolatey-vscode</projectSourceUrl>
<!-- <docsUrl>https://github.com/gep13/chocolatey-vscode/wiki</docsUrl> Commented until a wiki is available -->
<bugTrackerUrl>https://github.com/gep13/chocolatey-vscode/issues</bugTrackerUrl>
<bugTrackerUrl>https://github.com/chocolatey-community/chocolatey-vscode/issues</bugTrackerUrl>
<tags>chocolatey-vscode vscode extension</tags>
<summary>Chocolatey Extension for Visual Studio Code</summary>
<description>
Expand All @@ -35,12 +35,12 @@ Snippets are provided for the following Chocolatey Helper Functions:
- Install-ChocolateyPackage
- Uninstall-ChocolateyPackage
To use them, simply open your powershell file, and then type choco followed by ctrl-space. This will then show the available snippets...
![Available Chocolatey Snippets](https://cdn.jsdelivr.net/gh/gep13/chocolatey-vscode@19e4cf675a962d39e0840907e041c21879f48d3b/images/Choco-Snippets.png)
![Available Chocolatey Snippets](https://cdn.jsdelivr.net/gh/chocolatey-community/chocolatey-vscode@19e4cf675a962d39e0840907e041c21879f48d3b/images/Choco-Snippets.png)

and then simply arrow up/down to the one you want and press enter, or left mouse click. From there the PowerShell for the helper function will be generated, and the cursor will be placed ready for you to start filling in the content of function...
</description>
<releaseNotes>
Full release notes found on [GitHub Release Page](https://github.com/gep13/chocolatey-vscode/releases)</releaseNotes>
Full release notes found on [GitHub Release Page](https://github.com/chocolatey-community/chocolatey-vscode/releases)</releaseNotes>
<dependencies>
<dependency id="vscode" version="1.24.0" /> <!-- Should be set to the minimum version the extension supports -->
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions chocolatey/tools/VERIFICATION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ in verifying that this package's contents are trustworthy.
This package is being officially supplied by the software author of these scripts (Gary Ewan Park, thanks to contributions from Kim J. Nordmo)

The included binary file can be downloaded from our releases page located at
<https://github.com/gep13/chocolatey-vscode/releases>
<https://github.com/chocolatey-community/chocolatey-vscode/releases>

and should match the checksum of the included vsix file.

The file 'LICENSE.md' is also available in the repository at
<https://github.com/gep13/chocolatey-vscode/blob/develop/LICENSE>
<https://github.com/chocolatey-community/chocolatey-vscode/blob/develop/LICENSE>
4 changes: 2 additions & 2 deletions docs/input/_Bottom.cshtml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="github-button">
<a href="https://github.com/gep13/chocolatey-vscode"><i class="fa fa-github"></i> GitHub</a>
<a href="https://github.com/chocolatey-community/chocolatey-vscode"><i class="fa fa-github"></i> GitHub</a>
</div>
<script>
((window.gitter = {}).chat = {}).options = {
room: 'gep13/chocolatey-vscode'
room: 'chocolatey-community/chocolatey-vscode'
};
</script>
<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"name": "gep13"
},
"bugs": {
"url": "https://github.com/gep13/chocolatey-vscode/issues"
"url": "https://github.com/chocolatey-community/chocolatey-vscode/issues"
},
"homepage": "https://github.com/gep13/chocolatey-vscode",
"homepage": "https://github.com/chocolatey-community/chocolatey-vscode",
"repository": {
"type": "git",
"url": "https://github.com/gep13/chocolatey-vscode"
"url": "https://github.com/chocolatey-community/chocolatey-vscode"
},
"main": "./out/extension",
"galleryBanner": {
Expand Down
6 changes: 3 additions & 3 deletions src/ChocolateyCliManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export class ChocolateyCliManager {
}

public installTemplates(): void {
const config = workspace.getConfiguration("chocolatey").templatePackages;
const config: any = workspace.getConfiguration("chocolatey").templatePackages;

let chocoArguments: Array<string> = ["install"];

Expand All @@ -251,7 +251,7 @@ export class ChocolateyCliManager {
}

private _findPackageTemplates(): string[] {
let templateDir = getPathToChocolateyTemplates();
let templateDir: string = getPathToChocolateyTemplates();

if (!templateDir || !fs.existsSync(templateDir) || !this._isDirectory(templateDir)) {
return [];
Expand All @@ -260,7 +260,7 @@ export class ChocolateyCliManager {
return fs.readdirSync(templateDir).map(name => path.join(templateDir, name)).filter(this._isDirectory);
}

private _isDirectory(path: string) {
private _isDirectory(path: string):boolean {
return fs.lstatSync(path).isDirectory();
}
}
Loading

0 comments on commit de215e8

Please sign in to comment.