Skip to content

Commit

Permalink
fix warning issues, update #883
Browse files Browse the repository at this point in the history
  • Loading branch information
@mpapis
mpapis committed Apr 5, 2012
1 parent 13575ab commit c59455b
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 32 deletions.
20 changes: 15 additions & 5 deletions scripts/cli
View file
Original file line number Diff line number Diff line change
Expand Up @@ -993,10 +993,9 @@ Please do one of the following:

gemset)

if [[ ${rvm_use_flag:-0} -eq 1 ]] ; then
__rvm_gemset_select_cli &&
rvm_log "Using ${GEM_HOME%@*} with gemset ${rvm_gemset_name:-default}" &&
__rvm_gemset_use
if [[ ${rvm_use_flag:-0} -eq 1 ]]
then
__rvm_gemset_use
else
export rvm_ruby_strings

Expand Down Expand Up @@ -1027,7 +1026,18 @@ Please do one of the following:
rvm_action="rake" ; __rvm_do
;;

fetch|uninstall|remove|reinstall)
remove)
export rvm_path
if [[ -n "${rvm_ruby_strings}" ]]
then
"$rvm_scripts_path"/manage "$rvm_action" "${rvm_ruby_strings//*-- }"
else
"$rvm_scripts_path"/manage "$rvm_action"
fi
rvm_ruby_string=default
__rvm_use
;;
fetch|uninstall|reinstall)
export rvm_path
if [[ -n "${rvm_ruby_strings}" ]]
then
Expand Down
8 changes: 4 additions & 4 deletions scripts/functions/environment
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ __rvm_run_with_env()
__rvm_setup()
{
# NOTE: the same set is located below - maker kjfdngkjd
export rvm_head_flag rvm_ruby_selected_flag rvm_user_install_flag rvm_path_flag rvm_static_flag rvm_default_flag rvm_loaded_flag rvm_llvm_flag rvm_skip_autoreconf_flag rvm_18_flag rvm_19_flag rvm_force_autoconf_flag rvm_autoconf_flags rvm_dump_environment_flag rvm_verbose_flag rvm_debug_flag rvm_trace_flag rvm_pretty_print_flag rvm_create_flag rvm_remove_flag rvm_gemdir_flag rvm_reload_flag rvm_auto_reload_flag rvm_ignore_gemsets_flag
export rvm_head_flag rvm_ruby_selected_flag rvm_user_install_flag rvm_path_flag rvm_static_flag rvm_default_flag rvm_loaded_flag rvm_llvm_flag rvm_skip_autoreconf_flag rvm_18_flag rvm_19_flag rvm_force_autoconf_flag rvm_autoconf_flags rvm_dump_environment_flag rvm_verbose_flag rvm_debug_flag rvm_trace_flag rvm_pretty_print_flag rvm_create_flag rvm_remove_flag rvm_gemdir_flag rvm_reload_flag rvm_auto_reload_flag rvm_ignore_gemsets_flag rvm_install_on_use_flag
export rvm_gems_cache_path rvm_gems_path rvm_man_path rvm_ruby_gem_path rvm_ruby_log_path rvm_ruby_load_path rvm_gems_cache_path rvm_archives_path rvm_docs_path rvm_environments_path rvm_examples_path rvm_gems_path rvm_gemsets_path rvm_help_path rvm_hooks_path rvm_lib_path rvm_log_path rvm_patches_path rvm_repos_path rvm_rubies_path rvm_scripts_path rvm_src_path rvm_tmp_path rvm_user_path rvm_usr_path rvm_wrappers_path rvm_externals_path
export rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc 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_tag rvm_ruby_sha rvm_ruby_version rvm_ruby_require rvm_ruby_package_file rvm_ruby_name rvm_ruby_name rvm_ruby_args rvm_ruby_user_tag rvm_ruby_patch detected_rvm_ruby_name
export __rvm_env_loaded next_token rvm_error_message rvm_gemset_name rvm_parse_break rvm_token rvm_action rvm_export_args rvm_gemset_separator rvm_expanding_aliases rvm_architectures rvm_patch_names rvm_tar_command rvm_tar_options rvm_ree_options rvm_patch_original_pwd rvm_project_rvmrc rvm_archive_extension rvm_autoinstall_bundler_flag rvm_codesign_identity
export __rvm_env_loaded next_token rvm_error_message rvm_gemset_name rvm_parse_break rvm_token rvm_action rvm_export_args rvm_gemset_separator rvm_expanding_aliases rvm_architectures rvm_patch_names rvm_tar_command rvm_tar_options rvm_ree_options rvm_patch_original_pwd rvm_project_rvmrc rvm_archive_extension rvm_autoinstall_bundler_flag rvm_codesign_identity rvm_expected_gemset_name

# Setup only on first load.
if (( __rvm_env_loaded != 1 ))
Expand Down Expand Up @@ -303,10 +303,10 @@ __rvm_teardown()
# a corrupt PATH, breaking the RVM installation.
#
# NOTE: the same set is located above - maker kjfdngkjd
unset rvm_head_flag rvm_ruby_selected_flag rvm_user_install_flag rvm_path_flag rvm_static_flag rvm_default_flag rvm_loaded_flag rvm_llvm_flag rvm_skip_autoreconf_flag rvm_18_flag rvm_19_flag rvm_force_autoconf_flag rvm_autoconf_flags rvm_dump_environment_flag rvm_verbose_flag rvm_debug_flag rvm_trace_flag rvm_pretty_print_flag rvm_create_flag rvm_remove_flag rvm_gemdir_flag rvm_reload_flag rvm_auto_reload_flag rvm_ignore_gemsets_flag
unset rvm_head_flag rvm_ruby_selected_flag rvm_user_install_flag rvm_path_flag rvm_static_flag rvm_default_flag rvm_loaded_flag rvm_llvm_flag rvm_skip_autoreconf_flag rvm_18_flag rvm_19_flag rvm_force_autoconf_flag rvm_autoconf_flags rvm_dump_environment_flag rvm_verbose_flag rvm_debug_flag rvm_trace_flag rvm_pretty_print_flag rvm_create_flag rvm_remove_flag rvm_gemdir_flag rvm_reload_flag rvm_auto_reload_flag rvm_ignore_gemsets_flag rvm_install_on_use_flag
unset rvm_gems_cache_path rvm_gems_path rvm_man_path rvm_ruby_gem_path rvm_ruby_log_path rvm_ruby_load_path rvm_gems_cache_path rvm_archives_path rvm_docs_path rvm_environments_path rvm_examples_path rvm_gems_path rvm_gemsets_path rvm_help_path rvm_hooks_path rvm_lib_path rvm_log_path rvm_patches_path rvm_repos_path rvm_rubies_path rvm_scripts_path rvm_src_path rvm_tmp_path rvm_user_path rvm_usr_path rvm_wrappers_path rvm_externals_path
unset rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc 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_tag rvm_ruby_sha rvm_ruby_version rvm_ruby_require rvm_ruby_package_file rvm_ruby_name rvm_ruby_name rvm_ruby_args rvm_ruby_user_tag rvm_ruby_patch detected_rvm_ruby_name
unset __rvm_env_loaded next_token rvm_error_message rvm_gemset_name rvm_parse_break rvm_token rvm_action rvm_export_args rvm_gemset_separator rvm_expanding_aliases rvm_architectures rvm_patch_names rvm_tar_command rvm_tar_options rvm_ree_options rvm_patch_original_pwd rvm_project_rvmrc rvm_archive_extension rvm_autoinstall_bundler_flag rvm_codesign_identity
unset __rvm_env_loaded next_token rvm_error_message rvm_gemset_name rvm_parse_break rvm_token rvm_action rvm_export_args rvm_gemset_separator rvm_expanding_aliases rvm_architectures rvm_patch_names rvm_tar_command rvm_tar_options rvm_ree_options rvm_patch_original_pwd rvm_project_rvmrc rvm_archive_extension rvm_autoinstall_bundler_flag rvm_codesign_identity rvm_expected_gemset_name

if builtin command -v __rvm_cleanup_download >/dev/null 2>&1
then
Expand Down
15 changes: 12 additions & 3 deletions scripts/selector
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,6 @@ __rvm_select()
1|3|4)
return 1
;;
2)
rvm_warn "Gemset doesn't exist, proceeding with default gemset"
;;
esac

rvm_ruby_selected_flag=1
Expand Down Expand Up @@ -457,6 +454,18 @@ __rvm_use()
fi
fi

if [[ ! -d "$rvm_ruby_gem_home" || -n "${rvm_expected_gemset_name}" ]]
then
if (( ${rvm_gemset_create_on_use_flag:=0} == 1 || ${rvm_create_flag:=0} == 1 ))
then
rvm_warn "gemset $rvm_gemset_name is not existing, creating."
"$rvm_scripts_path/gemsets" create "$rvm_gemset_name"
else
rvm_error "Gemset '${rvm_expected_gemset_name}' does not exist, 'rvm gemset create ${rvm_expected_gemset_name}' first, or append '--create'."
return 2
fi
fi

export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
GEM_HOME="$rvm_ruby_gem_home"
GEM_PATH="$rvm_ruby_gem_path"
Expand Down
28 changes: 8 additions & 20 deletions scripts/selector_gemsets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ __rvm_gemset_select_validation()
then
if (( ${rvm_gemset_create_on_use_flag:=0} == 0 && ${rvm_create_flag:=0} == 0 && ${rvm_delete_flag:=0} == 0 ))
then
rvm_error "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
rvm_expected_gemset_name="${rvm_gemset_name}"
rvm_gemset_name=""
__rvm_gemset_select_only
return 2
Expand Down Expand Up @@ -130,29 +130,17 @@ __rvm_gemset_select()
# Use a gemset specified by 'rvm_ruby_gem_home'
__rvm_gemset_use()
{
if [[ -z "${rvm_ruby_gem_home:-}" ]]
if __rvm_gemset_select_cli
then
rvm_error "Gemset was not given.\n Usage:\n rvm gemset use <gemsetname>\n"
return 1
fi

if [[ ! -d "$rvm_ruby_gem_home" ]]
then
if (( ${rvm_gemset_create_on_use_flag:=0} == 1 || ${rvm_create_flag:=0} == 1 ))
if [[ -t 0 ]] && (( ${rvm_verbose_flag:=0} == 1 ))
then
"$rvm_scripts_path/gemsets" create "$rvm_gemset_name"
else
rvm_error "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
return 1
rvm_log "Using $rvm_ruby_string with gemset ${rvm_gemset_name:-default}"
fi
__rvm_use # Now ensure the selection takes effect for the environment.
else
rvm_error "Gemset was not given.\n Usage:\n rvm gemset use <gemsetname>\n"
return 1
fi

if [[ -t 0 ]] && (( ${rvm_verbose_flag:=0} == 1 ))
then
rvm_log "Now using gemset '${rvm_gemset_name:-default}'"
fi

__rvm_use # Now ensure the selection takes effect for the environment.
}

__rvm_gemset_clear()
Expand Down

1 comment on commit c59455b

@tmornini
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm getting a variety of failures after this patch:

With a valid .rvmrc, after cd'ing into a directory, I get this error when I use:

RVM is not a function, selecting rubies with 'rvm use ...' will not work.
You need to change your terminal settings to allow shell login.
Please visit https://rvm.beginrescueend.com/workflow/screen/ for example.

And then, after I source ~/.rvm/scripts/rvm, I still have an issue:

Gemset '' does not exist, 'rvm gemset create ' first, or append '--create'.

Please sign in to comment.