Skip to content

Commit

Permalink
Merge branch 'main' into Update-dry-core-dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
pnomolos committed Dec 30, 2022
2 parents c09a8c9 + 5738613 commit 461af43
Show file tree
Hide file tree
Showing 31 changed files with 354 additions and 220 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:
fail-fast: false
matrix:
ruby:
- "3.2"
- "3.1"
- "3.0"
- "2.7"
include:
- ruby: "3.1"
- ruby: "3.2"
coverage: "true"
env:
COVERAGE: ${{matrix.coverage}}
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.0
- name: Install dependencies
run: gem install ossy --no-document
- name: Trigger release workflow
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docsite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
- run: |
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
- name: Set up Ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7.x"
ruby-version: "3.0.5"
- name: Set up git user
run: |
git config --local user.email "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
Gemfile
Rakefile
- name: Check ${{ matrix.type }}
uses: action-hero/actions/rubocop@main
uses: repobot-app/actions/rubocop@main
if: ${{ env.GIT_DIFF != '' }}
with:
diff: ${{ env.GIT_DIFF }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
git config --local user.email "[email protected]"
git config --local user.name "dry-bot"
- name: Set up Ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7"
ruby-version: "3.1"
- name: Install dependencies
run: gem install ossy --no-document
- name: Update changelog.yml from commit
Expand Down
13 changes: 8 additions & 5 deletions .action_hero.yml → .repobot.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
###########################################################
# DO NOT EDIT THIS FILE
#
# This is a config synced from dry-rb/template-gem repo
###########################################################

sources:
- repo: dry-rb/template-gem
sync:
- ".action_hero.yml.erb"
- ".repobot.yml.erb"
- ".devtools/templates/*.sync:${{dir}}/${{name}}"
- ".github/**/*.*"
- ".rspec"
- ".rubocop.yml"
- "gemspec.erb:dry-matcher.gemspec"
- "spec/support/*"
- "CODE_OF_CONDUCT.md"
- "CONTRIBUTING.md"
- "CODEOWNERS"
- "LICENSE.erb"
- "README.md.erb"
- "Gemfile.devtools"
- ".rspec"
- ".rubocop.yml"
- repo: action-hero/workflows
- repo: repobot-app/workflows
sync:
- ".github/workflows/*.yml"
7 changes: 5 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This is a config synced from dry-rb/template-gem repo

AllCops:
TargetRubyVersion: 2.7
NewCops: enable
TargetRubyVersion: 3.0
NewCops: disable
Exclude:
- benchmarks/*.rb
- spec/support/coverage.rb
Expand Down Expand Up @@ -155,6 +155,9 @@ Style/LambdaCall:
Style/ParallelAssignment:
Enabled: false

Style/RaiseArgs:
Enabled: false

Style/StabbyLambdaParentheses:
Enabled: false

Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->

## 0.10.0 2022-11-16


### Added

- MaybeMatcher for matching against Maybe values from dry-monads (@gabfssilva) in #33

### Changed

- This version is compatible with recently released dry-rb dependencies (@flash-gordon)

[Compare v0.9.0...v0.10.0](https://github.com/dry-rb/dry-matcher/compare/v0.9.0...v0.10.0)

## 0.9.0 2021-03-05


Expand Down
1 change: 0 additions & 1 deletion CODEOWNERS

This file was deleted.

133 changes: 126 additions & 7 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,132 @@
# Contributor Code of Conduct
# Contributor Covenant Code of Conduct

As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
## Our Pledge

We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.

Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
## Our Standards

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
Examples of behavior that contributes to a positive environment for our
community include:

This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.4.0, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct)
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall
community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or advances of
any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email address,
without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
team at dry-rb.org.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series of
actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or permanent
ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the
community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.1, available at
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].

Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].

For answers to common questions about this code of conduct, see the FAQ at
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
[https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ eval_gemfile "Gemfile.devtools"
gemspec

group :test do
gem "dry-monads", "~> 1.2.0"
gem "dry-monads", "~> 1.6"
gem "rspec", "~> 3.8"
end

group :tools do
gem "yard"
gem "byebug", platform: :mri
gem "pry"
end
3 changes: 2 additions & 1 deletion Gemfile.devtools
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ group :test do
end

group :tools do
gem "rubocop", "~> 1.38.0"
gem "rubocop", "~> 1.40.0"
gem "byebug"
end
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2021 dry-rb team
Copyright (c) 2015-2022 dry-rb team

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
16 changes: 4 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
<!--- this file is synced from dry-rb/template-gem project -->
[gem]: https://rubygems.org/gems/dry-matcher
[actions]: https://github.com/dry-rb/dry-matcher/actions
[codacy]: https://www.codacy.com/gh/dry-rb/dry-matcher
[chat]: https://dry-rb.zulipchat.com
[inchpages]: http://inch-ci.org/github/dry-rb/dry-matcher

# dry-matcher [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]

[![Gem Version](https://badge.fury.io/rb/dry-matcher.svg)][gem]
[![CI Status](https://github.com/dry-rb/dry-matcher/workflows/ci/badge.svg)][actions]
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f09a7d1745fd430d829a1f825357db88)][codacy]
[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/f09a7d1745fd430d829a1f825357db88)][codacy]
[![Inline docs](http://inch-ci.org/github/dry-rb/dry-matcher.svg?branch=main)][inchpages]
# dry-matcher [![Gem Version](https://badge.fury.io/rb/dry-matcher.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-matcher/workflows/ci/badge.svg)][actions]

## Links

* [User documentation](https://dry-rb.org/gems/dry-matcher)
* [API documentation](http://rubydoc.info/gems/dry-matcher)
* [Forum](https://discourse.dry-rb.org)

## Supported Ruby versions

This library officially supports the following Ruby versions:

* MRI `>= 2.7.0`
* jruby `>= 9.3` (postponed until 2.7 is supported)
* MRI `>= 3.0.0`
* jruby `>= 9.4` (not tested on CI)

## License

Expand Down
6 changes: 3 additions & 3 deletions bin/console
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

require 'bundler/setup'
require 'dry-matcher'
require "bundler/setup"
require "dry-matcher"

# You can add fixtures and/or initialization code here to make experimenting
# with your gem easier. You can also use a different console, if you like.

# (If you use this, don't forget to add pry to your Gemfile!)
require 'pry'
require "pry"

binding.pry
Loading

0 comments on commit 461af43

Please sign in to comment.