Skip to content

Commit

Permalink
Release v2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
lipkau authored Mar 22, 2018
2 parents 1cdc0cb + c00683b commit 1c96c79
Show file tree
Hide file tree
Showing 191 changed files with 6,506 additions and 6,810 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://help.github.com/articles/about-codeowners/

* @atlassianps/maintainers @atlassianps/reviewers
278 changes: 17 additions & 261 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,269 +1,25 @@
# Contributing to JiraPS
-----------
# Contributing to AtlassianPS Homepage

We welcome and appreciate contributions from the community.
There are many ways to become involved with JiraPS:
* including filing issues,
* joining in design conversations,
* writing and improving documentation,
* and contributing to the code.
Happy to see you are interested in helping.

Please read the rest of this document to ensure a smooth contribution process.
We have a comprehensive documentation on how to contribute here: **[Contributing to AtlassianPS](https://atlassianps.org/docs/contributing/)**.

## New to Git?
-----------

* Make sure you have a [GitHub account](https://github.com/signup/free).
* Learning Git:
* GitHub Help: [Good Resources for Learning Git and GitHub][good-git-resources].
* [Git Basics](/wiki/Git-Basics): install and getting started.
* [GitHub Flow Guide](https://guides.github.com/introduction/flow/): step-by-step instructions of GitHub flow.

## Contributing to Issues
----------------------

* Check if the issue you are going to file already exists in our [GitHub issues][open-issue].
* If you can't find your issue already, [open a new issue](https://github.com/PowerShell/PowerShell/issues/new), making sure to follow the directions as best you can.
* If the issue is marked as [`Up-for-Grabs`][up-for-grabs], the Module Maintainers are looking for help with the issue.

## Contributing to Documentation
-----------------------------
_not yet defined_

## Contributing to Code
--------------------

### Building and testing

#### Testing JiraPS

Please see PowerShell [Testing Guidelines - Running Tests Outside of CI][running-tests-outside-of-ci] on how to test you build locally.

### Finding or creating an issue

1. Follow the instructions in [Contributing to Issues][contribute-issues] to find or open an issue.
2. Mention in the issue that you are working on the issue and ask `@AtlassianPS/moderators` for an assignment.

### Forks and Pull Requests

GitHub fosters collaboration through the notion of [pull requests][using-prs].
On GitHub, anyone can [fork][fork-a-repo] an existing repository
into their own user account, where they can make private changes to their fork.
To contribute these changes back into the original repository,
a user simply creates a pull request in order to "request" that the changes be taken "upstream".

Additional references:
* GitHub's guide on [forking](https://guides.github.com/activities/forking/)
* GitHub's guide on [Contributing to Open Source](https://guides.github.com/activities/contributing-to-open-source/#pull-request)
* GitHub's guide on [Understanding the GitHub Flow](https://guides.github.com/introduction/flow/)


### Lifecycle of a pull request

#### Before submitting

* To avoid merge conflicts, make sure your branch is rebased on the `dev` branch of this repository.
* Many code changes will require new tests, so make sure you've added a new test if existing tests do not effectively test the code changed.
* Clean up your commit history.
Each commit should be a **single complete** change.
This discipline is important when reviewing the changes as well as when using `git bisect` and `git revert`.


#### Pull request submission

**Always create a pull request to the `dev` branch of this repository**.

<!-- ![Github-PR-dev.png](Images/Github-PR-dev.png) -->

<!-- * If you're contributing in a way that changes the user or developer experience, you are expected to document those changes.
See [Contributing to documentation related to PowerShell](#contributing-to-documentation-related-to-powershell). -->

* Add a meaningful title of the PR describing what change you want to check in.
Don't simply put: "Fixes issue #5".
A better example is: "Add Ensure parameter to New-Item cmdlet", with "Fixes #5" in the PR's body.

* When you create a pull request,
including a summary of what's included in your changes and
if the changes are related to an existing GitHub issue,
please reference the issue in pull request description (e.g. ```Closes #11```).
See [this][closing-via-message] for more details.

* If the change warrants a note in the [changelog](../CHANGELOG.MD)
either update the changelog in your pull request or
add a comment in the PR description saying that the change may warrant a note in the changelog.
New changes always go into the **Unreleased** section.
Keeping the changelog up-to-date simplifies the release process for Maintainers.
An example:
```
Unreleased
----------
* `Update-Item` now supports `-FriendlyName`.
```
Please use the present tense and imperative mood when describing your changes:

* Instead of "Adding support for Windows Server 2012 R2", write "Add support for Windows Server 2012 R2".

* Instead of "Fixed for server connection issue", write "Fix server connection issue".

This form is akin to giving commands to the code base,
and is recommended by the Git SCM developers.
It is also used in the [Git commit messages](#common-engineering-practices).

Also, if change is related to a specific resource, please prefix the description with the resource name:

* Instead of "New,parameter 'ConnectionCredential' in New-JiraIssue",
write "New-JiraIssue: added parameter 'ConnectionCredential'".

#### Pull Request - Automatic Checks

<!--* Make sure you follow the [Common Engineering Practices](#common-engineering-practices)
and [testing guidelines](../docs/testing-guidelines/testing-guidelines.md).-->

* After submitting your pull request,
our [CI system (AppVeyor)][ci-system]
will run a suite of tests and automatically update the status of the pull request.

<!--* Our CI contains automated spellchecking. If there is any false-positive,
[run the spellchecker command line tool in interactive mode](#spellchecking-documentation)
to add words to the `.spelling` file.-->

#### Pull Request - Code Review

* Roles and Responsibilities of a PR: Author, Reviewer, and Assignee
* Reviewer and Assignee are two separate roles of a PR.
* A Reviewer can be anyone who wants to contribute.
A Reviewer reviews the change of a PR,
leaves comments for the Author to address,
and approves the PR when the change looks good.
* An Assignee must be a [Maintainer](/wiki/Maintainers), who monitors the progress of the PR,
coordinates the review process, and merges the PR after it's been approved.
The Assignee may or may not be a Reviewer of the PR at the same time.
* An Author is encouraged to choose Reviewer(s) and an Assignee for the PR.
If no Assignee is chosen, one of the Maintainers shall be assigned to it.
If no Reviewer is chosen, the Assignee shall choose Reviewer(s) as appropriate.
* If an Author is a [AtlassianPS Team](https://github.com/orgs/AtlassianPS/people) member,
then the Author **is required** to choose Reviewer(s) and an Assignee for the PR.
* For a PR to be merged, it must be approved by at least one JiraPS Team member or Collaborator,
so additional Reviewer(s) may be added by the Assignee as appropriate.
The Assignee may also be re-assigned by Maintainers.

* A Reviewer can postpone the code review if CI builds fail,
but also can start the code review early regardless of the CI builds.

* The Author **is responsible** for driving the PR to the Approved state.
The Author addresses review comments, and pings Reviewer(s) to start the next iteration.
If the review is making no progress (or very slow),
the Author can always ask the Assignee to help coordinate the process and keep it moving.

* Additional feedback is always welcome!
Even if you are not designated as a Reviewer,
feel free to review others' pull requests anyway.
Leave your comments even if everything looks good;
a simple "Looks good to me" or "LGTM" will suffice.
This way we know someone has already taken a look at it!

* When updating your pull request, please **create new commits**
and **don't rewrite the commits history**. This way it's very easy for
the reviewers to see diff between iterations.
If you rewrite the history in the pull request, review could be much slower.
Once the review is done, you can rewrite the history to make it prettier,
if you like.
Otherwise it's likely would be squashed on merge to `dev`.

* Once the code review is done,
all merge conflicts are resolved,
and the CI system build status is passing,
the PR Assignee will merge your changes.


<!--## Making Breaking Changes
-----------------------
When you make code changes,
please pay attention to these that can affect the [Public Contract](../docs/dev-process/breaking-change-contract.md).
For example, changing PowerShell parameters, APIs, or protocols break the public contract.
Before making changes to the code,
first review the [breaking changes contract](../docs/dev-process/breaking-change-contract.md)
and follow the guidelines to keep PowerShell backward compatible.-->

<!--## Making Design Changes
---------------------
To add new features such as cmdlets or making design changes,
please follow the [PowerShell Request for Comments (RFC)](https://github.com/PowerShell/PowerShell-RFC) process.-->

## Common Engineering Practices
----------------------------

<!--Other than the guidelines for ([coding](../docs/dev-process/coding-guidelines.md),
the [RFC process](https://github.com/PowerShell/PowerShell-RFC) for design,
[documentation](#contributing-to-documentation) and [testing](../docs/testing-guidelines/testing-guidelines.md)) discussed above,-->
we encourage contributors to follow these common engineering practices:

* Format commit messages following these guidelines:
But here is the gist of it once you have forked the repository:

* before changing the code
```powershell
git clone https://github.com/<YOUR GITHUB USER>/JiraPS
cd JiraPS
# git checkout develop # not applicable for this repository
git checkout -b <NAME FOR YOUR FEATURE>
code .
```
Summarize change in 50 characters or less
Similar to email, this is the body of the commit message,
and the above is the subject.
Always leave a single blank line between the subject and the body
so that `git log` and `git rebase` work nicely.
The subject of the commit should use the present tense and
imperative mood, like issuing a command:
> Makes abcd do wxyz
The body should be a useful message explaining
why the changes were made.
If significant alternative solutions were available,
explain why they were discarded.
Keep in mind that the person most likely to refer to your commit message
is you in the future, so be detailed!
As Git commit messages are most frequently viewed in the terminal,
you should wrap all lines around 72 characters.

Using semantic line feeds (breaks that separate ideas)
is also appropriate, as is using Markdown syntax.
* after making the changes
```powershell
git add .
git commit -m "<A MESSAGE ABOUT THE CHANGES>"
git push
```

* These are based on Tim Pope's [guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
Git SCM [submitting patches](https://git.kernel.org/cgit/git/git.git/tree/Documentation/SubmittingPatches),
Brandon Rhodes' [semantic linefeeds][],
and John Gruber's [Markdown syntax](https://daringfireball.net/projects/markdown/syntax).

* Don't commit code that you didn't write.
If you find code that you think is a good fit to add to JiraPS,
file an issue and start a discussion before proceeding.

* Create and/or update tests when making code changes.

* Run tests and ensure they are passing before pull request.

* All pull requests **must** pass CI systems before they can be approved.

* Avoid making big pull requests.
Before you invest a large amount of time,
file an issue and start a discussion with the community.



[testing-guidelines]: ../docs/testing-guidelines/testing-guidelines.md
[running-tests-outside-of-ci]: ../docs/testing-guidelines/testing-guidelines.md#running-tests-outside-of-ci
[issue-management]: ../docs/maintainers/issue-management.md
[governance]: ../docs/community/governance.md
[using-prs]: https://help.github.com/articles/using-pull-requests/
[fork-a-repo]: https://help.github.com/articles/fork-a-repo/
[closing-via-message]: https://help.github.com/articles/closing-issues-via-commit-messages/
[CLA]: #contributor-license-agreement-cla
[ci-system]: ../docs/testing-guidelines/testing-guidelines.md#ci-system
[good-git-resources]: https://help.github.com/articles/good-resources-for-learning-git-and-github/
[contribute-issues]: #contributing-to-issues
[open-issue]: https://github.com/PowerShell/PowerShell/issues
[up-for-grabs]: https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs
[semantic linefeeds]: http://rhodesmill.org/brandon/2012/one-sentence-per-line/
* [Creating a Pull Request](https://help.github.com/articles/creating-a-pull-request/)
17 changes: 7 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
# Ignore configuration files
*.ini
*.conf
*.config
config.xml
Tests/test.txt

# Ignore all files beginning with a dot (.)
.*
# except for git files
!.gitattributes
!.gitignore
!.github/

# Ignore _build folders generated by running sphinx locally
docs/_build/*
docs/_build.html/*
!.vscode/
!.travis.yml

# Ignore Release directory generated by local builds
Release/
Tools/
# ConfluencePS/en-US/
Tools/*.exe
JiraPS/en-US/
TestResult.xml

#######
Expand All @@ -38,3 +32,6 @@ ehthumbs.db

# Folder config file
Desktop.ini

#Vim Junk
.swp
36 changes: 31 additions & 5 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"version": "0.2.0",
"configurations": [

{
"type": "PowerShell",
"request": "launch",
Expand All @@ -10,6 +9,15 @@
"args": [],
"cwd": "${file}"
},
{
"type": "PowerShell",
"request": "launch",
"name": "PowerShell Launch Current File in Temporary Console",
"script": "${file}",
"args": [],
"cwd": "${file}",
"createTemporaryIntegratedConsole": true
},
{
"type": "PowerShell",
"request": "launch",
Expand All @@ -22,16 +30,34 @@
},
{
"type": "PowerShell",
"request": "attach",
"name": "PowerShell Attach to Host Process",
"processId": "${command:PickPSHostProcess}",
"runspaceId": 1
"request": "launch",
"name": "PowerShell Launch DebugTest.ps1",
"script": "${workspaceRoot}/DebugTest.ps1",
"args": [
"-Count 55 -DelayMilliseconds 250"
],
"cwd": "${workspaceRoot}"
},
{
"type": "PowerShell",
"request": "launch",
"name": "PowerShell Interactive Session",
"cwd": "${workspaceRoot}"
},
{
"type": "PowerShell",
"request": "launch",
"name": "PowerShell Pester Tests",
"script": "Invoke-Pester",
"args": [],
"cwd": "${workspaceRoot}"
},
{
"type": "PowerShell",
"request": "attach",
"name": "PowerShell Attach to Host Process",
"processId": "${command:PickPSHostProcess}",
"runspaceId": 1
}
]
}
Loading

0 comments on commit 1c96c79

Please sign in to comment.