From 6c02bbb31f4333c70a8d500b2f80c09cf57190b0 Mon Sep 17 00:00:00 2001
From: Artem Shoobovych <shybovycha@gmail.com>
Date: Sat, 22 Nov 2014 20:56:31 +0100
Subject: [PATCH 1/5] Added db:migrate task

---
 lib/language_pack/ruby.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb
index 27725ee04..ffb10c101 100644
--- a/lib/language_pack/ruby.rb
+++ b/lib/language_pack/ruby.rb
@@ -94,6 +94,7 @@ def compile
         build_bundler
         post_bundler
         create_database_yml
+        migrate_database
         install_binaries
         run_assets_precompile_rake_task
       end
@@ -579,6 +580,15 @@ def syck_hack
     end
   end
 
+  # migrates database
+  def migrate_database
+    instrument 'ruby.migrate_database' do
+      log("migrate_database") do
+        rake.task("db:migrate")
+      end
+    end
+  end
+
   # writes ERB based database.yml for Rails. The database.yml uses the DATABASE_URL from the environment during runtime.
   def create_database_yml
     instrument 'ruby.create_database_yml' do

From cb95f4af90d96c0112f71361f8e0f7e16eadf6c8 Mon Sep 17 00:00:00 2001
From: Artem Shoobovych <shybovycha@gmail.com>
Date: Sat, 22 Nov 2014 23:36:39 +0100
Subject: [PATCH 2/5] Updated migrate db task

---
 VERSION                   | 2 +-
 lib/language_pack/ruby.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 1b87bcd0b..314c3d717 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.4
\ No newline at end of file
+1.1.5
\ No newline at end of file
diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb
index ffb10c101..a3a926a44 100644
--- a/lib/language_pack/ruby.rb
+++ b/lib/language_pack/ruby.rb
@@ -94,8 +94,8 @@ def compile
         build_bundler
         post_bundler
         create_database_yml
-        migrate_database
         install_binaries
+        migrate_database
         run_assets_precompile_rake_task
       end
       super
@@ -584,7 +584,9 @@ def syck_hack
   def migrate_database
     instrument 'ruby.migrate_database' do
       log("migrate_database") do
-        rake.task("db:migrate")
+        topic("Migrating database")
+
+        rake.task("db:migrate").invoke(env: rake_env)
       end
     end
   end

From e105c65ebb45a3a445e67257e81b8dabb5fdd2f4 Mon Sep 17 00:00:00 2001
From: Artem Shoobovych <shybovycha@gmail.com>
Date: Sun, 23 Nov 2014 04:25:43 +0100
Subject: [PATCH 3/5] Added imagemagick check

---
 VERSION                   |  2 +-
 lib/language_pack/ruby.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 314c3d717..0664a8fd2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.5
\ No newline at end of file
+1.1.6
diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb
index a3a926a44..a32f96143 100644
--- a/lib/language_pack/ruby.rb
+++ b/lib/language_pack/ruby.rb
@@ -591,6 +591,16 @@ def migrate_database
     end
   end
 
+  def check_imagemagick
+    instrument 'ruby.check_imagemagick' do
+      log("check_imagemagick") do
+        topic("Checking for ImageMagick")
+
+        run "convert -version"
+      end
+    end
+  end
+
   # writes ERB based database.yml for Rails. The database.yml uses the DATABASE_URL from the environment during runtime.
   def create_database_yml
     instrument 'ruby.create_database_yml' do

From 3c5d546fcd3f875769b4edaceb240fccb4fc661c Mon Sep 17 00:00:00 2001
From: Artem Shoobovych <shybovycha@gmail.com>
Date: Sun, 23 Nov 2014 04:28:00 +0100
Subject: [PATCH 4/5] Added imagemagick check

---
 VERSION                   | 2 +-
 lib/language_pack/ruby.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 0664a8fd2..2bf1ca5f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.6
+1.1.7
diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb
index a32f96143..f19367884 100644
--- a/lib/language_pack/ruby.rb
+++ b/lib/language_pack/ruby.rb
@@ -90,6 +90,7 @@ def compile
       setup_language_pack_environment
       setup_profiled
       allow_git do
+        check_imagemagick
         install_bundler_in_app
         build_bundler
         post_bundler

From 9780f07def975b17aa704a301f53ceded3a219a7 Mon Sep 17 00:00:00 2001
From: Artem Shoobovych <shybovycha@gmail.com>
Date: Sun, 23 Nov 2014 04:33:29 +0100
Subject: [PATCH 5/5] Added imagemagick check

---
 VERSION                   | 2 +-
 lib/language_pack/ruby.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 2bf1ca5f5..18efdb9ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.7
+1.1.8
diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb
index f19367884..b7f35ef3d 100644
--- a/lib/language_pack/ruby.rb
+++ b/lib/language_pack/ruby.rb
@@ -597,7 +597,9 @@ def check_imagemagick
       log("check_imagemagick") do
         topic("Checking for ImageMagick")
 
-        run "convert -version"
+        out = run_stdout("convert -version").chomp
+
+        puts "ImageMagick: `#{out}`"
       end
     end
   end