rvm 0.1.38 → 0.1.39

data/scripts/gemsets

@@ -106,7 +106,7 @@ gemset_copy() {
       cp -Rf "$source_path/$dir" "$destination_path/"
     done
     $rvm_scripts_path/log "info" "Making gemset for $destination_ruby pristine."
-    $(rvm $destination_ruby ; gem pristine --all)
+    (rvm "$destination_ruby" ; gemset_pristine)
   else
     $rvm_scripts_path/log "error" "Gems directory does not exist for $source_path ($source_path)"
     return 1
@@ -331,7 +331,7 @@ gemset_prune() {
   mv "$temporary_cache_path" "$live_cache_path"
 }
 
-gem_pristine() {
+gemset_pristine() {
   gem pristine --all
 }
 
@@ -400,7 +400,7 @@ elif [[ "gemdir" = "$action" ]] || [[ "gempath" = "$action" ]] || [[ "gemhome" =
 elif [[ "install" = "$action" ]] ; then
   gem_install $*
 elif [[ "pristine" = "$action" ]] ; then
-  gem_pristine $*
+  gemset_pristine $*
 elif [[ "initial" = "$action" ]] ; then
   gemset_initial
 elif [[ "prune" = "$action" ]] ; then

data/scripts/info

@@ -25,12 +25,12 @@ info_system() {
 
 info_rvm() {
   rvm_info="$rvm_info\n  rvm:"
-  rvm_info="$rvm_info\n    type:         \"$(head -n 1 < <(type rvm))\""
   rvm_info="$rvm_info\n    version:      \"$(__rvm_version | tr "\n" ' ' | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')\""
   rvm_info="$rvm_info\n"
 }
 
 info_ruby() {
+  [[ "$(__rvm_environment_identifier)" == "system" ]] && return
   ruby=$(command -v ruby)
   if [[ $? -eq 0 ]] && [[ -x "$ruby" ]] ; then full_version="$($ruby -v)" ; fi
   rvm_info="$rvm_info\n  ruby:"
@@ -61,6 +61,7 @@ info_binaries() {
 
 info_environment() {
   rvm_info="$rvm_info\n  environment:"
+  rvm_info="$rvm_info\n    PATH:         \"$PATH\""
   rvm_info="$rvm_info\n    GEM_HOME:     \"$GEM_HOME\""
   rvm_info="$rvm_info\n    GEM_PATH:     \"$GEM_PATH\""
   rvm_info="$rvm_info\n    BUNDLE_PATH:  \"$BUNDLE_PATH\""

data/scripts/initialize

@@ -11,12 +11,17 @@ if [[ ! -z "$rvm_archflags" ]] ; then rvm_make_flags_flag=1 ; fi
 rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
 rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
 
+if [[ "root" = "$(whoami)" ]] ; then
+  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+else
+  rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+fi
+
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_repo_path="${rvm_repo_path:-"$rvm_path/repos"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_docs_path="${rvm_docs_path:-"$rvm_path/docs"}"
-rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_gemsets_path="${rvm_gemsets_path:-"$rvm_path/gemsets"}"
 rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"

data/scripts/install

@@ -79,7 +79,13 @@ source_path="${source_path:-$cwd}"
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
-rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+
+if [[ "root" = "$(whoami)" ]] ; then
+  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+else
+  rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+fi
+
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"

data/scripts/manage

@@ -55,7 +55,10 @@ __rvm_install_source() {
       $rvm_scripts_path/log "error" "There has been an error while configuring. Aborting the installation." ; __rvm_pushpop ; return $result
     fi
   elif [[ -s ./configure ]] ; then
-    __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
+    # REE stores configure flags differently for head vs. the distributed release.
+    if [[ "ree" != "$rvm_ruby_interpreter" ]]; then
+      __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
+    fi
     __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
     result=$? ; if [[ "$result" -gt 0 ]] ; then
       $rvm_scripts_path/log "error" "There has been an error while running configure. Aborting the installation." ; __rvm_pushpop ; return $result
@@ -66,7 +69,19 @@ __rvm_install_source() {
 
   if [[ ! -z "$rvm_ruby_patch" ]] ; then
     for patch in $(echo $rvm_ruby_patch | tr ',' ' ') ; do
-      __rvm_run "patch" "patch -p0 -f < $patch" "Applying patch '$patch'..."
+      # detecting patch prefix (see '-p' option desc for 'patch')
+      # patch prefix is separated from patch path with '%' symbol
+      patch_prefix_separator='%'
+      # default prefix is 0
+      rvm_patch_prefix=0
+      # checking, if the patch file path has a prefix separator
+      patch_has_prefix=$(echo $patch | grep -q ${patch_prefix_separator}; echo $?)
+      if [[ "x${patch_has_prefix}" = "x0"  ]]; then
+        # so, if it has...
+        rvm_patch_prefix=$(echo $patch | cut -d ${patch_prefix_separator} -f 2)
+        patch=$(echo $patch | cut -d ${patch_prefix_separator} -f 1)
+      fi
+      __rvm_run "patch" "patch -p${rvm_patch_prefix} -f < $patch" "Applying patch '$patch'..."
       if [[ $? -gt 0 ]] ; then
         $rvm_scripts_path/log "error" "Patch $patch did not apply cleanly... back to the patching board :(" ; exit 1
       fi
@@ -101,7 +116,7 @@ __rvm_install_source() {
 }
 
 __rvm_install_ruby() {
-  
+
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$RUBYOPT" ]] ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
@@ -271,16 +286,7 @@ RubyWrapper
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
         #rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
-        if [[ ! -d "$rvm_ruby_repo_path" ]] || [[ ! -d "$rvm_ruby_repo_path/.git" ]] ; then
-          rm -rf "$rvm_ruby_repo_path" "$rvm_ruby_src_path"
-          builtin cd "$rvm_home"
-          __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_url"
-          __rvm_run "rbx.copy" "cp -R \"$rvm_ruby_repo_path\" \"$rvm_ruby_src_path\"" "Copying from repo to source..."
-          builtin cd "$rvm_ruby_src_path"
-        else
-          builtin cd "$rvm_ruby_src_path"
-          __rvm_run "rbx.repo" "git pull origin master" "Pulling from origin master"
-        fi
+        __rvm_fetch_from_github "rbx"
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while fetching the rbx git repo. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
@@ -290,8 +296,10 @@ RubyWrapper
 
       __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
 
+      export ruby="$rvm_bin_path/ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level")"
+
       rvm_ruby_configure_flags="${rvm_ruby_configure_flags:-"--skip-system"}"
-      rvm_ruby_configure="ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags" ; message="Configuring rbx"
+      rvm_ruby_configure="$ruby configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags" ; message="Configuring rbx"
       if [[ "$rvm_llvm_flag" = "0" ]] ; then
         rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
       else
@@ -305,25 +313,26 @@ RubyWrapper
       fi
 
       if [[ "$rvm_trace_flag" -eq 1 ]] ; then
-        rvm_ruby_make="$rvm_bin_path/ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level") -S rake install --trace" ; message="Compiling rbx (with --trace)"
+        rvm_ruby_make="$ruby -S rake install --trace" ; message="Compiling rbx (with --trace)"
       else
-        rvm_ruby_make="$rvm_bin_path/ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level") -S rake install" ; message="Compiling rbx"
+        rvm_ruby_make="$ruby -S rake install" ; message="Compiling rbx"
       fi
       __rvm_run "rake" "$rvm_ruby_make" "$message"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
         $rvm_scripts_path/log "error" "There has been an error while running '$rvm_ruby_configure'. Aborting the installation." ; __rvm_pushpop ; return $result
       fi
 
+      unset ruby
+
       # Symlink rubinius wrappers
       ln -fs "$rvm_ruby_home/bin/rbx" "$rvm_ruby_home/bin/irb"
       ln -fs "$rvm_ruby_home/bin/rbx" "$rvm_ruby_home/bin/ruby"
       # Install a wrapper around gem.
       file_name="$rvm_ruby_home/bin/gem"
-      if [[ ! -f "$file_name" ]]; then
-        echo "#!/usr/bin/env bash" > "$file_name"
-        echo "exec $rvm_ruby_home/bin/rbx gem \"\$@\"" >> "$file_name"
-        [[ -f "$file_name" ]] && chmod +x "$file_name"
-      fi
+      cp -f "$rvm_ruby_home/lib/bin/gem.rb" "$file_name"
+
+      __rvm_inject_ruby_shebang "$file_name"
+      [[ -f "$file_name" ]] && chmod +x "$file_name"
       unset file_name
 
       binaries="erb ri rdoc"
@@ -562,17 +571,7 @@ RubyWrapper
 
       rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
 
-      builtin cd $rvm_src_path
-
-      if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
-        rm -rf $rvm_ruby_src_path $rvm_ruby_repo_path
-        __rvm_run "mput.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_url"
-        __rvm_run "mput.copy" "cp -R \"$rvm_ruby_repo_path\" \"$rvm_ruby_src_path\"" "Copying from repo to source..."
-        builtin cd $rvm_ruby_src_path
-      else
-        builtin cd $rvm_ruby_src_path
-        __rvm_run "mput.repo" "git pull origin trunk" "Pulling from origin trunk"
-      fi
+      __rvm_fetch_from_github "mput" "trunk"
 
       if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
         if command -v autoconf &> /dev/null ; then
@@ -639,15 +638,27 @@ RubyWrapper
     *) $rvm_scripts_path/log "fail" "Ruby interpreter '$rvm_ruby_interpreter' is not known."
 
   esac
-  
-  # Import the initial gemsets.
-  (source $rvm_scripts_path/rvm; rvm use "$rvm_ruby_string"; $rvm_scripts_path/gemsets initial)
 
   rvm_hook="after_install" ; source $rvm_scripts_path/hook
 
   if [[ ! -z "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
 
+__rvm_fetch_from_github() {
+  rm -rf "$rvm_ruby_src_path"
+  if [[ ! -d "$rvm_ruby_repo_path/.git" ]] ; then
+    rm -rf "$rvm_ruby_repo_path"
+    builtin cd "$rvm_home"
+    __rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_url"
+  else
+    local branch="${2:-"master"}"
+    builtin cd "$rvm_ruby_repo_path"
+    __rvm_run "$1.repo" "git pull origin $branch" "Pulling from origin $branch"
+  fi
+  __rvm_run "$1.copy" "cp -R \"$rvm_ruby_repo_path\" \"$rvm_ruby_src_path\"" "Copying from repo to source..."
+  builtin cd "$rvm_ruby_src_path"
+}
+
 __rvm_fetch_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
@@ -697,7 +708,7 @@ __rvm_fetch_ruby() {
         builtin cd $rvm_ruby_repo_path
         if [[ -z "$rvm_ruby_revision" ]] ; then
           $rvm_scripts_path/log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-          git pull origin master
+          git pull origin master --force
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to update the source from the remote repository. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
@@ -712,8 +723,9 @@ __rvm_fetch_ruby() {
           fi
         fi
       else
+        rm -rf "$rvm_ruby_repo_path"
         $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path
+        git clone --depth 1 "$rvm_ruby_repo_url" "$rvm_ruby_repo_path"
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to fetch the repository. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
@@ -760,7 +772,8 @@ __rvm_fetch_ruby() {
 
     fi
     $rvm_scripts_path/log "info" "Copying from repo to src path..."
-    cp -r "$rvm_ruby_repo_path" "$rvm_ruby_src_path"
+    rm -rf "$rvm_ruby_src_path"
+    cp -R "$rvm_ruby_repo_path" "$rvm_ruby_src_path"
   fi
 }
 
@@ -768,8 +781,7 @@ __rvm_check_default() {
   default_ruby_interpreter="$(rvm alias show default 2>/dev/null | awk -F"${rvm_gemset_seperator:-"@"}" '{print $1}')"
   current_ruby_interpreter="$(echo "$rvm_ruby_string" | awk -F"${rvm_gemset_seperator:-"@"}" '{print $1}')"
   if [[ -n "$current_ruby_interpreter" && "$current_ruby_interpreter" == "$default_ruby_interpreter" ]]; then
-    # In a new subshell, set the default interpeter to system.
-    (source $rvm_scripts_path/rvm; rvm use system --default)
+    __rvm_run_with_env 'default.restore'  'system' 'rvm use system --default' 'Removing default ruby interpreter'
   fi
   unset default_ruby_interpreter current_ruby_interpreter
 }
@@ -818,16 +830,56 @@ __rvm_remove_ruby() {
 
     done ; unset dir
     __rvm_remove_gemsets
+    __rvm_remove_archives
+    __rvm_remove_aliases
+    __rvm_remove_wrappers
+    __rvm_remove_environments
   else
-    $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
+    $rvm_scripts_path/log "fail" "Cannot remove unknown package '$rvm_ruby_string'"
   fi ; unset rvm_remove_flag
 }
 
 __rvm_remove_gemsets() {
+  $rvm_scripts_path/log "info" "Removing $rvm_ruby_string gemsets..."
   if [[ ! -z "$rvm_gems_flag" ]] ; then
-    if [[ -d "$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}" ]] ; then
-      rm -rf $rvm_gems_path/${rvm_ruby_string}*
-    fi
+    gemsets="$rvm_gems_path/$rvm_ruby_string $(ls -d "${rvm_gems_path}"/* | awk '/'$rvm_ruby_string'@/')"
+    for gemset in $gemsets ; do
+      if [[ -d "$gemset" ]] ; then
+        rm -rf "$gemset"
+      fi
+    done ; unset gemset gemsets
+  fi
+}
+
+__rvm_remove_wrappers() {
+  $rvm_scripts_path/log "info" "Removing $rvm_ruby_string wrappers..."
+  wrappers="$rvm_wrappers_path/$rvm_ruby_string $(ls -d "$rvm_wrappers_path"/* | awk '/'$rvm_ruby_string'@/')"
+  for wrapper in $wrappers ; do
+    rm -rf "$wrapper"
+  done ; unset wrapper wrappers
+}
+__rvm_remove_environments() {
+  $rvm_scripts_path/log "info" "Removing $rvm_ruby_string environments..."
+  environments="$rvm_environments_path/$rvm_ruby_string $(ls -d "$rvm_environments_path"/* | awk '/'$rvm_ruby_string'@/')"
+  for environment in $environments ; do
+    rm -rf "$environment"
+  done ; unset environment environments
+}
+__rvm_remove_aliases() {
+  $rvm_scripts_path/log "info" "Removing $rvm_ruby_string aliases..."
+  aliases=$(awk '/'$rvm_ruby_string'/' $rvm_config_path/alias)
+  for alias_name in $aliases ; do
+    # Remove from alias key-value store
+    $rvm_scripts_path/db $rvm_config_path/alias $alias_name delete
+    # Remove the place holding symlink
+    rm -f $rvm_rubies_path/$alias_name
+  done ; unset alias_name aliases
+}
+
+__rvm_remove_archives() {
+  $rvm_scripts_path/log "info" "Removing $rvm_ruby_string archives..."
+  if [[ ! -z "$rvm_archive_flag" ]] ; then
+    rm -f $rvm_archives_path/${rvm_ruby_package_file}.${rvm_archive_extension}
   fi
 }
 
@@ -849,25 +901,26 @@ __rvm_post_install() {
     done ; unset binary binaries
   fi
 
+  # Import the initial gemsets.
+  __rvm_run_with_env "gemsets.initial" "$rvm_ruby_string" 'rvm gemset initial' "Importing initial gems..."
+
   __rvm_irbrc
   __rvm_generate_default_docs
 
   if [[ -n "$rvm_ruby_aliases" ]]; then
     $rvm_scripts_path/log "info" "Setting up aliases for $rvm_ruby_string"
     for ruby_alias in $rvm_ruby_aliases; do
-      $rvm_scripts_path/log "info" "Aliasing $rvm_ruby_string to $ruby_alias"
+      $rvm_scripts_path/log info "Aliasing $rvm_ruby_string to $ruby_alias"
       $rvm_scripts_path/alias delete "$ruby_alias" > /dev/null 2>&1
       $rvm_scripts_path/alias create "$ruby_alias" "$rvm_ruby_string" > /dev/null 2>&1
     done
     unset rvm_ruby_aliases ruby_alias
   fi
-
 }
 
 __rvm_generate_default_docs() {
   if [[ "$rvm_docs_flag" = "1" && "$rvm_ruby_interpreter" != "macruby" ]]; then
-    $rvm_scripts_path/log "info" "Attempting to generate ri docs..."
-    (source $rvm_scripts_path/rvm; rvm use "$rvm_ruby_string"; rvm docs generate-ri) > ~/rvm-install-docs 2>&1
+    __rvm_run_with_env "docs.generate" "$rvm_ruby_string" "rvm docs generate-ri" "Attempting to generate ri documentation..."
   fi
 }
 
@@ -906,7 +959,8 @@ __rvm_rubygems_setup() {
     ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/jruby"
   else
     $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_string..."
-    rvm_rubygems_version=$(__rvm_db "rubygems_version")
+    rvm_rubygems_version="$(__rvm_db "${rvm_ruby_interpreter}_rubygems_version")"
+    rvm_rubygems_version="${rvm_rubygems_version:-"$(__rvm_db "rubygems_version")"}"
     rvm_rubygems_url=$(__rvm_db "rubygems_${rvm_rubygems_version}_url")
     rvm_gem_package_name="rubygems-$rvm_rubygems_version"
     rvm_gem_url="$rvm_rubygems_url/$rvm_gem_package_name.tgz"

data/scripts/match

@@ -1,16 +1,5 @@
 #!/usr/bin/env bash
 
-if [[ -z "$1" ]] || [[ -z "$2" ]] ; then
-  exit 1
-fi
+if [[ -z "$1" ]] || [[ -z "$2" ]] ; then exit 1 ; fi
 
-if [[ ! -z "$BASH_VERSION" ]] && [[ ${BASH_VERSION:0:1} -gt 2 ]] ; then
-  [[ "$1" =~ $2 ]]
-  exit $?
-else
-  if echo "$1" | grep -q "${2}" ; then
-    exit 0
-  else
-    exit 1
-  fi
-fi
+if [[ -n "$(echo "$1" |  awk "/${2}/")" ]] ; then exit 0 ; else exit 1 ; fi

data/scripts/notes

@@ -9,7 +9,7 @@ if [[ "Linux" = "$system" ]] ; then
   done
   printf "\n\n$(tput setaf 2)Notes for ${system} $release$(tput sgr0)\n"
 
-  rvm_apt_get_binary="$(command -v aptitude)"
+  rvm_aptitude_binary="$(command -v aptitude)"
   rvm_emerge_binary="$(command -v emerge)"
   rvm_pacman_binary="$(command -v pacman)"
   rvm_yum_binary="$(command -v yum)"
@@ -17,12 +17,12 @@ if [[ "Linux" = "$system" ]] ; then
   printf "\n    $item curl is required.\n"
   printf "\n    $item patch is required (for ree, some ruby head's).\n"
   printf "\n    $item If you wish to install rbx and/or any MRI head (eg. 1.9.2-head) then you must install and use rvm 1.8.7 first.\n"
-  if [[ ! -z "$rvm_apt_get_binary" ]] ; then
+  if [[ ! -z "$rvm_aptitude_binary" ]] ; then
     printf "\n    $item For JRuby (if you wish to use it) you will need:"
     printf "\n       $ aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk"
 
-    printf "\n    $item For MRI & ree (if you wish to use it) you will need:"
-    printf "\n       $ aptitude install curl bison build-essential zlib1g zlib1g-dev libssl-dev libreadline5-dev libreadline6-dev libxml2-dev git-core subversion autoconf"
+    printf "\n    $item For MRI & ree (if you wish to use it) you will need (depending on what you are installing):"
+    printf "\n       $ aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim libsqlite3-0 libsqlite3-dev sqlite3 libreadline5-dev libreadline6-dev libxml2-dev git-core subversion autoconf"
 
     printf "\n    $item For IronRuby (if you wish to use it) you will need:"
     printf "\n       $ aptitude install curl mono-2.0-devel"

data/scripts/package

@@ -86,14 +86,21 @@ curl() {
 }
 
 openssl() {
-  if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
-    export openssl_os="os/compiler darwin64-x86_64-cc"
-  else
-    export openssl_os="os/compiler darwin-i386-cc"
-  fi
   package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
   package_url="http://www.openssl.org/source"
-  configure="./config --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
+  if [[ "Darwin" = "$(uname)" ]] ; then
+    if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
+      export openssl_os="os/compiler darwin64-x86_64-cc"
+    else
+      export openssl_os="os/compiler darwin-i386-cc"
+    fi
+    configure_command="./Configure"
+    patches="$rvm_patches_path/$package/Makefile.org.patch,$rvm_patches_path/$package/crypto-Makefile.patch"
+
+  else
+    configure_command="./config"
+  fi
+  configure="$configure_command $openssl_os -I$rvm_usr_path/include -L$rvm_usr_path/lib --prefix=$rvm_usr_path zlib no-asm no-krb5 shared"
   install_package
 }
 

data/scripts/rubygems

@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+
+source $rvm_scripts_path/initialize
+source $rvm_scripts_path/utility
+source $rvm_scripts_path/selector
+
+result=0
+
+__rvm_select
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+
+rubygems_setup() {
+  unset RUBYOPT
+  if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
+    install=0
+  elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
+    install=0
+  elif [[ -n "$(echo "$rvm_ruby_string" | awk '/^rbx|jruby|rubinius/')" ]]; then
+    install=0
+  else
+    install=1
+  fi
+
+  if [[ "$install" -eq 0 ]] ; then
+    $rvm_scripts_path/log "error" "Cannot switch to ${version} for this interpreter."
+    exit 1
+  else
+    $rvm_scripts_path/log "info" "Removing old Rubygems files..."
+    rubygems_dir="$(ruby -rrbconfig -e "puts Config::CONFIG.values_at('sitelibdir','vendorlibdir').detect {|path| File.directory?(File.join(path, 'rubygems')) }.to_s")"
+    if [[ -n "$rubygems_dir" && -d "$rubygems_dir" ]]; then
+      # Remove common files installed by ruby gems.
+      rm -rf "${rubygems_dir}/ubygems.rb" "${rubygems_dir}/rubygems.rb" "${rubygems_dir}/rubygems" "${rubygems_dir}/gauntlet_rubygems.rb"
+    fi
+
+    $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_string..."
+    rvm_rubygems_version="$version"
+    rvm_gem_package_name="rubygems-$rvm_rubygems_version"
+    rvm_rubygems_url=$(__rvm_db "rubygems_${rvm_rubygems_version}_url")
+    rvm_gem_url="$rvm_rubygems_url/$rvm_gem_package_name.tgz"
+
+    # Sanity check... If setup.rb is missing from the rubygems source path,
+    # something went wrong. Cleanup, aisle 3!
+    if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
+      rm -rf "$rvm_src_path/$rvm_gem_package_name"
+    fi
+
+    if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
+      $rvm_scripts_path/log "info" "Retrieving $rvm_gem_package_name"
+      $rvm_scripts_path/fetch "$rvm_gem_url"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "There has been an error while trying to fetch the source. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
+      mkdir -p "$rvm_src_path/$rvm_gem_package_name"
+      __rvm_run "rubygems.extract" "cat $rvm_archives_path/$rvm_gem_package_name.tgz | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
+    fi
+
+    builtin cd "$rvm_src_path/$rvm_gem_package_name"
+
+    __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
+    result=$?
+    if [[ "$result" == 0 ]] ; then
+      $rvm_scripts_path/log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
+    else
+      $rvm_scripts_path/log "warning" "Installation of rubygems $rvm_ruby_package_name did not complete successfully."
+    fi
+
+    if [[ ! -z "$rvm_major_version" ]] ; then
+      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
+  fi
+
+  # Add ruby's gem path to ruby's lib direcotry.
+  mkdir -p "$(dirname $ruby_lib_gem_path)"
+
+  if [[ -d "$ruby_lib_gem_path" ]] ; then rm -rf "$ruby_lib_gem_path" ; fi
+
+  ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
+
+  unset ruby_lib_gem_path
+}
+
+if ! command -v ruby > /dev/null ; then
+  $rvm_scripts_path/log "error" "'ruby' was not found, cannot install rubygems unless ruby is present (Do you have an RVM ruby installed & selected?)"
+  exit 1
+fi
+
+#
+# rvm rubygems use X
+#
+if [[ $# -gt 0 ]] ; then
+  version="$1" ; shift
+  args=$(echo "$@" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+else
+  $rvm_scripts_path/log "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
+  exit 1
+fi
+
+rubygems_setup
+
+exit $result