rvm-tui 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2efd862751fe44f51587a1f9b9b469c34d9d4be205ce43a6fbfdd86374c5f5
-  data.tar.gz: 193ac518992be95f86e0f701d202b9bceb0352667dd5187e74307d7b213c9c28
+  metadata.gz: eb887902a94db7f5b472c4a2344c4d619dfbfa820a27e64c43e54ac1d22876a8
+  data.tar.gz: b6d25cc471a84289c45684b35387933c200cb33ad45e2e614a0f321ebd59e07e
 SHA512:
-  metadata.gz: 00d76e19ea4d63b0a84cf06f4948b903ca16d8e2907910b7e94a39dac5699f5b70b8d1a4c6cabc4231486f00fe21a300c9ab52ed42e90bf5cd21b7c867bd0a4e
-  data.tar.gz: 902a41fcc9649f5f25e117a324abf6e2496b330e26214480e6bd6ff53bb313ab8a93a46a2bf7e35440a158c98f99b325c7c9e6a2051b7926bb34015595b8d1f4
+  metadata.gz: 528ea9fa16c7dc9eedf1988cae2c2caaf9b3a83ee93f981d630aa24f4b277a276e922a94ea8b57e8ca284239c03b116471db794f2d6f89987f69fd3f47bfd500
+  data.tar.gz: df555dd0a0c2c12c6e4697d2709db78326d29d271170eb1bcb0612a0c8c1f12a8e59f88cce455356c0b818207d6fd9c46ec81001752733dceaad75dcaf83125e

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Change Log
+
+## 0.0.2
+
+- Safe abort support (use CTRL+C without seeing error messages)
+- Highlight current RVM Gemset (not just the current Ruby)
+
+## 0.0.1
+
+- Initial implementation supporting selection of RVM Ruby and Gemset

data/README.md

@@ -1,4 +1,5 @@
 # Ruby enVironment Manager - Text-based User Interface
+[![Gem Version](https://badge.fury.io/rb/rvm-tui.svg)](https://badge.fury.io/rb/rvm-tui)
 
 [RVM](https://rvm.io) is the original Ruby enVironment Manager that is used to:
 - Effortlessly install multiple versions of [Ruby](https://www.ruby-lang.org/en/), including [JRuby](https://www.jruby.org/)
@@ -58,6 +59,14 @@ rvm-tui
     is fine, but please isolate to its own commit so I can cherry-pick
     around it.
 
+## TODO
+
+[TODO.md](TODO.md)
+
+## Change Log
+
+[CHANGELOG.md](CHANGELOG.md)
+
 ## License
 
 [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/rvm-tui-setup

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-puts "rvm-tui-setup version #{File.read(File.expand_path('../../VERSION', __FILE__))}"
+version = File.read(File.expand_path('../../VERSION', __FILE__))
+puts "== rvm-tui-setup version #{version.strip} =="
 
 ruby = `which ruby`
 ruby = `which jruby` if ruby.to_s.strip.empty?
@@ -8,24 +9,30 @@ ruby = ruby.strip
 rvm = `rvm current`.strip
 command = "rvm #{rvm} do #{ruby} #{File.expand_path('../../lib/rvm-tui.rb', __FILE__)}"
 
-rvm_tui_script = <<-SHELL_SCRIPT
-function rvm-tui()
-{
-  # Load RVM into a shell session *as a function*
-  if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
-    # First try to load from a user install
-    source "$HOME/.rvm/scripts/rvm"
-  elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
-    # Then try to load from a root install
-    source "/usr/local/rvm/scripts/rvm"
-  else
-    printf "ERROR: An RVM installation was not found.\\n"
-  fi
-  
-  #{command}
-  source $HOME/.rvm-command
-  rm $HOME/.rvm-command
-}
+rvm_tui_script = <<~SHELL_SCRIPT
+  function rvm-tui()
+  {
+    # Load RVM into a shell session *as a function*
+    if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+      # First try to load from a user install
+      source "$HOME/.rvm/scripts/rvm"
+    elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      # Then try to load from a root install
+      source "/usr/local/rvm/scripts/rvm"
+    else
+      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]}"
+    #{command} $current_ruby $current_gemset
+    if [ -f "$HOME/.rvm_command" ]; then
+      source $HOME/.rvm_command
+      rm $HOME/.rvm_command
+    fi  
+  }
 SHELL_SCRIPT
 
 require 'fileutils'
@@ -47,7 +54,7 @@ unless bash_profile.split("\n").detect {|line| line.include?(rvm_tui_source_stat
   File.write(bash_profile_file, "#{bash_profile}\n#{rvm_tui_source_statement}")
 end
 puts <<~OUTPUT
-The `rvm-tui` function has been sourced from ~/#{bash_profile_file_name}
-To use `rvm-tui`, make sure to first run:
-source ~/#{bash_profile_file_name}
+  ~/#{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 
 OUTPUT

data/lib/rvm-tui.rb

@@ -1,27 +1,63 @@
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
-puts "rvm-tui version #{File.read(File.expand_path('../../VERSION', __FILE__))}"
-puts
-
-require "tty-prompt"
-
-prompt = TTY::Prompt.new
-
-rvm_list_lines = `rvm list`.split("\n")
-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 version: ", rubies, cycle: true, per_page: 40, filter: true, help: "\n#{rubies_help}", show_help: :always)
-
-ruby = ruby.split.detect {|text| text.include?('ruby')}
-rvm_gem_list_lines = `rvm use #{ruby} do rvm gemset list`.split("\n")
-gemsets = rvm_gem_list_lines[2..-1]
-gemsets_help = rvm_gem_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 = gemset.strip
-
-command = "rvm --nice use #{ruby}"
-command += "@#{gemset}" unless gemset.include?('(default)')
-
-home_dir = `echo ~`.strip
-File.write("#{home_dir}/.rvm-command", command)
+puts "== rvm-tui version #{File.read(File.expand_path('../../VERSION', __FILE__)).strip} =="
+
+require 'tty-prompt'
+
+CURRENT_RVM_RUBY = ARGV[0]
+CURRENT_RVM_GEMSET = ARGV[1] || 'default'
+current_rvm = CURRENT_RVM_RUBY
+current_rvm += "@#{CURRENT_RVM_GEMSET}" unless CURRENT_RVM_GEMSET.nil?
+CURRENT_RVM = current_rvm
+puts "Current: #{CURRENT_RVM}"
+
+RVM_COMMAND_PREFIX = <<~SHELL_SCRIPT
+  # Load RVM into a shell session *as a function*
+  if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+    # First try to load from a user install
+    source "$HOME/.rvm/scripts/rvm"
+  elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+    # Then try to load from a root install
+    source "/usr/local/rvm/scripts/rvm"
+  else
+    printf "ERROR: An RVM installation was not found.\\n"
+  fi  
+  rvm use #{CURRENT_RVM_RUBY}@#{CURRENT_RVM_GEMSET}
+SHELL_SCRIPT
+
+def rvm_command(command)
+  `bash -c '#{RVM_COMMAND_PREFIX}\n#{command}'`
+end
+
+begin
+  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 = ruby.split.detect {|text| text.include?('ruby')}
+  rvm_gemset_list = nil
+  if CURRENT_RVM_RUBY == ruby
+    rvm_gemset_list = rvm_command('rvm gemset list')
+  else
+    rvm_gemset_list = rvm_command("rvm #{ruby} do rvm gemset list")
+  end
+  rvm_gemset_list_lines = rvm_gemset_list.split("\n")
+  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 = gemset.sub('=>', '').sub('(default)', 'default').strip
+  
+  command = "rvm --nice use #{ruby}@#{gemset}"
+  
+  home_dir = `echo ~`.strip
+  File.write("#{home_dir}/.rvm_command", command)
+rescue TTY::Reader::InputInterrupt => e
+  # No Op
+  puts # a new line is needed
+  puts "Staying at current (abort detected): #{CURRENT_RVM}"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rvm-tui
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - andy_maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt
@@ -114,9 +114,11 @@ executables:
 - rvm-tui-setup
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - VERSION