From 6a0aab6a93abc3a73fbef2e434bdf6279bd43122 Mon Sep 17 00:00:00 2001
From: anmol <github@datamol.org>
Date: Mon, 21 Jan 2019 16:37:43 +0530
Subject: [PATCH] Upgraded to version 2.7.0

---
 README.md               |  2 +-
 conf/app-mastodon.src   |  4 ++--
 conf/app-ruby-build.src |  4 ++--
 manifest.json           |  2 +-
 scripts/install         | 10 +++++-----
 scripts/upgrade         | 20 ++++++++++----------
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 533bcb6..5ff3abb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Mastodon for YunoHost
 
-[![Latest Version](https://img.shields.io/badge/version-2.6.5-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
+[![Latest Version](https://img.shields.io/badge/version-2.7.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
 [![Status](https://img.shields.io/badge/status-testing-yellow.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/milestones)
 [![Dependencies](https://img.shields.io/badge/dependencies-includes-lightgrey.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies)
 [![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE)
diff --git a/conf/app-mastodon.src b/conf/app-mastodon.src
index ca8a7c6..64b77bc 100644
--- a/conf/app-mastodon.src
+++ b/conf/app-mastodon.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.6.5.tar.gz
-SOURCE_SUM=697cb060f178a88c6f2a730d3ac9234babf9aa04d11086693a3e64e7ea1b1d62 
+SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v2.7.0.tar.gz
+SOURCE_SUM=429d2be660aff3d77960ae87412ad7de82dab9c21363e2799db34948d2231d7b 
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/app-ruby-build.src b/conf/app-ruby-build.src
index eb268fb..b32b7b9 100644
--- a/conf/app-ruby-build.src
+++ b/conf/app-ruby-build.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v20181019.tar.gz
-SOURCE_SUM=5ac5838e81ac06478aa23de79aefc4196f7d1ba8aa1a3cc03bc6e81708463a9e
+SOURCE_URL=https://github.com/rbenv/ruby-build/archive/v20181225.tar.gz
+SOURCE_SUM=5ace4787ace47384dc419b20f5eb5a59f1174e00bfabcfed74a175033cd0b18a 
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index ba0fb7c..9a2c4d4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
 	"id": "mastodon",
 	"packaging_format": 1,
 	"requirements": {
-		"yunohost": ">= 2.7.9"
+		"yunohost": ">= 2.7.0"
 	},
 	"description": {
 		"en": "Mastodon is a free, open-source social network.",
diff --git a/scripts/install b/scripts/install
index 8782cdb..42d046a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -161,14 +161,14 @@ eval \"\$(rbenv init -)\"" > $final_path/.profile
 
 # Install ruby-build
 (
-	exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.3 || true
-	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.3  || true 
-	exec_as "$app" $final_path/.rbenv/versions/2.5.3/bin/ruby -v 
+	exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.6.0 || true
+	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.6.0  || true 
+	exec_as "$app" $final_path/.rbenv/versions/2.6.0/bin/ruby -v 
 )
 
 # Create symlink for ruby
 rm /usr/bin/ruby || true
-ln -s $final_path/.rbenv/versions/2.5.3/bin/ruby /usr/bin/ruby || true
+ln -s $final_path/.rbenv/versions/2.6.0/bin/ruby /usr/bin/ruby || true
 
 # Adjust Mastodon config
 
@@ -206,7 +206,7 @@ chown -R "$app": "$final_path"
 (
 	cd "$final_path/live"
 	su mastodon <<INSTALL
-		$final_path/.rbenv/versions/2.5.3/bin/gem install bundler:1.16.6 --no-ri --no-rdoc
+		$final_path/.rbenv/versions/2.6.0/bin/gem install bundler:1.16.6 --no-ri --no-rdoc
 		$final_path/live/bin/bundle install \
 		-j$(getconf _NPROCESSORS_ONLN) \
 		--deployment --without development test
diff --git a/scripts/upgrade b/scripts/upgrade
index d337e6d..3c0405c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -144,25 +144,25 @@ chown -R "$app": "$final_path"
 
 # Install ruby 2.5.1
 (
-	exec_as "$app" $final_path/.rbenv/bin/rbenv install -s 2.5.3 || true
-	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.3 || true
-	exec_as "$app" $final_path/.rbenv/versions/2.5.3/bin/ruby -v
+	exec_as "$app" $final_path/.rbenv/bin/rbenv install -s 2.6.0 || true
+	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.6.0 || true
+	exec_as "$app" $final_path/.rbenv/versions/2.6.0/bin/ruby -v
 )
 
 # Create symlink for ruby
 rm /usr/bin/ruby || true
-ln -s $final_path/.rbenv/versions/2.5.3/bin/ruby /usr/bin/ruby || true
+ln -s $final_path/.rbenv/versions/2.6.0/bin/ruby /usr/bin/ruby || true
 
 # Preconfig CSS & JS
 # Install Mastodon
 (
 sudo su - $app <<MCOMMANDS
 pushd ~/live
-$final_path/.rbenv/versions/2.5.3/bin/gem install bundler
+$final_path/.rbenv/versions/2.6.0/bin/gem install bundler
 if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	$final_path/.rbenv/versions/2.5.3/bin/bundle install --deployment --without development test
+	$final_path/.rbenv/versions/2.6.0/bin/bundle install --deployment --without development test
 else
-	$final_path/.rbenv/versions/2.5.3/bin/bundle install --deployment --force --without development test
+	$final_path/.rbenv/versions/2.6.0/bin/bundle install --deployment --force --without development test
 fi
 yarn install --pure-lockfile
 MCOMMANDS
@@ -177,13 +177,13 @@ popd
 # Apply Mastodon upgrade
 (
 pushd $final_path/live
-RAILS_ENV=production $final_path/.rbenv/versions/2.5.3/bin/bundle exec rails assets:clean
-RAILS_ENV=production $final_path/.rbenv/versions/2.5.3/bin/bundle exec rails assets:precompile
+RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails assets:clean
+RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails assets:precompile
 popd
 
 sudo su - $app <<COMMANDS
 pushd ~/live
-RAILS_ENV=production $final_path/.rbenv/versions/2.5.3/bin/bundle exec rails db:migrate
+RAILS_ENV=production $final_path/.rbenv/versions/2.6.0/bin/bundle exec rails db:migrate
 COMMANDS
 )