Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Feature: MRI Ruby URLs are now configurable from config/{user,db}.

  • Loading branch information...
commit facb9a779091ff71a46980c62d6cab5f54a749a1 1 parent f5a010e
@wayneeseguin wayneeseguin authored
Showing with 28 additions and 17 deletions.
  1. +19 −9 config/db
  2. +6 −6 scripts/manage
  3. +2 −1  scripts/selector
  4. +1 −1  scripts/utility
View
28 config/db
@@ -1,9 +1,24 @@
niceness=0
-ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
-ruby_configure=--enable-shared
interpreter=ruby
-ruby_version=1.8.6
-ruby_patchlevel=383
+ruby_version=1.8.7
+ruby_patchlevel=249
+ruby_configure=--enable-shared
+ruby_repo_url=http://svn.ruby-lang.org/repos/ruby
+ruby_1.0_url=ftp://ftp.ruby-lang.org/pub/ruby/1.0
+ruby_1.2_url=ftp://ftp.ruby-lang.org/pub/ruby/1.2
+ruby_1.3_url=ftp://ftp.ruby-lang.org/pub/ruby/1.3
+ruby_1.4_url=ftp://ftp.ruby-lang.org/pub/ruby/1.4
+ruby_1.5_url=ftp://ftp.ruby-lang.org/pub/ruby/1.5
+ruby_1.6_url=ftp://ftp.ruby-lang.org/pub/ruby/1.6
+ruby_1.7_url=ftp://ftp.ruby-lang.org/pub/ruby/1.7
+ruby_1.8_url=ftp://ftp.ruby-lang.org/pub/ruby/1.8
+ruby_1.9_url=ftp://ftp.ruby-lang.org/pub/ruby/1.9
+ruby_2.0_url=ftp://ftp.ruby-lang.org/pub/ruby/2.0
+ruby_1.9.1_patch_level=378
+ruby_1.9.2_patch_level=preview1
+ruby_1.8.5_patch_level=231
+ruby_1.8.6_patch_level=399
+ruby_1.8.7_patch_level=249
rubygems_version=1.3.7
rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
@@ -18,11 +33,6 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
ree_1.8.7_url=http://rubyforge.org/frs/download.php/68719
ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
ree_1.8.7_patch_level=2010.01
-ruby_1.9.1_patch_level=378
-ruby_1.9.2_patch_level=preview1
-ruby_1.8.5_patch_level=231
-ruby_1.8.6_patch_level=399
-ruby_1.8.7_patch_level=249
jruby_version=1.5.0
jruby_repo_url=git://github.com/jruby/jruby.git
jruby_url=http://jruby.org.s3.amazonaws.com/downloads
View
12 scripts/manage
@@ -696,7 +696,7 @@ __rvm_fetch_ruby() {
rvm_archive_extension="${rvm_archive_extension:-tar.gz}"
if [[ ! -s "$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension" ]] ; then
if [[ "ruby" = "$rvm_ruby_interpreter" ]] ; then
- rvm_url="ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_file.$rvm_archive_extension"
+ rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_release_version}.${rvm_major_version}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
elif [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
elif [[ "jruby" = "$rvm_ruby_interpreter" ]] ; then
@@ -766,12 +766,12 @@ __rvm_fetch_ruby() {
if [[ -z "$rvm_minor_version" ]] || [[ "$rvm_minor_version" = 3 ]] ; then
rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
else
- rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}"
+ rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_${rvm_release_version}_${rvm_major_version}_${rvm_minor_version}"}"
fi
elif [[ -z "$rvm_minor_version" ]] || [[ "$rvm_major_version.$rvm_minor_version" = "8.8" ]] ; then
- rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}"}"
+ rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_${rvm_release_version}_${rvm_major_version}"}"
else
- rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}"
+ rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_${rvm_release_version}_${rvm_major_version}_${rvm_minor_version}"}"
fi
rvm_rev=""
@@ -955,7 +955,7 @@ __rvm_rubygems_setup() {
__rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
__rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
- ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/1.$rvm_major_version"
+ ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/${rvm_release_version}.$rvm_major_version"
elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
# Hands off rubygems for rbx & jruby
if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Skipping rubygems update for $rvm_ruby_version" ; fi
@@ -996,7 +996,7 @@ __rvm_rubygems_setup() {
__rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
if [[ ! -z "$rvm_major_version" ]] ; then
- ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/1.$rvm_major_version"
+ ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/${rvm_release_version}.$rvm_major_version"
else
ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/$interpreter"
fi
View
3  scripts/selector
@@ -194,6 +194,7 @@ __rvm_select() {
if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ "system" != "$rvm_ruby_interpreter" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
if [[ ! -z "$rvm_ruby_version" ]] ; then
+ rvm_release_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $1 }')
rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
fi
@@ -221,7 +222,7 @@ __rvm_select() {
mkdir -p $rvm_ruby_log_path
- export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gemset_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
+ export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_gemset_name rvm_gems_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
else
rvm_ruby_interpreter="${rvm_ruby_interpreter:-system}"
fi
View
2  scripts/utility
@@ -96,7 +96,7 @@ __rvm_cleanup_variables() {
# Unset ruby-specific variables
__rvm_unset_ruby_variables() {
- unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_alias
+ unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_release_version rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_package_file rvm_ruby_package_name rvm_ruby_gem_path rvm_ruby_name rvm_ruby_alias
}
__rvm_set_rvmrc() {
Please sign in to comment.
Something went wrong with that request. Please try again.