Skip to content

Commit

Permalink
Rename master to main #1507
Browse files Browse the repository at this point in the history
  • Loading branch information
mattwynne committed May 20, 2021
1 parent bf62542 commit b94ce62
Show file tree
Hide file tree
Showing 25 changed files with 172 additions and 177 deletions.
197 changes: 97 additions & 100 deletions .circleci/config.yml

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ As a member of the community, you are also encouraged to help others act accordi

## Guiding principles

* **We are welcoming**. We believe that a diverse community is stronger, more vibrant and has more potential contributors and more sources for ideas. We aim for more diversity. We strive to welcome people of all backgrounds, identities, and levels of experience. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
* **We are kind**. We are warm, courteous, patient, respectful and encouraging. Disagreements, both social and technical, happen all the time and Cucumber is no exception. These differences are where we can learn the most — if everyone thought the same all the time life would be boring! We’re respectful of other people’s opinions, experience, their skills, their commitments and their efforts. We make an effort to be compassionate towards one another, to assume good intention of others, and to seek to understand first before seeking to be understood.
* **We are tolerant**. A diverse group of people has a diverse set of boundaries about what is OK. Sometimes one of us may make a mistake, and do something that inadvertently causes offence. When we observe this happen, we try to give the offender feedback quickly, clearly and constructively. We try to offer them the opportunity to maintain their dignity in the situation, to learn from and rectify their mistake.
* **We do not tolerate unpleasant behaviour**. If someone repeatedly or deliberately acts in an offensive way, we will take decisive action to prevent any further harm.
- **We are welcoming**. We believe that a diverse community is stronger, more vibrant and has more potential contributors and more sources for ideas. We aim for more diversity. We strive to welcome people of all backgrounds, identities, and levels of experience. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
- **We are kind**. We are warm, courteous, patient, respectful and encouraging. Disagreements, both social and technical, happen all the time and Cucumber is no exception. These differences are where we can learn the most — if everyone thought the same all the time life would be boring! We’re respectful of other people’s opinions, experience, their skills, their commitments and their efforts. We make an effort to be compassionate towards one another, to assume good intention of others, and to seek to understand first before seeking to be understood.
- **We are tolerant**. A diverse group of people has a diverse set of boundaries about what is OK. Sometimes one of us may make a mistake, and do something that inadvertently causes offence. When we observe this happen, we try to give the offender feedback quickly, clearly and constructively. We try to offer them the opportunity to maintain their dignity in the situation, to learn from and rectify their mistake.
- **We do not tolerate unpleasant behaviour**. If someone repeatedly or deliberately acts in an offensive way, we will take decisive action to prevent any further harm.

## What is not OK

This isn’t an exhaustive list of things that you can’t do. Rather, take it in the spirit in which it’s intended - a guide to make all of our daily interactions more straightforward and enriching.

* Aggressive behaviour, whether in words or actions, whether overt or passive, is not OK.
* In other words: don’t be mean, rude, demeaning, condescending or demanding.
* Don’t discriminate against anyone.
* Don’t shame people for their mistakes or inexperience.
* Don’t harass people, sexually or otherwise. If someone has asked you to stop doing whatever you're doing - or if you notice they don't like what you're doing - stop and apologize, even if it seems unreasonable to you. Then remember, they are not under any obligation to accept your apology or interact with you in the future. Harassment includes comments or questions related to personal attributes such as (but not limited to) age, body size, culture, ethnicity, gender expression, gender identity, level of experience, nationality, personal ability or disability, physical appearance, physical or mental difference, race, religion, set of skills, sexual orientation, socio-economic status, and subculture. Harassment also includes sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, inappropriate physical contact, and unwelcome sexual attention.
* On GitHub, Gitter, Slack and other online or offline communications channels, don't use sexual/racially offensive nicknames or avatars, or other nicknames/avatars that might detract from a friendly, safe and welcoming environment for all.
* Respect that some individuals and cultures consider the casual use of profanity offensive and off-putting.
* Don’t dismiss people who react negatively to someone’s behaviour, especially your own. If someone reacts to something differently than you do, it might not be that they are overreacting. Instead, they might be responding reasonably in the context of their life experiences. Please do your best to anticipate what those sensitivities might be and respond accordingly.
* Unwelcome / non-consensual sexual advances are not okay.
* Derailing, tone arguments and otherwise playing on people’s desires to be nice are not welcome.
* When critiquing other people’s work or ideas, avoid ad hominem or personal attacks.
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
* Sponsors of Cucumber events are also subject to this Code of Conduct. In particular, sponsors are required to not use sexualized images, activities, or other material which is in violation of this Code of Conduct.
- Aggressive behaviour, whether in words or actions, whether overt or passive, is not OK.
- In other words: don’t be mean, rude, demeaning, condescending or demanding.
- Don’t discriminate against anyone.
- Don’t shame people for their mistakes or inexperience.
- Don’t harass people, sexually or otherwise. If someone has asked you to stop doing whatever you're doing - or if you notice they don't like what you're doing - stop and apologize, even if it seems unreasonable to you. Then remember, they are not under any obligation to accept your apology or interact with you in the future. Harassment includes comments or questions related to personal attributes such as (but not limited to) age, body size, culture, ethnicity, gender expression, gender identity, level of experience, nationality, personal ability or disability, physical appearance, physical or mental difference, race, religion, set of skills, sexual orientation, socio-economic status, and subculture. Harassment also includes sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, inappropriate physical contact, and unwelcome sexual attention.
- On GitHub, Gitter, Slack and other online or offline communications channels, don't use sexual/racially offensive nicknames or avatars, or other nicknames/avatars that might detract from a friendly, safe and welcoming environment for all.
- Respect that some individuals and cultures consider the casual use of profanity offensive and off-putting.
- Don’t dismiss people who react negatively to someone’s behaviour, especially your own. If someone reacts to something differently than you do, it might not be that they are overreacting. Instead, they might be responding reasonably in the context of their life experiences. Please do your best to anticipate what those sensitivities might be and respond accordingly.
- Unwelcome / non-consensual sexual advances are not okay.
- Derailing, tone arguments and otherwise playing on people’s desires to be nice are not welcome.
- When critiquing other people’s work or ideas, avoid ad hominem or personal attacks.
- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
- Sponsors of Cucumber events are also subject to this Code of Conduct. In particular, sponsors are required to not use sexualized images, activities, or other material which is in violation of this Code of Conduct.

## Who do these rules apply to?

Expand All @@ -57,19 +57,19 @@ If you have any questions or feedback on this Code of Conduct, [we’re happy to

The current moderators of the Cucumber community are:

* Matt Wynne
* Aslak Hellesøy
* Tracey S. Rosenberg
* Jo Laing
- Matt Wynne
- Aslak Hellesøy
- Tracey S. Rosenberg
- Jo Laing

You can contact us by email at [mods@cucumber.io](mailto:mods@cucumber.io).

## References / inspiration

We’re grateful to these references for providing us with ideas and inspiration for this document:

* http://adainitiative.org/2014/02/18/howto-design-a-code-of-conduct-for-your-community/
* https://www.rust-lang.org/conduct.html
* https://www.djangoproject.com/conduct/
* http://hood.ie/code-of-conduct/
* https://github.com/Homebrew/homebrew/blob/master/CODEOFCONDUCT.md
- http://adainitiative.org/2014/02/18/howto-design-a-code-of-conduct-for-your-community/
- https://www.rust-lang.org/conduct.html
- https://www.djangoproject.com/conduct/
- http://hood.ie/code-of-conduct/
- https://github.com/Homebrew/.github/blob/master/CODE_OF_CONDUCT.md
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[![CircleCI](https://circleci.com/gh/cucumber/common.svg?style=svg)](https://circleci.com/gh/cucumber/common)
[![OpenCollective](https://opencollective.com/cucumber/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/cucumber/sponsors/badge.svg)](#sponsors)
[![pull requests](https://www.oselvar.com/api/badge?label=pull+requests&csvUrl=https%3A%2F%2Fraw.githubusercontent.com%2Fcucumber%2Foselvar-github-metrics%2Fmain%2Fdata%2Fcucumber%2Fcommon%2FpullRequests.csv)](https://www.oselvar.com/github/cucumber/oselvar-github-metrics/main/cucumber/common "3rd quartile cycle time")
[![issues](https://www.oselvar.com/api/badge?label=issues&csvUrl=https%3A%2F%2Fraw.githubusercontent.com%2Fcucumber%2Foselvar-github-metrics%2Fmain%2Fdata%2Fcucumber%2Fcommon%2Fissues.csv)](https://www.oselvar.com/github/cucumber/oselvar-github-metrics/main/cucumber/common "3rd quartile cycle time")
[![pull requests](https://www.oselvar.com/api/badge?label=pull+requests&csvUrl=https%3A%2F%2Fraw.githubusercontent.com%2Fcucumber%2Foselvar-github-metrics%2Fmain%2Fdata%2Fcucumber%2Fcommon%2FpullRequests.csv)](https://www.oselvar.com/github/cucumber/oselvar-github-metrics/main/cucumber/common '3rd quartile cycle time')
[![issues](https://www.oselvar.com/api/badge?label=issues&csvUrl=https%3A%2F%2Fraw.githubusercontent.com%2Fcucumber%2Foselvar-github-metrics%2Fmain%2Fdata%2Fcucumber%2Fcommon%2Fissues.csv)](https://www.oselvar.com/github/cucumber/oselvar-github-metrics/main/cucumber/common '3rd quartile cycle time')

# Cucumber Common Components

This repo contains the libraries/modules for behaviour that's common between the various Cucumber implementations. These include:

* [parsing Gherkin documents](https://github.com/cucumber/common/tree/master/gherkin) into a machine-readable object model.
* [parsing Tag expressions](https://github.com/cucumber/common/tree/master/tag-expressions) passed as arguments when running Cucumber to filter which scenarios are run.
* [parsing Cucumber expressions](https://github.com/cucumber/common/tree/master/cucumber-expressions) used to map step definition functions to Gherkin steps
* [formatting HTML output](https://github.com/cucumber/common/tree/master/html-formatter)
- [parsing Gherkin documents](https://github.com/cucumber/common/tree/main/gherkin) into a machine-readable object model.
- [parsing Tag expressions](https://github.com/cucumber/common/tree/main/tag-expressions) passed as arguments when running Cucumber to filter which scenarios are run.
- [parsing Cucumber expressions](https://github.com/cucumber/common/tree/main/cucumber-expressions) used to map step definition functions to Gherkin steps
- [formatting HTML output](https://github.com/cucumber/common/tree/main/html-formatter)

Most of these modules have implemnentations in multiple langages, and use shared test suites to ensure behaviour is consistent. See the [contributing guide](https://github.com/cucumber/common/blob/master/CONTRIBUTING.md) for more details.

Expand Down
4 changes: 2 additions & 2 deletions create-meta/ruby/cucumber-create-meta.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Gem::Specification.new do |s|

s.metadata = {
'bug_tracker_uri' => 'https://github.com/cucumber/cucumber/issues',
'changelog_uri' => 'https://github.com/cucumber/cucumber/blob/master/gherkin/CHANGELOG.md',
'changelog_uri' => 'https://github.com/cucumber/common/blob/main/gherkin/CHANGELOG.md',
'documentation_uri' => 'https://cucumber.io/docs/gherkin/',
'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/cukes',
'source_code_uri' => 'https://github.com/cucumber/cucumber/blob/master/gherkin/ruby',
'source_code_uri' => 'https://github.com/cucumber/common/blob/main/gherkin/ruby',
}

s.add_dependency 'cucumber-messages', '~> 16.0', '>= 16.0.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Gem::Specification.new do |s|

s.metadata = {
'bug_tracker_uri' => 'https://github.com/cucumber/cucumber/issues',
'changelog_uri' => 'https://github.com/cucumber/cucumber/blob/master/cucumber-expressions/CHANGELOG.md',
'changelog_uri' => 'https://github.com/cucumber/common/blob/main/cucumber-expressions/CHANGELOG.md',
'documentation_uri' => 'https://cucumber.io/docs/cucumber/cucumber-expressions/',
'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/cukes',
'source_code_uri' => 'https://github.com/cucumber/cucumber/blob/master/cucumber-expressions/ruby',
'source_code_uri' => 'https://github.com/cucumber/common/blob/main/cucumber-expressions/ruby',
}

s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.3'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* A data table type describes how a data table should be represented as an
* object.
*
* @see <a href="https://github.com/cucumber/cucumber/tree/master/datatable">DataTable - README.md</a>
* @see <a href="https://github.com/cucumber/common/tree/main/datatable">DataTable - README.md</a>
*/
@API(status = API.Status.STABLE)
public final class DataTableType {
Expand Down
4 changes: 2 additions & 2 deletions demo-formatter/ruby/cucumber-demo-formatter.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Gem::Specification.new do |s|

s.metadata = {
'bug_tracker_uri' => 'https://github.com/cucumber/cucumber/issues',
'changelog_uri' => 'https://github.com/cucumber/cucumber/blob/master/cucumber-demo-formatter/CHANGELOG.md',
'changelog_uri' => 'https://github.com/cucumber/common/blob/main/cucumber-demo-formatter/CHANGELOG.md',
'documentation_uri' => 'https://cucumber.io/docs/cucumber/cucumber-demo-formatter/',
'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/cukes',
'source_code_uri' => 'https://github.com/cucumber/cucumber/blob/master/cucumber-demo-formatter/ruby',
'source_code_uri' => 'https://github.com/cucumber/common/blob/main/cucumber-demo-formatter/ruby',
}

s.add_dependency 'cucumber-messages', '~> 16.0', '>= 16.0.0'
Expand Down
2 changes: 1 addition & 1 deletion gherkin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ include default.mk
post-release: print-documentation-instructions

print-documentation-instructions:
@echo -e "\033[0;34m*** Remember to update gherkin documentation. See: https://github.com/cucumber/docs.cucumber.io/tree/master/layouts/shortcodes ***\033[0m"
@echo -e "\033[0;34m*** Remember to update gherkin documentation. See: https://github.com/cucumber/docs/tree/main/layouts/shortcodes ***\033[0m"
.PHONY: print-documentation-instructions
18 changes: 9 additions & 9 deletions gherkin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ pickles = Gherkin::Pickles::Compiler.new(id_generator).compile(gherkin_document,

```javascript
// JavaScript
var Gherkin = require("@cucumber/gherkin")
var Messages = require("@cucumber/messages")
var Gherkin = require('@cucumber/gherkin')
var Messages = require('@cucumber/messages')

var uuidFn = Messages.IdGenerator.uuid();
var builder = new Gherkin.AstBuilder(uuidFn);
var matcher = new Gherkin.GherkinClassicTokenMatcher(); // or Gherkin.GherkinInMarkdownTokenMatcher()
var uuidFn = Messages.IdGenerator.uuid()
var builder = new Gherkin.AstBuilder(uuidFn)
var matcher = new Gherkin.GherkinClassicTokenMatcher() // or Gherkin.GherkinInMarkdownTokenMatcher()

var parser = new Gherkin.Parser(builder, matcher);
var gherkinDocument = parser.parse("Feature: ...");
var parser = new Gherkin.Parser(builder, matcher)
var gherkinDocument = parser.parse('Feature: ...')
var pickles = Gherkin.compile(gherkinDocument, 'uri_of_the_feature.feature', uuidFn)
```

Expand Down Expand Up @@ -198,7 +198,7 @@ design docs (which might be a little outdated, but mostly OK).

The AST produced by the parser can be described with the following class diagram:

![](https://github.com/cucumber/cucumber/blob/master/gherkin/docs/ast.png)
![](https://github.com/cucumber/common/blob/main/gherkin/docs/ast.png)

Every class represents a node in the AST. Every node has a `Location` that describes
the line number and column number in the input file. These numbers are 1-indexed.
Expand All @@ -213,7 +213,7 @@ Each node in the JSON representation also has a `type` property with the name
of the node type.

You can see some examples in the
[testdata/good](https://github.com/cucumber/cucumber/tree/master/gherkin/testdata/good)
[testdata/good](https://github.com/cucumber/common/tree/main/gherkin/testdata/good)
directory.

### Pickles
Expand Down
7 changes: 3 additions & 4 deletions gherkin/dotnet/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ to contribute.
### MacOS/Linux

Install [.NET 5](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.7-download.md)

Just run `make` from this directory.

### Windows
Expand All @@ -21,7 +21,7 @@ For a complete verification, run the `make` command as well (or let the PR build

## Make a release

The 'make' command is now prepared to make NuGet package releases as well, ie the `make update-version` command will update the version number in the project file. For the general release procedure, check [CONTRIBUTING](https://github.com/cucumber/cucumber/blob/master/gherkin/CONTRIBUTING.md).
The 'make' command is now prepared to make NuGet package releases as well, ie the `make update-version` command will update the version number in the project file. For the general release procedure, check [CONTRIBUTING](https://github.com/cucumber/common/blob/main/gherkin/CONTRIBUTING.md).

# prepare new version
echo "X.Y.Z" > VERSION
Expand All @@ -32,7 +32,6 @@ The 'make' command is now prepared to make NuGet package releases as well, ie th
# verify and publish
make publish

# push
# push
git push
git push --tags

2 changes: 1 addition & 1 deletion gherkin/dotnet/Gherkin/Gherkin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Copyright>Copyright © Cucumber Ltd, Gaspar Nagy</Copyright>
<Description>Cross-platform parser for the Gherkin language, used by Cucumber, SpecFlow and other Cucumber-based tools to parse feature files.</Description>
<PackageTags>specflow gherkin cucumber</PackageTags>
<PackageProjectUrl>https://github.com/cucumber/common/tree/master/gherkin</PackageProjectUrl>
<PackageProjectUrl>https://github.com/cucumber/common/tree/main/gherkin</PackageProjectUrl>
<RepositoryUrl>https://github.com/cucumber/common</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageIcon>cucumber-mark-green-128.png</PackageIcon>
Expand Down
Loading

1 comment on commit b94ce62

@aslakhellesoy
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this @mattwynne!

Can you please fix your editor? Inadvertent formatting edits in your commits is a recurring thing.

Please sign in to comment.