Skip to content

Commit 5f28072

Browse files
authored
Merge pull request #1962 from benoittgt/update-travis-build-scripts-2018-03-04-for-master
Updated travis build scripts + rubocop config (from rspec-dev)
2 parents 14357eb + 3091722 commit 5f28072

File tree

7 files changed

+200
-22
lines changed

7 files changed

+200
-22
lines changed

.rubocop_rspec_base.yml

Lines changed: 190 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# This file was generated on 2017-11-21T14:21:55+11:00 from the rspec-dev repo.
1+
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# This file contains defaults for RSpec projects. Individual projects
55
# can customize by inheriting this file and overriding particular settings.
66

77
AccessModifierIndentation:
8-
EnforcedStyle: outdent
8+
Enabled: false
99

1010
# "Use alias_method instead of alias"
1111
# We're fine with `alias`.
@@ -50,9 +50,6 @@ DoubleNegation:
5050
EachWithObject:
5151
Enabled: false
5252

53-
Encoding:
54-
EnforcedStyle: when_needed
55-
5653
FormatString:
5754
EnforcedStyle: percent
5855

@@ -73,7 +70,7 @@ MethodLength:
7370
Max: 15
7471

7572
# Who cares what we call the argument for binary operator methods?
76-
OpMethod:
73+
BinaryOperatorParameterName:
7774
Enabled: false
7875

7976
PercentLiteralDelimiters:
@@ -98,9 +95,6 @@ PredicateName:
9895
Proc:
9996
Enabled: false
10097

101-
RedundantReturn:
102-
AllowMultipleReturnValues: true
103-
10498
# Exceptions should be rescued with `Support::AllExceptionsExceptOnesWeMustNotRescue`
10599
RescueException:
106100
Enabled: true
@@ -121,10 +115,196 @@ StringLiterals:
121115
Style/SpecialGlobalVars:
122116
Enabled: false
123117

124-
Style/TrailingComma:
118+
Style/TrailingCommaInLiteral:
119+
Enabled: false
120+
121+
Style/TrailingCommaInArguments:
125122
Enabled: false
126123

127124
TrivialAccessors:
128125
AllowDSLWriters: true
129126
AllowPredicates: true
130127
ExactNameMatch: true
128+
129+
Style/ParallelAssignment:
130+
Enabled: false
131+
132+
Layout/EmptyLineBetweenDefs:
133+
Enabled: false
134+
135+
Layout/FirstParameterIndentation:
136+
Enabled: false
137+
138+
Naming/ConstantName:
139+
Enabled: false
140+
141+
Style/ClassCheck:
142+
Enabled: false
143+
144+
Style/ConditionalAssignment:
145+
Enabled: false
146+
147+
Style/EmptyMethod:
148+
Enabled: false
149+
150+
Style/FormatStringToken:
151+
Enabled: false
152+
153+
Style/GuardClause:
154+
Enabled: false
155+
156+
Style/IdenticalConditionalBranches:
157+
Enabled: false
158+
159+
Style/IfUnlessModifier:
160+
Enabled: false
161+
162+
Style/IfUnlessModifierOfIfUnless:
163+
Enabled: false
164+
165+
Style/MethodMissing:
166+
Enabled: false
167+
168+
Style/MixinUsage:
169+
Enabled: false
170+
171+
Style/MultipleComparison:
172+
Enabled: false
173+
174+
Style/MutableConstant:
175+
Enabled: false
176+
177+
Style/NestedModifier:
178+
Enabled: false
179+
180+
Style/NestedParenthesizedCalls:
181+
Enabled: false
182+
183+
Style/NumericPredicate:
184+
Enabled: false
185+
186+
Style/RedundantParentheses:
187+
Enabled: false
188+
189+
Style/StringLiteralsInInterpolation:
190+
Enabled: false
191+
192+
Style/SymbolArray:
193+
Enabled: false
194+
195+
Style/SymbolProc:
196+
Enabled: false
197+
198+
Style/YodaCondition:
199+
Enabled: false
200+
201+
Style/ZeroLengthPredicate:
202+
Enabled: false
203+
204+
Layout/ClosingParenthesisIndentation:
205+
Enabled: false
206+
207+
Layout/ExtraSpacing:
208+
Enabled: false
209+
210+
Layout/MultilineMethodCallBraceLayout:
211+
Enabled: false
212+
213+
Layout/MultilineMethodCallIndentation:
214+
Enabled: false
215+
216+
Layout/MultilineOperationIndentation:
217+
Enabled: false
218+
219+
Layout/SpaceAroundBlockParameters:
220+
Enabled: false
221+
222+
Layout/SpaceAroundOperators:
223+
Enabled: false
224+
225+
Layout/SpaceBeforeComma:
226+
Enabled: false
227+
228+
Style/BlockDelimiters:
229+
Enabled: false
230+
231+
Style/EmptyCaseCondition:
232+
Enabled: false
233+
234+
Style/MultilineIfModifier:
235+
Enabled: false
236+
237+
Style/RescueStandardError:
238+
Enabled: false
239+
240+
Style/StderrPuts:
241+
Enabled: false
242+
243+
Style/TernaryParentheses:
244+
Enabled: false
245+
246+
# This could likely be enabled, but it had a false positive on rspec-mocks
247+
# (suggested change was not behaviour preserving) so I don't trust it.
248+
Performance/HashEachMethods:
249+
Enabled: false
250+
251+
Naming/HeredocDelimiterNaming:
252+
Enabled: false
253+
254+
Layout/EmptyLineAfterMagicComment:
255+
Enabled: false
256+
257+
Layout/IndentArray:
258+
Enabled: false
259+
260+
Layout/IndentAssignment:
261+
Enabled: false
262+
263+
Layout/IndentHeredoc:
264+
Enabled: false
265+
266+
Layout/SpaceInsidePercentLiteralDelimiters:
267+
Enabled: false
268+
269+
Style/EmptyElse:
270+
Enabled: false
271+
272+
Style/IfInsideElse:
273+
Enabled: false
274+
275+
Style/RedundantReturn:
276+
Enabled: false
277+
278+
Style/StructInheritance:
279+
Enabled: false
280+
281+
Naming/VariableNumber:
282+
Enabled: false
283+
284+
Layout/SpaceInsideStringInterpolation:
285+
Enabled: false
286+
287+
Style/DateTime:
288+
Enabled: false
289+
290+
Style/ParenthesesAroundCondition:
291+
Enabled: false
292+
293+
Layout/EmptyLinesAroundBlockBody:
294+
Enabled: false
295+
296+
Lint/ImplicitStringConcatenation:
297+
Enabled: false
298+
299+
Lint/NestedMethodDefinition:
300+
Enabled: false
301+
302+
Style/RegexpLiteral:
303+
Enabled: false
304+
305+
Style/TrailingUnderscoreVariable:
306+
Enabled: false
307+
308+
Layout/EmptyLinesAroundAccessModifier:
309+
Enabled: false
310+

appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2017-11-21T14:21:55+11:00 from the rspec-dev repo.
1+
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
version: "{build}"
@@ -37,3 +37,5 @@ environment:
3737
- ruby_version: 200
3838
- ruby_version: 21
3939
- ruby_version: 22
40+
- ruby_version: 23-x64
41+
- ruby_version: 24-x64

script/clone_all_rspec_repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2017-11-21T14:21:55+11:00 from the rspec-dev repo.
2+
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/functions.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2017-11-21T14:21:55+11:00 from the rspec-dev repo.
1+
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -83,11 +83,7 @@ function run_spec_suite_for {
8383
pushd ../$1
8484
unset BUNDLE_GEMFILE
8585
bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
86-
if is_mri_192_plus; then
87-
travis_retry eval "RUBYOPT=$RUBYOPT:'--enable rubygems' bundle install $bundle_install_flags"
88-
else
89-
travis_retry eval "bundle install $bundle_install_flags"
90-
fi
86+
travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
9187
run_specs_and_record_done
9288
popd
9389
else
@@ -184,7 +180,7 @@ function check_documentation_coverage {
184180

185181
function check_style_and_lint {
186182
echo "bin/rubocop lib"
187-
bin/rubocop lib
183+
eval "(unset RUBYOPT; exec bin/rubocop lib)"
188184
}
189185

190186
function run_all_spec_suites {

script/predicate_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2017-11-21T14:21:55+11:00 from the rspec-dev repo.
1+
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
function is_mri {

script/run_build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2017-11-21T14:21:55+11:00 from the rspec-dev repo.
2+
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/travis_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2017-11-21T14:21:55+11:00 from the rspec-dev repo.
1+
# This file was generated on 2018-03-04T16:52:14+01:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# Taken from:

0 commit comments

Comments
 (0)