Repository: buildr Updated Branches: refs/heads/master 7a128f466 -> 55e38a403
Fix Buildr.rspec_present? so that it works under jruby 1.6.7.2 Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/00f30ac4 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/00f30ac4 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/00f30ac4 Branch: refs/heads/master Commit: 00f30ac42c932898951317e1eed278e9f393ba71 Parents: 7a128f4 Author: Peter Donald <[email protected]> Authored: Wed Mar 11 18:12:02 2015 +1100 Committer: Peter Donald <[email protected]> Committed: Wed Mar 11 18:12:02 2015 +1100 ---------------------------------------------------------------------- CHANGELOG | 1 + lib/buildr/rspec_check.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/00f30ac4/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 91fb5e1..c85857f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ 1.4.23 (Pending) +* Fixed: Fix Buildr.rspec_present? so that it works under jruby 1.6.7.2 1.4.22 (2015-02-28) * Change: BUILDR-704 - Updated the Sonar addon to support the latest version of SonarQube http://git-wip-us.apache.org/repos/asf/buildr/blob/00f30ac4/lib/buildr/rspec_check.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/rspec_check.rb b/lib/buildr/rspec_check.rb index 7b178b8..c605ea3 100644 --- a/lib/buildr/rspec_check.rb +++ b/lib/buildr/rspec_check.rb @@ -27,7 +27,8 @@ module Buildr #:nodoc: @@rspec_checked = true end - $LOADED_FEATURES.any?{|f| f=~ /[\\\/]rspec\.rb$/ } + # Need to check 'rspec.rb' for jruby-1.6.7.2 and earlier + $LOADED_FEATURES.any?{|f| f == 'rspec.rb' || f =~ /[\\\/]rspec\.rb$/ } end def self.ensure_rspec(context)
