From 018b649b496557f6f3ee5a16d70165f9e81e5b25 Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Tue, 21 Jun 2016 00:11:22 -0400 Subject: [PATCH 1/2] Re-source the RVM initialization script to make sure the RVM is available and update non-rvm mailcatcher dependency to ruby 2.0.0+ --- scripts/mailcatcher.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/mailcatcher.sh b/scripts/mailcatcher.sh index 634be7e2..b9c11e7f 100644 --- a/scripts/mailcatcher.sh +++ b/scripts/mailcatcher.sh @@ -10,15 +10,24 @@ PHP_IS_INSTALLED=$1 apache2 -v > /dev/null 2>&1 APACHE_IS_INSTALLED=$? -# Installing dependency +# Source .profile for RVM, if available +if [[ -f "/home/vagrant/.profile" ]]; then + source /home/vagrant/.profile +fi + +# Installing sqlite dependency # -qq implies -y --force-yes -sudo apt-get install -qq libsqlite3-dev ruby1.9.1-dev +sudo apt-get install -qq libsqlite3-dev if $(which rvm) -v > /dev/null 2>&1; then echo ">>>>Installing with RVM" $(which rvm) default@mailcatcher --create do gem install --no-rdoc --no-ri mailcatcher $(which rvm) wrapper default@mailcatcher --no-prefix mailcatcher catchmail else + # Installing ruby dependency + # -qq implies -y --force-yes + sudo apt-get install -qq ruby-2.0.0-dev + # Gem check if ! gem -v > /dev/null 2>&1; then sudo aptitude install -y libgemplugin-ruby; fi From ec7c090cafa84859a45d867bad6ca845bd045dc4 Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Tue, 21 Jun 2016 03:30:57 -0400 Subject: [PATCH 2/2] Install mailcatcher dependencies and then install mailcatcher using --ignore-dependencies to override mail 2.6.4 requiring ruby 2.0.0+ --- scripts/mailcatcher.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/mailcatcher.sh b/scripts/mailcatcher.sh index b9c11e7f..d1062539 100644 --- a/scripts/mailcatcher.sh +++ b/scripts/mailcatcher.sh @@ -26,13 +26,23 @@ if $(which rvm) -v > /dev/null 2>&1; then else # Installing ruby dependency # -qq implies -y --force-yes - sudo apt-get install -qq ruby-2.0.0-dev + sudo apt-get install -qq ruby1.9.1-dev # Gem check if ! gem -v > /dev/null 2>&1; then sudo aptitude install -y libgemplugin-ruby; fi + # Install Mailcatcher gem dependencies, otherwise Ruby 2.0.0+ is required + gem install --no-rdoc --no-ri mail -v 2.6.3 # Last known working with Ruby < 2.0.0 + gem install --no-rdoc --no-ri activesupport -v "~> 4.0" + gem install --no-rdoc --no-ri eventmachine -v 1.0.9.1 + gem install --no-rdoc --no-ri rack -v "~> 1.5" + gem install --no-rdoc --no-ri sinatra -v "~> 1.2" + gem install --no-rdoc --no-ri skinny -v "~> 0.2.3" + gem install --no-rdoc --no-ri sqlite3 -v "~> 1.3" + gem install --no-rdoc --no-ri thin -v "~> 1.5.0" + # Install - gem install --no-rdoc --no-ri mailcatcher + gem install --no-rdoc --no-ri --ignore-dependencies mailcatcher -v "~> 0.6" fi # Make it start on boot