Skip to content

Commit

Permalink
Dropped support for Ruby <2.7. (#24)
Browse files Browse the repository at this point in the history
Signed-off-by: Hermann Mayer <hermann.mayer92@gmail.com>
  • Loading branch information
Jack12816 authored Jul 8, 2024
1 parent 7fd6cdd commit f204854
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
- name: Install the correct Ruby version
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.5
ruby-version: 2.7
bundler-cache: true
rubygems: '3.3.26'
rubygems: '3.4.22'

- name: Prepare the virtual environment
uses: hausgold/actions/ci@master
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install Ruby 2.5
- name: Install Ruby 2.7
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.5
ruby-version: 2.7
bundler-cache: true
rubygems: '3.3.26'
rubygems: '3.4.22'

- name: Prepare the virtual environment
uses: hausgold/actions/ci@master
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['2.5', '2.7']
ruby: ['2.7']
steps:
- uses: actions/checkout@v4

Expand All @@ -27,7 +27,7 @@ jobs:
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
rubygems: '3.3.26'
rubygems: '3.4.22'

- name: Prepare the virtual environment
uses: hausgold/actions/ci@master
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
/pkg/
/spec/reports/
/tmp/
/log/
/vendor/
/gemfiles/vendor/
/Gemfile.lock
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AllCops:
NewCops: enable
SuggestExtensions: false
DisplayCopNames: true
TargetRubyVersion: 2.5
TargetRubyVersion: 2.7
TargetRailsVersion: 5.2
Exclude:
- bin/**/*
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Moved the development dependencies from the gemspec to the Gemfile (#19)
* Introduce `after_response` callback (#22)
* Fix response parsing for responses exceeding the page size (#23)
* Dropped support for Ruby <2.7 (#24)

### 1.1.0

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM hausgold/ruby:2.5
FROM hausgold/ruby:2.7
MAINTAINER Hermann Mayer <hermann.mayer@hausgold.de>

# Update system gem
RUN gem update --system '3.3.26'
RUN gem update --system '3.4.22'

# Install system packages and the latest bundler
RUN apt-get update -yqqq && \
Expand All @@ -11,7 +11,7 @@ RUN apt-get update -yqqq && \
ca-certificates \
bash-completion inotify-tools && \
echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && /usr/sbin/locale-gen && \
gem install bundler -v '~> 2.3.0' --no-document --no-prerelease
gem install bundler -v '~> 2.4.22' --no-document --no-prerelease

# Add new web user
RUN mkdir /app && \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ test-style: \
test-style-ruby:
# Run the static code analyzer (rubocop)
@$(call run-shell,$(BUNDLE) exec $(RUBOCOP) -a \
|| ($(TEST) $$($(RUBY_VERSION)) != '2.5' && true))
|| ($(TEST) $$($(RUBY_VERSION)) != '2.7' && true))

clean:
# Clean the dependencies
Expand Down
2 changes: 1 addition & 1 deletion billomat.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']

spec.required_ruby_version = '>= 2.5'
spec.required_ruby_version = '>= 2.7'

spec.add_runtime_dependency 'rest-client', '~> 2.1'
end
4 changes: 3 additions & 1 deletion config/docker/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ sudo sed -i 's/autostart=.*/autostart=false/g' /etc/supervisor/conf.d/*
sudo supervisord >/dev/null 2>&1 &

# Wait for supervisord
while ! supervisorctl status >/dev/null 2>&1; do sleep 1; done
while ! (sudo supervisorctl status | grep avahi) >/dev/null 2>&1; do
sleep 1
done

# Boot the mDNS stack
echo '# Start the mDNS stack'
Expand Down
3 changes: 2 additions & 1 deletion spec/billomat/configuration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
end

it 'raises an error when assigned a non proc' do
expect { configuration.after_response = :foo }.to raise_error(ArgumentError)
expect { configuration.after_response = :foo }.to \
raise_error(ArgumentError)
end
end
end
2 changes: 1 addition & 1 deletion spec/billomat/gateway_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

context 'without a body' do
it 'only returns the original error message' do
expect(error.to_s).to be_eql('RestClient::Exception')
expect(error.to_s).to eql('RestClient::Exception')
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/billomat/models/base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
end

it 'allows to access the data easily (#id)' do
expect(base.id).to be_eql(123)
expect(base.id).to be(123)
end

it 'allows to access the data easily (#foo)' do
expect(base.foo).to be_eql('bar')
expect(base.foo).to eql('bar')
end
end

Expand Down

0 comments on commit f204854

Please sign in to comment.