Merge branch 'hotfix/1.25.2' into stable

VERSION

@@ -1 +1 @@
-1.25.1
+1.25.2

config/db

@@ -12,7 +12,7 @@ ruby_url=http://cache.ruby-lang.org/pub/ruby
 ruby_url_fallback_1=http://ftp.ruby-lang.org/pub/ruby
 ruby_url_fallback_2=http://www.mirrorservice.org/sites/ftp.ruby-lang.org/pub/ruby
 ruby_version=2.0.0
-ruby_2.1.0_patch_level=preview2
+ruby_2.1.0_patch_level=rc1
 ruby_2.0.0_patch_level=p353
 ruby_1.9.3_patch_level=p484
 ruby_1.9.2_patch_level=p320
@@ -23,10 +23,14 @@ ruby_1.8.5_patch_level=p231
 rubygems_url=http://production.cf.rubygems.org/rubygems
 rubygems_repo_url=git://github.com/rubygems/rubygems.git
 rubygems_version=latest-2.1
-ree_rubygems_version=latest-2.0
+ree_1.8.6_rubygems_version=1.3.7
+ree_1.8.7_rubygems_version=latest-2.0
+ruby_1.8.4_rubygems_version=1.3.5
+ruby_1.8.5_rubygems_version=1.3.5
+ruby_1.8.6_rubygems_version=1.3.7
 ruby_1.8.7_rubygems_version=latest-2.0
 ruby_1.9.1_rubygems_version=latest-1.8
-ruby_head_rubygems_version=latest-2
+ruby_head_rubygems_version=head
 rbx_version=2.2.1
 rbx_1.0.0_patch_level=20100514
 rbx_1.0.1_patch_level=20100603

config/known

@@ -6,7 +6,7 @@
 [ruby-]1.9.3[-p484]
 [ruby-]2.0.0-p195
 [ruby-]2.0.0[-p353]
-[ruby-]2.1.0-preview2
+[ruby-]2.1.0-rc1
 [ruby-]2.1.0-head
 ruby-head
 

config/md5

@@ -380,6 +380,7 @@ ruby-2.0.0-rc1.tar.bz2=24cebdda11e01ff4889ac983cd7dc02c
 ruby-2.0.0-rc2.tar.bz2=e92420131bd7994513e0bf09a3e2a19b
 ruby-2.1.0-preview1.tar.bz2=d32d1ea23988399afadbd21c5a7a37fc
 ruby-2.1.0-preview2.tar.bz2=9d566a9b2d2e7e35ad6125e2a14ce672
+ruby-2.1.0-rc1.tar.bz2=cae095b90349b5b0f7026060cc3dd2c5
 ruby-enterprise-1.8.6-20080507.tar.gz=17e3c52e73e42809f57ad0000a6cb4ab
 ruby-enterprise-1.8.6-20080621.tar.gz=626fc3811eee2dc92ac27ea63d37a8b2
 ruby-enterprise-1.8.6-20080623.tar.gz=0bf8a3a93c6b37bb1260cc09b05e81fd

scripts/functions/environment

@@ -124,8 +124,10 @@ __rvm_ensure_has_environment_files()
 # Runs a command in a given env.
 __rvm_with()
 (
-  typeset rvm_internal_use_flag=1
-  typeset rvm_use_flag=0
+  export rvm_create_flag=1
+  export rvm_delete_flag=0
+  export rvm_internal_use_flag=1
+  export rvm_use_flag=0
   __rvm_use "$1" || return $?
   shift
   "$@" || return $?

scripts/functions/installer

@@ -134,14 +134,7 @@ load_installer()
   install_source_path="${install_source_path%/scripts}" # install -> scripts/install
 
   source "$install_source_path/scripts/initialize"
-  source "$install_source_path/scripts/functions/logging"
-  source "$install_source_path/scripts/functions/db"
-  source "$install_source_path/scripts/functions/support"
-  source "$install_source_path/scripts/functions/utility"
-  source "$install_source_path/scripts/functions/cleanup"
-  source "$install_source_path/scripts/functions/autolibs"
-  source "$install_source_path/scripts/functions/group"
-  source "$install_source_path/scripts/version"
+  source "$install_source_path/scripts/base"
 
   if [[ "$install_source_path/scripts" != "." && "$install_source_path/scripts" != "$PWD" ]]
   then __rvm_cd "$install_source_path"
@@ -382,7 +375,6 @@ save_custom_flags()
   typeset -a __variables
   __variables=(
     ^rvm_ignore_dotfiles_flag=
-    ^rvm_rubies_path=
   )
   typeset IFS="|"
   set | __rvm_grep -E "${__variables[*]}" > "${rvm_path:-}/user/custom_flags"
@@ -1219,31 +1211,40 @@ migrate_defaults()
 
 migrate_environments_and_wrappers()
 {
-  typeset environment_file wrappers_path new_path gemset_name
+  typeset environment_file wrappers_path new_path ruby_version
 
   for environment_file in "$rvm_path"/environments/*
   do
-    gemset_name="${environment_file##*/}"
-    new_path="$rvm_path/gems/${gemset_name}/environment"
+    ruby_version="${environment_file##*/}"
+    new_path="$rvm_path/gems/${ruby_version}/environment"
     if
       [[ -f "$environment_file" && ! -L "$environment_file" && -d "${new_path%/*}" && ! -e "$new_path" ]]
     then
-      rvm_out "    Migrating environment ${gemset_name} to use with 'gem-wrappers' gem."
+      rvm_out "    Migrating environment ${ruby_version} to use with 'gem-wrappers' gem."
       \mv "$environment_file" "$new_path" && \ln -s "$new_path" "$environment_file"
     fi
   done
 
   for wrappers_path in "$rvm_path"/wrappers/*
   do
-    gemset_name="${wrappers_path##*/}"
-    new_path="$rvm_path/gems/${gemset_name}/wrappers"
+    ruby_version="${wrappers_path##*/}"
+    new_path="$rvm_path/gems/${ruby_version}/wrappers"
     if
       [[ -d "$wrappers_path" && ! -L "$wrappers_path" && -d "${new_path%/*}" && ! -e "$new_path" ]]
     then
-      rvm_out "    Migrating wrappers ${gemset_name} to use with 'gem-wrappers' gem."
+      rvm_out "    Migrating wrappers ${ruby_version} to use with 'gem-wrappers' gem."
       \mv "$wrappers_path" "$new_path" && \ln -snf "$new_path" "$wrappers_path"
     fi
   done
+
+  grep -rl 'unset GEM_HOME' /home/mpapis/.rvm/gems/*/environment /home/mpapis/.rvm/environments/ 2>/dev/null |
+  while read environment_file
+  do
+    ruby_version="${environment_file%/environment}"
+    ruby_version="${ruby_version##*/}"
+    rvm_out "    Fixing environment for ${ruby_version}."
+    __rvm_with "${ruby_version}" __rvm_ensure_has_environment_files
+  done
 }
 
 record_ruby_configs()

scripts/functions/manage/rubinius

@@ -40,17 +40,33 @@ rubinius_install_detect_required_ruby()
   ruby="$(__rvm_mri_ruby "$ruby")"
 }
 
-rubinius_install_ensure_wrapper()
+rubinius_install_ensure_gem()
 {
-  typeset __binary=$1
-  shift
-  [[ -x "$rvm_wrappers_path/$ruby/${__binary}" ]] ||
-  {
-    if (( $# ))
-    then __rvm_log_command "install_${__binary}" "$rvm_ruby_string - #install ${__binary}" "$@" || return $?
-    fi
-    gem wrappers regenerate || return $?
-  }
+  __rvm_which "$1" >/dev/null &&
+  [[ -x "$rvm_wrappers_path/$ruby/$1" ]] ||
+  __rvm_log_command "install.${2:-$1}" "$ruby - #install gem ${2:-$1}" gem install ${2:-$1} &&
+  __rvm_which "$1" >/dev/null &&
+  [[ -x "$rvm_wrappers_path/$ruby/$1" ]] ||
+  return $?
+}
+
+rubinius_install_ensure_wrappers()
+{
+  [[ -x "$rvm_wrappers_path/$ruby/ruby" && -x "$rvm_wrappers_path/$ruby/gem" ]] ||
+    __rvm_log_command "gemset.wrappers.rubinius" "$ruby - #generating wrappers" \
+    run_gem_wrappers_regenerate ||
+    return $?
+  rubinius_install_ensure_gem rake || return $?
+  rubinius_install_ensure_gem bundle bundler || return $?
+}
+
+rubinius_install_setup_ruby()
+{
+  if [[ ${rvm_ignore_gemsets_flag:-0} -eq 0 ]]
+  then ruby="${ruby}@rubinius"
+  fi
+  __rvm_with "$ruby" rubinius_install_ensure_wrappers
+  __rvm_osx_ssl_certs_ensure_for_ruby "$rvm_wrappers_path/$ruby/ruby"
 }
 
 rubinius_install()
@@ -69,6 +85,7 @@ rubinius_install()
   __rvm_setup_compile_environment "${rvm_ruby_string}" || return $?
   __rvm_remove_rvm_from_path
   __rvm_conditionally_add_bin_path
+  rubinius_install_setup_ruby || return $?
 
   __rvm_fetch_ruby || return $?
 
@@ -94,28 +111,10 @@ rubinius_install()
   # Explicitly disabled
   (( ${rvm_llvm_flag:=1} )) || rvm_configure_flags+=( --disable-llvm )
 
-  if
-    [[ -f "Gemfile" && ${rvm_ignore_gemsets_flag:-0} -eq 0 ]]
-  then
-    ruby="${ruby}@rubinius"
-    (
-      typeset rvm_create_flag=1
-      typeset rvm_internal_use_flag=1
-      typeset rvm_use_flag=0
-      __rvm_use "$ruby"
-    )
-  fi
-  rvm_log "Using $ruby for $rvm_ruby_string installation"
-  rubinius_install_ensure_wrapper ruby
-  __rvm_osx_ssl_certs_ensure_for_ruby "$rvm_wrappers_path/$ruby/ruby"
-  rubinius_install_ensure_wrapper gem
-  rubinius_install_ensure_wrapper rake "$rvm_wrappers_path/$ruby/gem" install rake
   if
     [[ -f "Gemfile" ]]
   then
-    rubinius_install_ensure_wrapper bundle "$rvm_wrappers_path/$ruby/gem" install bundle
-    __rvm_log_command "bundle" "$rvm_ruby_string - #bundle install" \
-      "${rvm_ruby_make:-}$rvm_wrappers_path/$ruby/bundle" install ||
+    __rvm_log_command "bundle" "$ruby - #bundle install" "$rvm_wrappers_path/$ruby/bundle" install ||
       return $?
   fi
   if

scripts/functions/rubygems

@@ -85,24 +85,6 @@ rubygems_master_sha()
 
 rubygems_select_version_url()
 {
-  case "$version" in
-    latest|current)
-      case "$rvm_ruby_string" in
-        ruby-1.8*|ree-1.8*)
-          typeset _rbv
-          _rbv=${rvm_ruby_version##*.}
-          if (( _rbv <= 5 ))
-          then
-            version=1.3.5
-          elif (( _rbv == 6 ))
-          then
-            version=1.3.7
-          fi
-          ;;
-      esac
-      ;;
-  esac
-
   case "$version" in
     latest|current)
       version="$(__rvm_db "${rvm_ruby_string//-/_}_rubygems_version")"

scripts/functions/support

@@ -148,7 +148,7 @@ __rvm_sed_i()
     \mv -f "${_filename}.new" "${_filename}"
   } 2>&1 | rvm_debug_stream
 
-  if [[ -n "${_executable:-}" ]]
+  if [[ -n "${_executable:-}" && ! -x "${_filename}" ]]
   then chmod +x "${_filename}"
   fi
 }