Skip to content

Commit e5302b0

Browse files
committed
Merge pull request #169 from dblock/test-against-grapes
Test against multiple versions of Grape.
2 parents cdd877b + 33af546 commit e5302b0

File tree

6 files changed

+81
-38
lines changed

6 files changed

+81
-38
lines changed

.rubocop.yml

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,5 @@
11
AllCops:
2-
Excludes:
2+
Exclude:
33
- vendor/**/*
44

5-
LineLength:
6-
Enabled: false
7-
8-
MethodLength:
9-
Enabled: false
10-
11-
ClassLength:
12-
Enabled: false
13-
14-
Documentation:
15-
# don't require classes to be documented
16-
Enabled: false
17-
18-
Encoding:
19-
# no need to always specify encoding
20-
Enabled: false
21-
22-
FileName:
23-
# allow grape-swagger.rb
24-
Enabled: false
25-
26-
PredicateName:
27-
Enabled: false
28-
29-
DoubleNegation:
30-
Enabled: false
31-
32-
CyclomaticComplexity:
33-
Enabled: false
34-
35-
ClassVars:
36-
Enabled: false
5+
inherit_from: .rubocop_todo.yml

.rubocop_todo.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# This configuration was generated by `rubocop --auto-gen-config`
2+
# on 2014-11-10 14:38:32 -0500 using RuboCop version 0.27.0.
3+
# The point is for the user to remove these configuration records
4+
# one by one as the offenses are removed from the code base.
5+
# Note that changes in the inspected code, or installation of new
6+
# versions of RuboCop, may require this file to be generated again.
7+
8+
# Offense count: 8
9+
Metrics/AbcSize:
10+
Max: 332
11+
12+
# Offense count: 1
13+
# Configuration parameters: CountComments.
14+
Metrics/ClassLength:
15+
Max: 385
16+
17+
# Offense count: 4
18+
Metrics/CyclomaticComplexity:
19+
Max: 92
20+
21+
# Offense count: 209
22+
# Configuration parameters: AllowURI, URISchemes.
23+
Metrics/LineLength:
24+
Max: 254
25+
26+
# Offense count: 11
27+
# Configuration parameters: CountComments.
28+
Metrics/MethodLength:
29+
Max: 354
30+
31+
# Offense count: 4
32+
Metrics/PerceivedComplexity:
33+
Max: 98
34+
35+
# Offense count: 7
36+
Style/ClassVars:
37+
Enabled: false
38+
39+
# Offense count: 62
40+
Style/Documentation:
41+
Enabled: false
42+
43+
# Offense count: 2
44+
Style/DoubleNegation:
45+
Enabled: false
46+
47+
# Offense count: 3
48+
# Configuration parameters: Exclude.
49+
Style/FileName:
50+
Enabled: false
51+
52+
# Offense count: 1
53+
# Configuration parameters: NamePrefix, NamePrefixBlacklist.
54+
Style/PredicateName:
55+
Enabled: false

.travis.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1+
language: ruby
2+
3+
sudo: false
4+
15
rvm:
2-
- jruby-19mode
3-
- 1.9.3
6+
- 2.1.1
47
- 2.0.0
5-
- 2.1.2
8+
- 1.9.3
69
- rbx-2.2.10
10+
- jruby-19mode
711

12+
env:
13+
- GRAPE_VERSION=0.8.0
14+
- GRAPE_VERSION=0.9.0
15+
- GRAPE_VERSION=HEAD
816

17+
matrix:
18+
allow_failures:
19+
- env: GRAPE_VERSION=HEAD

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* [#91](https://github.com/tim-vandecasteele/grape-swagger/issues/91): Fixed empty field for group parameters' name with type hash or Array - [@dukedave](https://github.com/dukedave).
44
* [#154](https://github.com/tim-vandecasteele/grape-swagger/pull/154): Allow classes for type declarations inside documentation - [@mrmargolis](https://github.com/mrmargolis).
55
* [#162](https://github.com/tim-vandecasteele/grape-swagger/pull/162): Fix performance issue related to having a large number of models - [@elado](https://github.com/elado).
6+
* [#169](https://github.com/tim-vandecasteele/grape-swagger/pull/169): Test against multiple versions of Grape - [@dblock](https://github.com/dblock).
67
* Your contribution here.
78

89
### 0.8.0 (August 30, 2014)

Gemfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1-
source "http://rubygems.org"
1+
source 'http://rubygems.org'
22

33
gemspec
4+
5+
case version = ENV['GRAPE_VERSION'] || '~> 0.9.0'
6+
when 'HEAD'
7+
gem 'grape', github: 'intridea/grape'
8+
else
9+
gem 'grape', version
10+
end

grape-swagger.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
2121
s.add_development_dependency 'bundler'
2222
s.add_development_dependency 'rack-test'
2323
s.add_development_dependency 'rack-cors'
24-
s.add_development_dependency 'rubocop', '0.24.1'
24+
s.add_development_dependency 'rubocop', '0.27.0'
2525
s.add_development_dependency 'kramdown', '~> 1.4.1'
2626
s.add_development_dependency 'redcarpet', '~> 3.1.2' unless RUBY_PLATFORM.eql? 'java'
2727
s.add_development_dependency 'rouge', '~> 1.6.1'

0 commit comments

Comments
 (0)