From d71b3d964a8e6cbb2246cddf219ee9bbfb766aea Mon Sep 17 00:00:00 2001
From: Raghu Betina <raghu@firstdraft.com>
Date: Wed, 28 Jun 2017 15:33:27 -0500
Subject: [PATCH 1/5] Add diff2html installation to bin/setup

---
 bin/setup | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/setup b/bin/setup
index 78c4e86..9a041ff 100755
--- a/bin/setup
+++ b/bin/setup
@@ -35,4 +35,7 @@ chdir APP_ROOT do
 
   puts "\n== Restarting application server =="
   system! 'bin/rails restart'
+
+  puts "\n== Installing diff2html-cli =="
+  `npm install -g diff2html-cli`
 end

From e09ad25839f3fb7fc09d0dbe9af64a1171975ebd Mon Sep 17 00:00:00 2001
From: Raghu Betina <raghu@firstdraft.com>
Date: Wed, 28 Jun 2017 20:53:48 +0000
Subject: [PATCH 2/5] Changes

---
 bin/setup | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/setup b/bin/setup
index 9a041ff..eb526ee 100755
--- a/bin/setup
+++ b/bin/setup
@@ -13,8 +13,14 @@ end
 chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file.
-
-  puts '== Installing dependencies =='
+  
+  puts "== Upgrading Ruby =="
+  system! 'rvm install 2.3.4'
+  # system! 'rvm use 2.3.4 --default'
+  system! 'rvm alias create default 2.3.4'
+  
+
+  puts "\n== Installing dependencies =="
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
@@ -37,5 +43,5 @@ chdir APP_ROOT do
   system! 'bin/rails restart'
 
   puts "\n== Installing diff2html-cli =="
-  `npm install -g diff2html-cli`
+  system! 'npm install -g diff2html-cli'
 end

From 70ca4b16afe5b4bb7a13e5ff4bd83894aba7f8c8 Mon Sep 17 00:00:00 2001
From: Raghu Betina <raghu@firstdraft.com>
Date: Wed, 28 Jun 2017 21:01:54 +0000
Subject: [PATCH 3/5] Update bundle

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 101ed20..abe4d5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/firstdraft/web_git.git
-  revision: 109d8edc73b3d13e3eb38bbe84fa88eda14fdc9e
+  revision: eb17875ead53e790fab98a11ac21a0874e4b938b
   specs:
     web_git (0.0.1)
       bootstrap (~> 4.0.0.alpha6)
@@ -287,4 +287,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

From 25efb415c03aed608ae8e290aa97d4f03a3581b3 Mon Sep 17 00:00:00 2001
From: Raghu Betina <raghu@firstdraft.com>
Date: Wed, 28 Jun 2017 21:08:56 +0000
Subject: [PATCH 4/5] bundle

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index abe4d5a..99f8052 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/firstdraft/web_git.git
-  revision: eb17875ead53e790fab98a11ac21a0874e4b938b
+  revision: aa58bc682114278d3b4aa57d0590391c8312e3ee
   specs:
     web_git (0.0.1)
       bootstrap (~> 4.0.0.alpha6)

From f1c5cc2fcb4b8df135031ef2a045d03ecf132f84 Mon Sep 17 00:00:00 2001
From: Raghu Betina <raghu@firstdraft.com>
Date: Wed, 28 Jun 2017 21:11:37 +0000
Subject: [PATCH 5/5] bundle

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 99f8052..d3d64b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: https://github.com/firstdraft/web_git.git
-  revision: aa58bc682114278d3b4aa57d0590391c8312e3ee
+  revision: ad91fe4d4876393465589e32b8929316d0294982
   specs:
     web_git (0.0.1)
       bootstrap (~> 4.0.0.alpha6)