From e2b3ce5c49570b469a4801440ad2360bb8e78496 Mon Sep 17 00:00:00 2001 From: Lars Smit Date: Sat, 15 Jun 2013 10:21:22 +0200 Subject: [PATCH] Created function for removing Gemfile.lock + removed dash from rake tasks Related to #3205 --- Rakefile | 2 +- build.sh | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Rakefile b/Rakefile index b19b01359d7..2f014273b0b 100644 --- a/Rakefile +++ b/Rakefile @@ -16,7 +16,7 @@ end desc "Generates a dummy app for testing for every Spree engine" task :test_app do require File.expand_path('../core/lib/generators/spree/install/install_generator', __FILE__) - %w(api backend core dash frontend).each do |engine| + %w(api backend core frontend).each do |engine| ENV['LIB_NAME'] = File.join('spree', engine) ENV['DUMMY_PATH'] = File.expand_path("../#{engine}/spec/dummy", __FILE__) Rake::Task['common:test_app'].execute diff --git a/build.sh b/build.sh index 41fbb3fd94c..9f708c856b9 100755 --- a/build.sh +++ b/build.sh @@ -1,12 +1,17 @@ - alias set_gemfile='export BUNDLE_GEMFILE="`pwd`/Gemfile"' +# Remove Gemfile.lock if it exists +function rm_gemfile_lock(){ if [ -e "Gemfile.lock" ] then echo "Removing Gemfile.lock..." rm Gemfile.lock - fi - bundle check || bundle install - bundle exec rake test_app - cd api; set_gemfile; rm Gemfile.lock; bundle install; bundle exec rspec spec - cd ../backend; set_gemfile; rm Gemfile.lock; bundle install; bundle exec rspec spec - cd ../core; set_gemfile; rm Gemfile.lock; bundle install; bundle exec rspec spec - cd ../frontend; set_gemfile; rm Gemfile.lock; bundle install; bundle exec rspec spec + fi +} + +alias set_gemfile='export BUNDLE_GEMFILE="`pwd`/Gemfile"' +rm_gemfile_lock +bundle check || bundle install +bundle exec rake test_app +cd api; set_gemfile; rm_gemfile_lock; bundle install; bundle exec rspec spec +cd ../backend; set_gemfile; rm_gemfile_lock; bundle install; bundle exec rspec spec +cd ../core; set_gemfile; rm_gemfile_lock; bundle install; bundle exec rspec spec +cd ../frontend; set_gemfile; rm_gemfile_lock; bundle install; bundle exec rspec spec