Merge pull request #77 from rspec/update-travis-build-scripts-2014-06-06-for-master

Updates from rspec-dev (2014-06-06)

Author: myronmarston

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2014-05-20T15:40:07+10:00 from the rspec-dev repo.
+# This file was generated on 2014-06-06T11:34:33-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 before_install:

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2014-05-20T15:40:07+10:00 from the rspec-dev repo.
+# This file was generated on 2014-06-06T11:34:33-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e -x

script/functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2014-05-20T15:40:07+10:00 from the rspec-dev repo.
+# This file was generated on 2014-06-06T11:34:33-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # idea taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
@@ -67,6 +67,14 @@ function documentation_enforced {
   fi
 }
 
+function style_and_lint_enforced {
+ if [ -x ./bin/rubocop ]; then
+   return 0
+ else
+   return 1
+ fi
+}
+
 function clone_repo {
   if [ ! -d $1 ]; then # don't clone if the dir is already there
     travis_retry git clone git://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH
@@ -142,3 +150,7 @@ function check_documentation_coverage {
     end
   "
 }
+
+function check_style_and_lint {
+  bin/rubocop lib
+}

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2014-05-20T15:40:07+10:00 from the rspec-dev repo.
+# This file was generated on 2014-06-06T11:34:33-07:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e -x
@@ -12,6 +12,10 @@ if documentation_enforced; then
   check_documentation_coverage
 fi
 
+if style_and_lint_enforced; then
+  check_style_and_lint
+fi
+
 if is_mri; then
   run_specs_one_by_one
   run_spec_suite_for "rspec-core"