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

Rails 6 #24

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
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
63 changes: 63 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
AllCops:
TargetRubyVersion: 2.5
Exclude:
- ".git/**/*"
- "gemfiles/*"
NewCops: enable

#
# RuboCop built-in settings.
# For documentation on all settings see: https://docs.rubocop.org/en/stable
#

# Turn on auto-correction of equals alignment.
Layout/EndAlignment:
AutoCorrect: true

# Prevent accidental windows line endings
Layout/EndOfLine:
EnforcedStyle: lf

# Use a table layout for hashes
Layout/HashAlignment:
EnforcedHashRocketStyle: table
EnforcedColonStyle: table

# Match existing layout
Layout/SpaceInsideHashLiteralBraces:
EnforcedStyle: no_space

# Support long block lengths for tests
Metrics/BlockLength:
Exclude:
- "test/**/*"

# Initialization Vector abbreviation
Naming/MethodParameterName:
AllowedNames: ['iv', '_', 'io', 'ap']

# Does not allow Symbols to load
Security/YAMLLoad:
AutoCorrect: false

# Needed for testing DateTime
Style/DateTime:
Exclude: ["test/**/*"]

Style/Documentation:
Enabled: false

# One line methods
Style/EmptyMethod:
EnforcedStyle: expanded

Style/NumericPredicate:
AutoCorrect: true

# Since English may not be loaded, cannot force its use.
Style/SpecialGlobalVars:
Enabled: false

# Match Rails
Style/StringLiterals:
EnforcedStyle: double_quotes
49 changes: 28 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,44 @@ matrix:
rvm: 2.4.7
gemfile: gemfiles/rails_5.2.gemfile

- name: "Rails 5.0 on Ruby 2.5.6"
rvm: 2.5.6
- name: "Rails 5.0 on Ruby 2.5.8"
rvm: 2.5.8
gemfile: gemfiles/rails_5.0.gemfile
- name: "Rails 5.1 on Ruby 2.5.6"
rvm: 2.5.6
- name: "Rails 5.1 on Ruby 2.5.8"
rvm: 2.5.8
gemfile: gemfiles/rails_5.1.gemfile
- name: "Rails 5.2 on Ruby 2.5.6"
rvm: 2.5.6
- name: "Rails 5.2 on Ruby 2.5.8"
rvm: 2.5.8
gemfile: gemfiles/rails_5.2.gemfile

- name: "Rails 5.2 on Ruby 2.6.3"
rvm: 2.6.3
- name: "Rails 5.2 on Ruby 2.6.6"
rvm: 2.6.6
gemfile: gemfiles/rails_5.2.gemfile

- name: "Rails 5.2 on JRuby 9.2.8.0"
rvm: jruby-9.2.8.0
gemfile: gemfiles/rails_5.2.gemfile
- name: "Rails 6.0 on Ruby 2.5.8"
rvm: 2.5.8
gemfile: gemfiles/rails_6.0.gemfile
- name: "Rails 6.0 on JRuby 9.2.14.0"
rvm: jruby-9.2.14.0
gemfile: gemfiles/rails_6.0.gemfile

- name: "Rails 6.1 on Ruby 2.6.6"
rvm: 2.6.6
gemfile: gemfiles/rails_6.1.gemfile
- name: "Rails 6.1 on Ruby 2.7.2"
rvm: 2.7.2
gemfile: gemfiles/rails_6.1.gemfile
- name: "Rails 6.1 on Ruby 3.0.0"
rvm: 3.0.0
gemfile: gemfiles/rails_6.1.gemfile
- name: "Rails 6.1 on JRuby 9.2.14.0"
rvm: jruby-9.2.14.0
gemfile: gemfiles/rails_6.1.gemfile

allow_failures:
- rvm: jruby-9.2.8.0
- rvm: jruby-9.2.14.0

jdk:
- openjdk10

# Gitter integration
notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/4d6749e48eb60321640e
on_success: change # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: never # options: [always|never|change] default: always

sudo: false
31 changes: 22 additions & 9 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
appraise 'rails_4.2' do
gem 'activerecord', '~> 4.2.0'
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.0', platform: :jruby
# frozen_string_literal: true

appraise "rails_4.2" do
gem "activerecord", "~> 4.2.0"
gem "activerecord-jdbcsqlite3-adapter", "~> 1.0", platform: :jruby
gem "sqlite3", "~> 1.3.6", platform: :ruby
end

appraise "rails_5.0" do
gem "activerecord", "~> 5.0.0"
gem "activerecord-jdbcsqlite3-adapter", "~> 1.0", platform: :jruby
gem "sqlite3", "~> 1.3.6", platform: :ruby
end

appraise "rails_5.1" do
gem "activerecord", "~> 5.1.0"
end

appraise 'rails_5.0' do
gem 'activerecord', '~> 5.0'
appraise "rails_5.2" do
gem "activerecord", "~> 5.2.3"
end

appraise 'rails_5.1' do
gem 'activerecord', '~> 5.1.0'
appraise "rails_6.0" do
gem "activerecord", "~> 6.0.3"
end

appraise 'rails_5.2' do
gem 'activerecord', '~> 5.2.3'
appraise "rails_6.1" do
gem "activerecord", "~> 6.1.0"
end
22 changes: 12 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
source 'https://rubygems.org'
# frozen_string_literal: true

gemspec
source "https://rubygems.org"

gem 'rake'
gem 'minitest'
gem 'awesome_print'
gemspec

gem 'sqlite3', '~> 1.3.0', platform: :ruby
gem 'jdbc-sqlite3', platform: :jruby
gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
gem 'appraisal'
gem "amazing_print"
gem "minitest"
gem "rake"

gem 'activerecord', '~> 5.2.0'
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
gem "appraisal"
gem "jdbc-sqlite3", platform: :jruby
gem "sqlite3", platform: :ruby

# gem "activerecord", "~> 5.2.0"
gem "activerecord", "~> 6.1"
Loading