rvm-tui 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41f83c17d25917d5fda5079abc57e5ab1bf63b4764d121eb53c20c304dbeddba
-  data.tar.gz: 588dd92c2b110152f17c217b9161dbeed3eb83f8bcec21440c4c320b1b103ded
+  metadata.gz: 5b603a90ad6f01469d19be7a31552be2a20e09e7f839f7c875b3a2c30e1a4f2a
+  data.tar.gz: cb8f8d3e5cef414f059c2a46067206f4de0e524f83beeed5f57c3ebf6aad9c83
 SHA512:
-  metadata.gz: f552858af4da1cd3dc98c5b8bbf80f39a857cc22d8ff0baf1368a313c9fb5e6268482224a91094f59f467f3808d33d7da87d3f6b9ab56b50837679377936f7db
-  data.tar.gz: a4640cbb5ff9cd9a0f7ce96d74c49abcf2c853a83cc31fdce343a59c2646ad9e68351177f12a6174d4ec159c1a657191c7eddbcbabff4bd03ca39941de9e6c51
+  metadata.gz: 9f25e594235051e4ef7ad704bf149845e6719ce6331fcb541a09d77aff13ca84e0afee54e3e649cd8c162e71d47bbab6e3ef66b7fc9d9345c11368cf27d32a45
+  data.tar.gz: e5cdf77790fd75877e709d39b688ca607ee301ed59f03b632140854aec6226b8e92bef84d9ca89b70cd07da05bb022893aee982e76232c0dd4cf1807da82e59d

data/README.md

@@ -21,20 +21,21 @@ Other TUI gems you may be interested in:
 ## Pre-requisites
 
 - [RVM](https://rvm.io)
-- Any version of Ruby installed via [RVM](https://rvm.io)
+- Any version of [Ruby](https://www.ruby-lang.org/en/) installed via [RVM](https://rvm.io) (preferably [MRI Ruby](https://www.ruby-lang.org/en/) for a fast startup time)
+- [Bash](https://www.gnu.org/software/bash/) or [Zsh](http://zsh.sourceforge.net/) (Z Shell) (including Sed)
 
 ## Setup Instructions
 
-The gem can be installed unto any [Ruby](https://rvm.io/rubies/installing)/[Gemset](https://rvm.io/gemsets/basics) in [RVM](https://rvm.io) and it will be used from there everywhere. 
+The gem can be installed unto any [Ruby](https://rvm.io/rubies/installing)/[Gemset](https://rvm.io/gemsets/basics) in [RVM](https://rvm.io) and it will be used from there everywhere.
 
-Since it is independent of any particular [Ruby](https://www.ruby-lang.org/en/) project, it is recommended you install unto the default [gemset](https://rvm.io/gemsets/basics).
+Since it is independent of any particular [Ruby](https://www.ruby-lang.org/en/) project, it is recommended you install unto the default [gemset](https://rvm.io/gemsets/basics) (or optionally into its own gemset if you prefer).
 
 Afterwards, run the `rvm-tui-setup` command from the same [RVM](https://rvm.io) [Ruby](https://rvm.io/rubies/installing)/[Gemset](https://rvm.io/gemsets/basics) you installed the gem at to setup the `rvm-tui` function source in `~/.bash_profile` or `~/.bashrc` (whichever is available)
 
-These are the commands you need to run:
+These are the commands you need to run in order to select a Ruby and gemset, install gem, and finally setup gem commands globablly in the shell environment:
 
 ```
-rvm use @default
+rvm use @default # or a different ruby version/gemset like `rvm use ruby-2.7.2@rvm-tui --create`
 gem install rvm-tui
 rvm-tui-setup
 ```
@@ -44,9 +45,18 @@ rvm-tui-setup
 Simply run this command:
 
 ```
+rvmui
+```
+
+Or one of the aliases:
+
+```
+rvmtui
+rvm-ui
 rvm-tui
 ```
 
+
 ## Contributing to rvm-tui
 
 -   Make sure you have [RVM](https://rvm.io) installed
@@ -76,7 +86,7 @@ rvm-tui
 
 [Apache License, Version 2.0](LICENSE.txt)
 
-Copyright (c) 2020 Andy Maleh
+Copyright (c) 2020-2021 Andy Maleh
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/rvm-tui-setup

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
-# Copyright (c) 2020 Andy Maleh
-# 
+# Copyright (c) 2020-2021 Andy Maleh
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,16 +37,21 @@ rvm_tui_script = <<~SHELL_SCRIPT
       printf "ERROR: An RVM installation was not found.\\n"
     fi
     
-    IFS='@'
-    read -a rvm_current <<< "$(rvm current)"
-    current_ruby="${rvm_current[0]}"
-    current_gemset="${rvm_current[1]}"
+    current_rvm="$(rvm current)"
+    current_ruby="$(echo $current_rvm | sed -E 's/@.*$//')"
+    current_gemset="default"
+    if [[ $current_rvm == *"@"* ]] then
+      current_gemset="$(echo $current_rvm | sed -E 's/^[^@]+@//')"
+    fi
     #{command} $current_ruby $current_gemset
     if [ -f "$HOME/.rvm_command" ]; then
       source $HOME/.rvm_command
       rm $HOME/.rvm_command
-    fi  
+    fi
   }
+  alias rvm-ui=rvm-tui
+  alias rvmtui=rvm-tui
+  alias rvmui=rvm-tui
 SHELL_SCRIPT
 
 require 'fileutils'
@@ -55,20 +60,33 @@ FileUtils.mkdir_p("#{home_dir}/bin")
 rvm_tui_script_file = "#{home_dir}/.rvm_tui_source"
 rvm_tui_script_file_bash = "$HOME/.rvm_tui_source"
 File.write(rvm_tui_script_file, rvm_tui_script)
-bash_profile_file_name = '.bash_profile'
-bash_profile_file = "#{home_dir}/#{bash_profile_file_name}"
-if !File.exist?(bash_profile_file)
-  bash_profile_file_name = '.bashrc' 
-  bash_profile_file = "#{home_dir}/#{bash_profile_file_name}"
-end
-FileUtils.touch(bash_profile_file)
-bash_profile = File.read(bash_profile_file)
-rvm_tui_source_statement = "source \"#{rvm_tui_script_file_bash}\""
-unless bash_profile.split("\n").detect {|line| line.include?(rvm_tui_source_statement) }
-  File.write(bash_profile_file, "#{bash_profile}\n#{rvm_tui_source_statement}")
+
+[
+  ['.bash_profile', '.bashrc'],
+  ['.zprofile', '.zshrc']
+].each do |profile_and_fallback|
+  shell_profile_file_name = profile_and_fallback.first
+  shell_profile_file_name = profile_and_fallback.last if !File.exist?("#{home_dir}/#{shell_profile_file_name}")
+  shell_profile_file = "#{home_dir}/#{shell_profile_file_name}"
+  FileUtils.touch(shell_profile_file)
+  bash_profile = File.read(shell_profile_file)
+  rvm_tui_source_statement = "source \"#{rvm_tui_script_file_bash}\""
+  unless bash_profile.split("\n").detect {|line| line.include?(rvm_tui_source_statement) }
+    File.write(shell_profile_file, "#{bash_profile}\n#{rvm_tui_source_statement}")
+  end
+  puts "~/#{shell_profile_file_name} has been modified to source the `rvm-tui` function from ~/.rvm_tui_source"
 end
+
 puts <<~OUTPUT
-  ~/#{bash_profile_file_name} has been modified to source the `rvm-tui` function from ~/.rvm_tui_source
-  To use `rvm-tui`, make sure to first run:
-  source ~/.rvm_tui_source 
+  
+  Before using `rvm-tui`, start a new shell session (open a new terminal tab) or run:
+  
+  source ~/.rvm_tui_source
+  
+  Afterwards, you may run `rvm-tui` via one of these commands (aliases):
+  
+  rvm-tui
+  rvm-ui
+  rvmtui
+  rvmui
 OUTPUT

data/lib/rvm-tui.rb

@@ -1,11 +1,11 @@
-# Copyright (c) 2020 Andy Maleh
-# 
+# Copyright (c) 2020-2021 Andy Maleh
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@ RVM_COMMAND_PREFIX = <<~SHELL_SCRIPT
     source "/usr/local/rvm/scripts/rvm"
   else
     printf "ERROR: An RVM installation was not found.\\n"
-  fi  
+  fi
   rvm use #{CURRENT_RVM_RUBY}@#{CURRENT_RVM_GEMSET}
 SHELL_SCRIPT
 
@@ -44,12 +44,12 @@ def rvm_command(command)
 end
 
 begin
-  prompt = TTY::Prompt.new  
+  prompt = TTY::Prompt.new
   rvm_list_lines = rvm_command('rvm list').split("\n")
   rvm_list_lines.shift if rvm_list_lines.first.start_with?('Using ')
   rubies = rvm_list_lines[0...-4] # TODO print excluded lines as an appendix
   rubies_help = rvm_list_lines[-4..-1].join("\n") + "\n"
-  ruby = prompt.select("Choose a Ruby: ", rubies, cycle: true, per_page: 40, filter: true, help: "\n#{rubies_help}", show_help: :always)
+  ruby = prompt.select("Choose Ruby: ", rubies, cycle: true, per_page: 40, filter: true, help: "\n#{rubies_help}", show_help: :always)
   
   ruby = ruby.split.detect {|text| text.include?('ruby')}
   rvm_gemset_list = nil
@@ -62,7 +62,7 @@ begin
   rvm_gemset_list_lines.shift if rvm_gemset_list_lines.first.start_with?('Using ')
   gemsets = rvm_gemset_list_lines[2..-1]
   gemsets_help = rvm_gemset_list_lines[0..1].join("\n") + "\n"
-  gemset = prompt.select("Choose a Gemset: ", gemsets, cycle: true, per_page: 40, filter: true, help: gemsets_help, show_help: :always)
+  gemset = prompt.select("Choose Gemset: ", gemsets, cycle: true, per_page: 40, filter: true, help: gemsets_help, show_help: :always)
   
   gemset = gemset.sub('=>', '').sub('(default)', 'default').strip
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rvm-tui
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - andy_maleh
@@ -146,7 +146,10 @@ homepage: http://github.com/AndyObtiva/rvm-tui
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: |2+
+
+  To finish setting up the rvm-tui Ruby gem in your shell environment, run: rvm-tui-setup
+
 rdoc_options: []
 require_paths:
 - lib
@@ -166,3 +169,4 @@ signing_key:
 specification_version: 4
 summary: Ruby enVironment Manager - Text-based User Interface
 test_files: []
+...