File tree Expand file tree Collapse file tree 7 files changed +75
-9
lines changed Expand file tree Collapse file tree 7 files changed +75
-9
lines changed Original file line number Diff line number Diff line change 1
- # This file was generated on 2014-10-30T08:23:40-07 :00 from the rspec-dev repo.
1
+ # This file was generated on 2014-11-13T23:24:09-08 :00 from the rspec-dev repo.
2
2
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
3
3
4
4
# This file contains defaults for RSpec projects. Individual projects
Original file line number Diff line number Diff line change
1
+ # This file was generated on 2014-11-13T23:24:09-08:00 from the rspec-dev repo.
2
+ # DO NOT modify it by hand as your changes will get lost the next time it is generated.
3
+
4
+ version : " {build}"
5
+
6
+ # This will build all PRs targetting matching branches.
7
+ # Without this, each PR builds twice -- once for the PR branch HEAD,
8
+ # and once for the merge commit that github creates for each mergable PR.
9
+ branches :
10
+ only :
11
+ - master
12
+ - /.*-maintenance$/
13
+
14
+ # Disable normal Windows builds in favor of our test script.
15
+ build : off
16
+
17
+ install :
18
+ - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
19
+ - ruby --version
20
+ - gem --version
21
+ - gem install bundler
22
+ - bundler --version
23
+ - bundle install
24
+ - cinst ansicon
25
+
26
+ test_script :
27
+ - bundle exec rspec
28
+
29
+ environment :
30
+ matrix :
31
+ # ruby_version: '20' doesn't work for some reason
32
+ - ruby_version : ' 193'
33
+ - ruby_version : ' 21'
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
- # This file was generated on 2014-10-30T08:23:40-07 :00 from the rspec-dev repo.
2
+ # This file was generated on 2014-11-13T23:24:09-08 :00 from the rspec-dev repo.
3
3
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
4
4
5
5
set -e
Original file line number Diff line number Diff line change 1
- # This file was generated on 2014-10-30T08:23:40-07 :00 from the rspec-dev repo.
1
+ # This file was generated on 2014-11-13T23:24:09-08 :00 from the rspec-dev repo.
2
2
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
3
3
4
- source script/travis_functions.sh
5
- source script/predicate_functions.sh
4
+ SCRIPT_DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
5
+ source $SCRIPT_DIR /travis_functions.sh
6
+ source $SCRIPT_DIR /predicate_functions.sh
6
7
7
8
# idea taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
8
9
export JRUBY_OPTS=" ${JRUBY_OPTS} -X-C" # disable JIT since these processes are so short lived
@@ -94,6 +95,20 @@ function check_documentation_coverage {
94
95
exit(1)
95
96
end
96
97
"
98
+
99
+ # Some warnings only show up when generating docs, so do that as well.
100
+ bin/yard doc --no-cache | ruby -e "
101
+ while line = gets
102
+ has_warnings ||= line.start_with?('[warn]:')
103
+ has_errors ||= line.start_with?('[error]:')
104
+ puts line
105
+ end
106
+
107
+ if has_warnings || has_errors
108
+ puts \" \n\nYARD emitted documentation warnings or errors.\"
109
+ exit(1)
110
+ end
111
+ "
97
112
}
98
113
99
114
function check_style_and_lint {
Original file line number Diff line number Diff line change 1
- # This file was generated on 2014-10-30T08:23:40-07 :00 from the rspec-dev repo.
1
+ # This file was generated on 2014-11-13T23:24:09-08 :00 from the rspec-dev repo.
2
2
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
3
3
4
4
function is_mri {
@@ -23,6 +23,18 @@ function is_mri_192 {
23
23
fi
24
24
}
25
25
26
+ function is_mri_2plus {
27
+ if is_mri; then
28
+ if ruby -e " exit(RUBY_VERSION.to_f > 2.0)" ; then
29
+ return 0
30
+ else
31
+ return 1
32
+ fi
33
+ else
34
+ return 1
35
+ fi
36
+ }
37
+
26
38
function rspec_support_compatible {
27
39
if [ " $MAINTENANCE_BRANCH " != " 2-99-maintenance" ] && [ " $MAINTENANCE_BRANCH " != " 2-14-maintenance" ]; then
28
40
return 0
@@ -33,7 +45,11 @@ function rspec_support_compatible {
33
45
34
46
function documentation_enforced {
35
47
if [ -x ./bin/yard ]; then
36
- return 0
48
+ if is_mri_2plus; then
49
+ return 0
50
+ else
51
+ return 1
52
+ fi
37
53
else
38
54
return 1
39
55
fi
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
- # This file was generated on 2014-10-30T08:23:40-07 :00 from the rspec-dev repo.
2
+ # This file was generated on 2014-11-13T23:24:09-08 :00 from the rspec-dev repo.
3
3
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
4
4
5
5
set -e
Original file line number Diff line number Diff line change 1
- # This file was generated on 2014-10-30T08:23:40-07 :00 from the rspec-dev repo.
1
+ # This file was generated on 2014-11-13T23:24:09-08 :00 from the rspec-dev repo.
2
2
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
3
3
4
4
# Taken from:
@@ -63,4 +63,6 @@ fold() {
63
63
else
64
64
STATUS=" $status "
65
65
fi
66
+
67
+ return $status
66
68
}
You can’t perform that action at this time.
0 commit comments