Skip to content

Commit

Permalink
Merge c4437b0 into 6dca1c2
Browse files Browse the repository at this point in the history
  • Loading branch information
lbeder committed Apr 16, 2020
2 parents 6dca1c2 + c4437b0 commit 0771f75
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 27 deletions.
29 changes: 25 additions & 4 deletions .rubocop.yml
Expand Up @@ -25,21 +25,24 @@ Style/SignalException:
Style/RaiseArgs:
Enabled: false

Layout/AlignParameters:
Layout/ParameterAlignment:
EnforcedStyle: with_fixed_indentation

Layout/AlignHash:
Layout/HashAlignment:
Enabled: false

Layout/AlignArray:
Layout/ArrayAlignment:
Enabled: false

Layout/MultilineOperationIndentation:
EnforcedStyle: indented

Layout/IndentFirstHashElement:
Layout/FirstHashElementIndentation:
EnforcedStyle: consistent

Layout/SpaceAroundMethodCallOperator:
Enabled: true

Style/Documentation:
Enabled: false

Expand All @@ -50,6 +53,24 @@ Style/BlockDelimiters:
Style/ModuleFunction:
Enabled: false

Style/ExponentialNotation:
Enabled: true

Style/HashEachMethods:
Enabled: true

Style/HashTransformKeys:
Enabled: true

Style/HashTransformValues:
Enabled: true

Lint/RescueException:
Exclude:
- 'lib/health_monitor/providers/**/*'

Lint/RaiseException:
Enabled: true

Lint/StructNewOverride:
Enabled: true
15 changes: 3 additions & 12 deletions .travis.yml
@@ -1,9 +1,8 @@
language: ruby
rvm:
- 2.3.8
- 2.4.5
- 2.5.3
- 2.6.2
- 2.5.8
- 2.6.6
- 2.7.0
- ruby-head
gemfile:
- gemfiles/rails_5.0.gemfile
Expand All @@ -12,16 +11,8 @@ gemfile:
- gemfiles/rails_6.0.gemfile
matrix:
exclude:
- rvm: 2.3.8
gemfile: gemfiles/rails_6.0.gemfile
- rvm: 2.4.5
gemfile: gemfiles/rails_6.0.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails_5.0.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails_5.1.gemfile
- rvm: ruby-head
gemfile: gemfiles/rails_5.2.gemfile
script:
- bundle exec rake rubocop
- bundle exec rspec
8 changes: 4 additions & 4 deletions Appraisals
@@ -1,17 +1,17 @@
# frozen_string_literal: true

appraise 'rails-5.0' do
gem 'rails', '~> 5.0.7.1'
gem 'rails', '~> 5.0.7.2'
end

appraise 'rails-5.1' do
gem 'rails', '~> 5.1.6.1'
gem 'rails', '~> 5.1.6.2'
end

appraise 'rails-5.2' do
gem 'rails', '~> 5.2.2'
gem 'rails', '~> 5.2.4.2'
end

appraise 'rails-6.0' do
gem 'rails', '~> 6.0.0'
gem 'rails', '~> 6.0.2.2'
end
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog

## 8.9.0 (2020-04-16)

- Deprecate Ruby 2.4.0 and update dependencies and style.

## 8.8.0 (2019-11-12)

- Replace dependency for rails with railties (thanks to @sliiser).
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.0.gemfile
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'railties', '~> 5.0.7.1'
gem 'rails', '~> 5.0.7.2'
gem 'sqlite3', '~> 1.3.6'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_5.1.gemfile
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'railties', '~> 5.1.6.1'
gem 'rails', '~> 5.1.6.2'
gem 'sqlite3', '~> 1.3.6'

gemspec path: '../'
3 changes: 2 additions & 1 deletion gemfiles/rails_5.2.gemfile
Expand Up @@ -4,6 +4,7 @@

source 'https://rubygems.org'

gem 'railties', '~> 5.2.2'
gem 'rails', '~> 5.2.4.2'
gem 'sqlite3', '~> 1.4'

gemspec path: '../'
3 changes: 2 additions & 1 deletion gemfiles/rails_6.0.gemfile
Expand Up @@ -4,6 +4,7 @@

source 'https://rubygems.org'

gem 'railties', '~> 6.0.0'
gem 'rails', '~> 6.0.2.2'
gem 'sqlite3', '~> 1.4'

gemspec path: '../'
2 changes: 1 addition & 1 deletion lib/health_monitor/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module HealthMonitor
VERSION = '8.8.0'
VERSION = '8.9.0'
end
3 changes: 3 additions & 0 deletions spec/dummy/app/assets/config/manifest.js
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
4 changes: 2 additions & 2 deletions spec/spec_helper.rb
Expand Up @@ -16,8 +16,8 @@
require 'pry'
require 'rediska'

Dir[File.expand_path('../lib/**/*.rb', __dir__)].each { |f| require f }
Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }
Dir[File.expand_path('../lib/**/*.rb', __dir__)].sort.each { |f| require f }
Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f }

RSpec.configure do |config|
config.mock_with :rspec
Expand Down
1 change: 1 addition & 0 deletions spec/support/providers.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true

require 'spec_helper'
require 'rspec/mocks'

module Providers
include RSpec::Mocks::ExampleMethods
Expand Down

0 comments on commit 0771f75

Please sign in to comment.