rconf 0.8.15 → 0.8.16

data/bin/rconf

@@ -126,10 +126,14 @@ where [options] are:
         ruby = Regexp.last_match(2)
         gemsets = Command.execute('rvm', ruby, 'exec', 'rvm', 'gemset', 'list').output.split("\n")
         i = gemsets.index { |gs| gs =~ /^gemsets for #{ruby} / }
-        gemsets = gemsets[i + 1..-1]
-        gemsets.each do |gs|
-          gs = gs.lstrip
-          callback.call(ruby, gs)
+        if i
+          gemsets = gemsets[i + 1..-1]
+          gemsets.each do |gs|
+            gs = gs.lstrip
+            callback.call(ruby, gs)
+          end
+        else
+          report_fatal 'Failed to retrieve installed gemsets'
         end
       end
     end

data/lib/rconf/configurators/ruby_configurator.rb

@@ -232,7 +232,8 @@ module RightConf
         report_check('Setting up .rvmrc')
         begin
           File.open('.rvmrc', 'w') do |f|
-            f.puts "rvm #{version}@#{gemset}"
+            f.puts "environment_id=\"#{version}@#{gemset}\""
+            f.puts RVM_HOOK
             f.puts "type -P rconf &>/dev/null && { rconf; }"
             f.puts "type -P rconf &>/dev/null || { echo 'rconf not installed, skipping (see .rvmrc)'; }"
           end
@@ -247,6 +248,33 @@ module RightConf
       true
     end
 
+    # rvm mojo for creating and enabling 'environments'
+    RVM_HOOK = <<-EOF
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+  then
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  if ! rvm --create  "$environment_id"
+  then
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  fi
+fi
+if [[ $- == *i* ]] # check for interactive shells
+then
+    echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+else 
+  echo "Using: $GEM_HOME" # don't use colors in interactive shells
+fi
+    EOF
+
     # Setup .bashrc for rvm support
     #
     # === Return

data/lib/rconf/version.rb

@@ -13,7 +13,7 @@ module RightConf
 
   MAJOR = 0
   MINOR = 8
-  BUILD = 15
+  BUILD = 16
 
   VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
 

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.15
+  version: 0.8.16
 platform: ruby
 authors: 
 - Raphael Simon