Skip to content

Commit

Permalink
Merge pull request #42 from doorkeeper-gem/update-travis-ci
Browse files Browse the repository at this point in the history
Add support for Doorkeeper >= 5.2
  • Loading branch information
nbulaj authored Mar 24, 2020
2 parents 26d4304 + febfced commit 1b34df9
Show file tree
Hide file tree
Showing 63 changed files with 908 additions and 1,166 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
log/*.log
pkg/
spec/dummy/db/*.sqlite3
Gemfile.lock
gemfiles/*.lock
.rvmrc
*.swp
Expand All @@ -14,7 +13,6 @@ spec
!spec/support/orm/mongo*
*.gem

/Gemfile
coverage

.idea/
.idea/
12 changes: 3 additions & 9 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
LineLength:
Exclude:
- spec/**/*

StringLiterals:
Enabled: false

TrailingBlankLines:
Enabled: true
rubocop:
config_file: .rubocop.yml
version: 0.75.0
11 changes: 11 additions & 0 deletions .rake_tasks~
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
build
default
install
install:local
load_doorkeeper
release
release:guard_clean
release:rubygem_push
release:source_control_push
spec
update_submodules
55 changes: 55 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
inherit_from: .rubocop_todo.yml
require: rubocop-performance
AllCops:
TargetRubyVersion: 2.4
Exclude:
- "spec/dummy/db/*"
- "spec/dummy/config/*"
- "doorkeepper/**/*"
- "gemfiles/*.gemfile"

Metrics/BlockLength:
Exclude:
- spec/**/*
- doorkeeper-mongodb.gemspec

Metrics/MethodLength:
Exclude:
- spec/dummy/db/**/*

Style/StringLiterals:
EnforcedStyle: double_quotes
Style/StringLiteralsInInterpolation:
EnforcedStyle: double_quotes
Style/FrozenStringLiteralComment:
Enabled: true

Style/TrailingCommaInHashLiteral:
EnforcedStyleForMultiline: consistent_comma
Style/TrailingCommaInArrayLiteral:
EnforcedStyleForMultiline: consistent_comma
Style/TrailingCommaInArguments:
EnforcedStyleForMultiline: consistent_comma

Style/SymbolArray:
MinSize: 3
Style/WordArray:
MinSize: 3

Style/ClassAndModuleChildren:
Enabled: false
Style/NumericPredicate:
Enabled: false
Style/DoubleNegation:
Enabled: false

Layout/MultilineMethodCallIndentation:
EnforcedStyle: indented
Layout/TrailingEmptyLines:
Enabled: true
Layout/DotPosition:
EnforcedStyle: leading
Layout/LineLength:
Exclude:
- spec/**/*
Max: 100
23 changes: 23 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2020-01-29 11:31:56 +0300 using RuboCop version 0.78.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 1
# Configuration parameters: CountComments, ExcludedMethods.
# ExcludedMethods: refine
Metrics/BlockLength:
Max: 58

# Offense count: 2
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 214

# Offense count: 4
# Configuration parameters: CountComments.
Metrics/ModuleLength:
Max: 470
63 changes: 23 additions & 40 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,77 +3,60 @@ sudo: false
cache: bundler

before_install:
# MongoMapper works only with MongoDB <= 3.2.x
- wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.2.18.tgz
- tar xzf mongodb-linux-x86_64-3.2.18.tgz
- ${PWD}/mongodb-linux-x86_64-3.2.18/bin/mongod --version
- mkdir ${PWD}/mongodb-linux-x86_64-3.2.18/data
# Bind on another port in order to test mongo_mapper separately
- ${PWD}/mongodb-linux-x86_64-3.2.18/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-3.2.18/data --logpath ${PWD}/mongodb-linux-x86_64-3.2.18/mongodb.log --fork --port 27027
- gem update --system # Need for Ruby 2.5.0. https://github.com/travis-ci/travis-ci/issues/8978
- gem install bundler -v '~> 1.10'

rvm:
- 2.1
- 2.2
- 2.3
- 2.4
- 2.5
- 2.6
- 2.7

env:
- RAILS=4.2.6
- RAILS=5.0.7
- RAILS=5.1.6
- RAILS=5.2.0
- RAILS=5.0
- RAILS=5.1
- RAILS=5.2
- RAILS=6.0

gemfile:
- gemfiles/Gemfile.mongoid4.rb
- gemfiles/Gemfile.mongoid5.rb
- gemfiles/Gemfile.mongoid6.rb
- gemfiles/Gemfile.mongoid7.rb
- gemfiles/Gemfile.mongo_mapper.rb

services:
- mongodb

matrix:
exclude:
- env: RAILS=5.0.7
rvm: 2.1
- env: RAILS=5.1.6
rvm: 2.1
- env: RAILS=5.2.0
rvm: 2.1
- env: RAILS=6.0
rvm: 2.4

# Mongoid4 requires activemodel ~> 4.0
- gemfile: gemfiles/Gemfile.mongoid4.rb
env: RAILS=5.0.7
env: RAILS=5.0
- gemfile: gemfiles/Gemfile.mongoid4.rb
env: RAILS=5.1.6
env: RAILS=5.1
- gemfile: gemfiles/Gemfile.mongoid4.rb
env: RAILS=5.2.0
env: RAILS=5.2
- gemfile: gemfiles/Gemfile.mongoid4.rb
env: RAILS=6.0

# Mongoid5 requires activemodel ~> 4.0
- gemfile: gemfiles/Gemfile.mongoid5.rb
env: RAILS=5.0.7
env: RAILS=5.0
- gemfile: gemfiles/Gemfile.mongoid5.rb
env: RAILS=5.1
- gemfile: gemfiles/Gemfile.mongoid5.rb
env: RAILS=5.1.6
env: RAILS=5.2
- gemfile: gemfiles/Gemfile.mongoid5.rb
env: RAILS=5.2.0
env: RAILS=6.0

# Mongoid6 requires activemodel ~> 5.0
# Mongoid6 requires activemodel >= 5.1, < 6.0.0
- gemfile: gemfiles/Gemfile.mongoid6.rb
env: RAILS=4.2.6
env: RAILS=5.0
- gemfile: gemfiles/Gemfile.mongoid6.rb
rvm: 2.1
env: RAILS=6.0

# Mongoid7 requires activemodel ~> 5.1
- gemfile: gemfiles/Gemfile.mongoid7.rb
env: RAILS=4.2.6
# Mongoid7 requires activemodel < 6.0.0, >= 5.1
- gemfile: gemfiles/Gemfile.mongoid7.rb
env: RAILS=5.0.7
- gemfile: gemfiles/Gemfile.mongoid7.rb
rvm: 2.1

- gemfile: gemfiles/Gemfile.mongo_mapper.rb
env: RAILS=5.2.0
env: RAILS=5.0
12 changes: 12 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "doorkeeper", path: "./doorkeeper"
gem "mongoid"
gem "rake"
gem "rspec-core", git: "https://github.com/rspec/rspec-core.git"
gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
gem "rspec-rails", "4.0.0.beta3"
gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
122 changes: 122 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
GIT
remote: https://github.com/rspec/rspec-core.git
revision: 002ebcb65324bca7b3ee044e22f4c02133fce14d
specs:
rspec-core (3.10.0.pre)
rspec-support (= 3.10.0.pre)

GIT
remote: https://github.com/rspec/rspec-expectations.git
revision: 9f224eaeb5c6d7eaaab0f7f6e355efd9329328f8
specs:
rspec-expectations (3.10.0.pre)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (= 3.10.0.pre)

GIT
remote: https://github.com/rspec/rspec-mocks.git
revision: 81c17e89b2722cb225d602e08b600e4a4f6148a4
specs:
rspec-mocks (3.10.0.pre)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (= 3.10.0.pre)

GIT
remote: https://github.com/rspec/rspec-support.git
revision: 63c03e5e6f0ac858398933f820d37087f57c315a
specs:
rspec-support (3.10.0.pre)

PATH
remote: doorkeeper
specs:
doorkeeper (5.3.0)
railties (>= 5)

GEM
remote: https://rubygems.org/
specs:
actionpack (5.2.4.2)
actionview (= 5.2.4.2)
activesupport (= 5.2.4.2)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.2)
activesupport (= 5.2.4.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (5.2.4.2)
activesupport (= 5.2.4.2)
activesupport (5.2.4.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
bson (4.8.2)
builder (3.2.4)
concurrent-ruby (1.1.6)
crass (1.0.6)
diff-lcs (1.3)
erubi (1.9.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (1.0.0)
mini_portile2 (2.4.0)
minitest (5.14.0)
mongo (2.11.4)
bson (>= 4.4.2, < 5.0.0)
mongoid (6.4.4)
activemodel (>= 5.1, < 6.0.0)
mongo (>= 2.5.1, < 3.0.0)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
rack (2.2.2)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.4.2)
actionpack (= 5.2.4.2)
activesupport (= 5.2.4.2)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.1)
rspec-rails (4.0.0.beta3)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
rspec-core (~> 3.8)
rspec-expectations (~> 3.8)
rspec-mocks (~> 3.8)
rspec-support (~> 3.8)
thor (1.0.1)
thread_safe (0.3.6)
tzinfo (1.2.6)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
doorkeeper!
mongoid
rake
rspec-core!
rspec-expectations!
rspec-mocks!
rspec-rails (= 4.0.0.beta3)
rspec-support!

BUNDLED WITH
1.17.3
Loading

0 comments on commit 1b34df9

Please sign in to comment.