Permalink
Browse files

Fix Rakefile calls to Ruby interpreter executable

  • Loading branch information...
1 parent fcf83fa commit 0a3c477621dbec31035bb5c9f90226f9beaadded @ngollan ngollan committed May 25, 2011
Showing with 12 additions and 5 deletions.
  1. +6 −1 Gemfile
  2. +1 −1 Rakefile
  3. +5 −3 merb-core/Rakefile
View
@@ -10,10 +10,15 @@ gem 'json'
gem 'hpricot'
gem 'templater', :git => 'git://github.com/ngollan/templater.git'
gem 'mailfactory'
-gem 'memcached'
gem 'haml'
gem 'rack'
+# memcached releases after that up to at least 1.2.6 don't build on rbx
+# and reportedly JRuby:
+# https://github.com/fauna/memcached/issues/49
+# -- 2011-05-25
+gem 'memcached', '= 1.2.3'
+
gem 'rspec', '>= 2.5'
gem 'webrat', '>= 0.7'
gem 'memcache-client', '>= 1.8.5'
View
@@ -37,7 +37,7 @@ yard_local_options = [
merb_stack_gems = Merb::STACK_GEMS
def rake_command(command)
- sh "#{RUBY} -S rake #{command}"
+ ruby '-S', 'rake', command, :verbose => false
end
desc "Build all merb stack gems"
View
@@ -15,7 +15,6 @@ task :default => :specs
task :merb => [:clean, :doc, :package]
-
##############################################################################
# Documentation
##############################################################################
@@ -64,8 +63,11 @@ end
desc "Run all specs; set RAKE_TAG to filter specs (see rspec --tag parameter)"
task :spec do
Dir['spec/**/*_spec.rb'].each do |file|
- puts file
- sh "#{RUBY} -S rspec #{file}"
+
+ begin
+ ruby '-S', 'rspec', file, :verbose => false
+ rescue Exception
+ end
end
end
#RSpec::Core::RakeTask.new(:spec) do |t|

0 comments on commit 0a3c477

Please sign in to comment.