Merge pull request #4855 from MrZYX/drop_rvmrc

Replace .rvmrc by .ruby-version

.ruby-gemset

@@ -0,0 +1 @@
+diaspora

.ruby-version

@@ -0,0 +1 @@
+2.0

.rvmrc

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-rvm rvmrc warning ignore
-
-. ./script/env/ruby_env
-
-if [ -e '.rvmrc.local' ]; then
-  . ./.rvmrc.local;
-elif [ -e '.rvmrc_custom' ] ; then
-  . ./.rvmrc_custom;
-else
-  if rvm list strings | grep -q "$ruby_version" ; then
-    rvm --create use "$ruby_version@$gemset"
-  else
-    printf "\e[00;31mPLEASE INSTALL RUBY $ruby_version WITH \`rvm install $ruby_version\`\n"
-    printf "Don't forget to run \`cd .. && cd -\` afterwards!\e[00m\n"
-    return 1
-  fi
-fi
-
-. ./script/env/ensure_right_rubygems

Changelog.md

@@ -15,6 +15,7 @@
 * Port publisher and bookmarklet to Bootstrap [#4678](https://github.com/diaspora/diaspora/pull/4678)
 * Improve search page, add better indications [#4794](https://github.com/diaspora/diaspora/pull/4794)
 * Port notifications and hovercards to Bootstrap [#4814](https://github.com/diaspora/diaspora/pull/4814)
+* Replace .rvmrc by .ruby-version and .ruby-gemset [#4854](https://github.com/diaspora/diaspora/pull/4855)
 
 ## Bug fixes
 * Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280)

script/ci/before_install.sh

@@ -2,8 +2,3 @@
 
 # Travis CI still includes 1.2.x by default
 gem install bundler --version '>= 1.3.4'
-
-# Ensure known RubyGems version
-envdir="$(readlink -e $(dirname $0))/../env"
-. "$envdir/ruby_env"
-. "$envdir/ensure_right_rubygems"

script/env/ensure_right_rubygems

@@ -1,3 +0,0 @@
-if [ "$(gem --version)" != "$rubygems_version" ]; then
-  rvm rubygems "$rubygems_version"
-fi

script/env/ruby_env

@@ -1,3 +0,0 @@
-rubygems_version="2.2.1"
-ruby_version="2.0.0-p353"
-gemset="diaspora"