rvm 1.0.20 → 1.0.21

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 20
+:patch: 21

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.20"
+  s.version = "1.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]

data/scripts/cd

@@ -50,12 +50,14 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
     # function returns that functionality.
     _rvm_cd_complete ()
     {
-      local directory current matches item index
+      local directory current matches item index sep
+      sep="${IFS}"
+      declare -x IFS=$'\n'
       COMPREPLY=()
       current="${COMP_WORDS[COMP_CWORD]}"
       if [[ -n "$CDPATH" && ${current:0:1} != "/" ]] ; then
         index=0
-        for directory in $(printf "$CDPATH" | tr -s ':' ' ') ; do
+        for directory in $(printf "%s" "$CDPATH" | tr -s ':' ' ') ; do
           for item in $( compgen -d "$directory/$current" ) ; do
             COMPREPLY[index++]=${item#$directory/}
           done
@@ -63,6 +65,7 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       else
         COMPREPLY=( $(compgen -d ${current}) )
       fi
+      declare -x IFS="${sep}";
     }
     complete -o bashdefault -o default -o filenames -o dirnames -o nospace -F _rvm_cd_complete cd
 

data/scripts/manage

@@ -1179,8 +1179,10 @@ RubyWrapper
         "a ruby interpreter to install must be specified and not simply 'default'."
     ;;
 
-    *) "$rvm_path/scripts/log" "fail" \
-      "Ruby interpreter '$rvm_ruby_interpreter' is not known."
+    *)
+      "$rvm_path/scripts/log" "fail" \
+        "Either the ruby interpreter is unknown or there was an error!."
+    ;;
 
   esac
 

data/scripts/selector

@@ -14,7 +14,9 @@ __rvm_select()
     [[ -n "${rvm_ruby_name:-""}" ]]        && rvm_ruby_name="$rvm_ruby_string-n$rvm_ruby_name"
   fi
 
-  __rvm_ruby_string
+  if ! __rvm_ruby_string ; then
+    return $?
+  fi
 
   rvm_archive_extension="tar.gz"
 
@@ -524,9 +526,22 @@ __rvm_ruby_string()
         ;;
 
       [[:digit:]]\.[[:digit:]]*)
-        rvm_ruby_version="$string"
-        rvm_ruby_revision=""
-        rvm_ruby_tag=""
+
+        case "$string" in
+
+          0.*|1.*)
+            rvm_ruby_version="$string"
+            rvm_ruby_revision=""
+            rvm_ruby_tag=""
+            ;;
+
+          *)
+            "$rvm_path/scripts/log" "error" \
+              "Unknown ruby interpreter version: '$string'"
+            return 1
+            ;;
+          esac
+
         ;;
 
       p[[:digit:]]*)
@@ -596,7 +611,7 @@ __rvm_ruby_string()
 
     *)
       "$rvm_path/scripts/log" "error" \
-        "Unknown ruby string component: '$string'"
+        "Unknown ruby interpreter string component: '$string'"
       return 1
       ;;
     esac

data/scripts/utility

@@ -364,7 +364,7 @@ __rvm_nuke_rvm_variables()
 __rvm_unset_ruby_variables()
 {
   # unset rvm_ruby_flag $(env | awk -F= '/^rvm_ruby_/{printf $1" "}')
-  unset rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_ruby_load_path rvm_ruby_require rvm_head_flag rvm_ruby_package_file rvm_ruby_configure
+  unset rvm_ruby_string rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_ruby_load_path rvm_ruby_require rvm_head_flag rvm_ruby_package_file rvm_ruby_configure
 }
 
 # TODO: Should be able to...
@@ -381,7 +381,7 @@ __rvm_cleanse_variables()
     unset rvm_gemset_name
   fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_patch_names rvm_clang_flag rvm_install_arguments rvm_dump_environment_flag rvm_ruby_alias
+  unset rvm_ruby_string rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_patch_names rvm_clang_flag rvm_install_arguments rvm_dump_environment_flag rvm_ruby_alias
 }
 
 # Returns the first 1.8.7-compatible (partly) ruby for use

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 1
   - 0
-  - 20
-  version: 1.0.20
+  - 21
+  version: 1.0.21
 platform: ruby
 authors: 
 - Wayne E. Seguin