Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate 2.7 #266

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ARG VARIANT="2.7-buster"
ARG VARIANT="3.0-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"build": {
"dockerfile": "Dockerfile",
"args": { "VARIANT": "2.7-buster" }
"args": { "VARIANT": "3.0-bullseye" }
},
"extensions": [
"EditorConfig.EditorConfig",
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@ jobs:
- macos-latest
- windows-latest
ruby-version:
- '2.7'
- '3.0'
- '3.1'
exclude:
# TODO: Figure out why Windows breaks on these
- os: windows-latest
ruby-version: '2.7'
- os: windows-latest
ruby-version: '3.0'

Expand Down Expand Up @@ -53,7 +50,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3.0'
bundler-cache: true

- name: Check Style
Expand All @@ -68,7 +65,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3.0'
bundler-cache: true

- name: Check Docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3.0'
bundler-cache: true
- name: Build Docs
run: bundle exec yardoc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3.0'
- run: bundle install
- name: Set Up Credentials
env:
Expand Down
2 changes: 1 addition & 1 deletion bin/rake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby2.7
#!/usr/bin/env ruby
# frozen_string_literal: true

#
Expand Down
2 changes: 1 addition & 1 deletion bin/rspec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env ruby2.7
#!/usr/bin/env ruby
# frozen_string_literal: true

#
Expand Down
4 changes: 2 additions & 2 deletions lib/repofetch/github.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class Repofetch
class Github < Repofetch::Plugin
include ActionView::Helpers::NumberHelper

HTTP_REMOTE_REGEX = %r{https?://github\.com/(?<owner>[\w.-]+)/(?<repository>[\w.-]+)}.freeze
SSH_REMOTE_REGEX = %r{git@github\.com:(?<owner>[\w.-]+)/(?<repository>[\w.-]+)}.freeze
HTTP_REMOTE_REGEX = %r{https?://github\.com/(?<owner>[\w.-]+)/(?<repository>[\w.-]+)}
SSH_REMOTE_REGEX = %r{git@github\.com:(?<owner>[\w.-]+)/(?<repository>[\w.-]+)}
ASCII = File.read(File.expand_path('github/ASCII', __dir__))

attr_reader :owner, :repository
Expand Down
4 changes: 2 additions & 2 deletions lib/repofetch/gitlab.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
class Repofetch
# Adds support for GitLab repositories.
class Gitlab < Repofetch::Plugin
HTTP_REMOTE_REGEX = %r{https?://gitlab\.com/(?<path>[\w.-][\w.\-/]+)}.freeze
SSH_REMOTE_REGEX = %r{git@gitlab\.com:(?<path>[\w.-][\w.\-/]+)}.freeze
HTTP_REMOTE_REGEX = %r{https?://gitlab\.com/(?<path>[\w.-][\w.\-/]+)}
SSH_REMOTE_REGEX = %r{git@gitlab\.com:(?<path>[\w.-][\w.\-/]+)}
ASCII = File.read(File.expand_path('gitlab/ASCII', __dir__))

attr_reader :repo_identifier
Expand Down
2 changes: 1 addition & 1 deletion repofetch.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://github.com/spenserblack/repofetch'
spec.license = 'MIT'

spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')

spec.files = Dir['lib/**/*'] + Dir['exe/*'] + Dir['[A-Z]*']

Expand Down