Merge load_dependencies into init.

* This will ensure that `ruby_dependencies` is set, even if
  `--no-install-deps` is given.

Author: postmodern

share/ruby-install/functions.sh

@@ -7,21 +7,11 @@ source "$ruby_install_dir/checksums.sh"
 #
 function pre_install() { return; }
 
-#
-# Loads the dependencies.sh file for the ruby and sets $ruby_dependencies.
-#
-function load_dependencies()
-{
-	source "$ruby_install_dir/$ruby/dependencies.sh"
-}
-
 #
 # Install the ruby's dependencies.
 #
 function install_deps()
 {
-	load_dependencies
-
 	if (( ${#ruby_dependencies[@]} > 0 )); then
 		log "Installing dependencies for $ruby $ruby_version ..."
 		install_packages "${ruby_dependencies[@]}" || return $?

share/ruby-install/ruby-install.sh

@@ -288,8 +288,9 @@ function init()
 		warn "Unknown $ruby version $ruby_version. Proceeding anyways ..."
 	fi
 
-	source "$ruby_install_dir/functions.sh"       || return $?
-	source "$ruby_install_dir/$ruby/functions.sh" || return $?
+	source "$ruby_install_dir/functions.sh"          || return $?
+	source "$ruby_install_dir/$ruby/dependencies.sh" || return $?
+	source "$ruby_install_dir/$ruby/functions.sh"    || return $?
 
 	ruby_cache_dir="$ruby_install_cache_dir/$ruby"
 	install_dir="${install_dir:-$rubies_dir/$ruby-$ruby_version}"

test/functions-tests/load_dependencies_test.sh

@@ -67,6 +67,14 @@ function test_init_with_ruby_url()
 	assertEquals "did not preserve ruby_url" "$url" "$ruby_url"
 }
 
+function test_init_ruby_dependencies()
+{
+	init
+
+	assertTrue "did not set \$ruby_dependencies" \
+		   '(( ${#ruby_dependencies[@]} > 0 ))'
+}
+
 function test_init_ruby_md5()
 {
 	init
@@ -171,7 +179,7 @@ function test_install_dir()
 function tearDown()
 {
 	unset install_dir ruby_cache_dir
-	unset ruby ruby_version ruby_md5 ruby_archive ruby_url
+	unset ruby ruby_version ruby_md5 ruby_archive ruby_url ruby_dependencies
 }
 
 SHUNIT_PARENT=$0 . $SHUNIT2