rconf 0.5.0 → 0.5.1

data/bin/rconf

@@ -88,10 +88,11 @@ where [options] are:
         report_fatal("Validation of configuration file failed:\n  -#{lang.validation_errors.join("\n  -").map(&:red)}") unless lang.validation_errors.empty?
         Dir.chdir(File.dirname(options[:config])) { lang.configurators.each(&:run) }
         report("Successfully configured #{File.basename(options[:config], '.rc').blue} for #{Platform.family.to_s.blue}")
-        lang.configurators.each { |c| report("NOTE: #{c.post_note}") if c.post_note }
       rescue Exception => e
         raise if e.is_a?(SystemExit)
         report_fatal("Execution failed with exception '#{e.message.red}'\n#{e.backtrace.join("\n").map(&:grey)}")
+      ensure
+        lang.configurators.each { |c| report("!!NOTE: #{c.post_note}") if c.post_note }
       end
     end
 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -54,6 +54,8 @@ module RightConf
         when /^Using /
           report_success
           check_rvmrc
+          Command.execute('rvm', ruby_version, 'exec', 'gem', 'install', 'rconf',
+                          :abort_on_failure => "Failed to install rconf gem in #{ruby_version}")
           post_note 'Configuration required switching the active ruby, please "cd" into the project directory again to activate it'
         else
           report_fatal("Failed to use #{ruby_version}:\n#{out}")
@@ -61,8 +63,13 @@ module RightConf
       end
       if gemset
         report_check("Switching to gemset #{gemset}")
-        res = Command.execute('rvm', 'gemset', 'use',  gemset,
-                             :abort_on_failure => "Failed to switch to gemset '#{gemset}'") 
+        res = Command.execute('rvm', 'gemset', 'list')
+        unless res.output =~ /^#{gemset}$/
+          Command.execute('rvm', 'gemset', 'create',  gemset,
+                          :abort_on_failure => "Failed to create gemset '#{gemset}'") 
+        end
+        Command.execute('rvm', 'gemset', 'use',  gemset,
+                        :abort_on_failure => "Failed to switch to gemset '#{gemset}'") 
         report_success
       end
       Command.set_prefix("rvm #{ruby_version}@#{gemset} exec --")
@@ -98,13 +105,15 @@ module RightConf
         rvm_src = File.join(ENV['HOME'] || '/root', '.rvm/src')
         FileUtils.mkdir_p(rvm_src)
         Dir.chdir(rvm_src) do
-          res = Command.execute('curl', '-O', '-f',
-                                "http://rvm.beginrescueend.com/releases/rvm-#{version}.tar.gz",
-                                :abort_on_failure => "Failed to download rvm #{version}")
-          Command.execute('tar', 'zxf', "rvm-#{version}.tar.gz")
+          Command.execute('curl', '-O', '-f',
+                          "http://rvm.beginrescueend.com/releases/rvm-#{version}.tar.gz",
+                          :abort_on_failure => "Failed to download rvm #{version}")
+          Command.execute('tar', 'zxf', "rvm-#{version}.tar.gz", 
+                          :abort_on_failure => "Failed to extract rvm tgz from #{File.join(Dir.getwd, 'rvm-' + version + '.tar.gz')}")
         end
         Dir.chdir(File.join(rvm_src, "rvm-#{version}")) do
-          res = Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
+          Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
+	  setup_bashrc
         end
         report_success
       end
@@ -146,6 +155,38 @@ module RightConf
       true
     end
 
+    # Setup .bashrc for rvm support
+    #
+    # === Return
+    # true:: Always return true
+    def setup_bashrc
+      candidates = ['.bashrc', '.bash_profile']
+      candidates.map! { |c| File.join(ENV['HOME'], c) }
+      bashrc_path = candidates.detect { |c| File.exist?(c) }
+      if bashrc_path
+        content = IO.read(bashrc_path)
+        unless content.include?(rvm_bash_activation) 
+          content = rvm_bash_activation + "\n" + content
+          FileUtils.mv(bashrc_path, bashrc_path + '.old')
+          File.open(bashrc_path, 'w') { |f| f.puts content }
+          post_note 'rvm was installed, please reload your shell to activate it'
+        end
+      else
+        report_error("Failed to update bashrc to activate rvm, no bashrc found")
+      end
+    end
+
+    # rvm bash activation code
+    #
+    # === Return
+    # code(String):: Code that needs to be added to bashrc to activate rvm
+    def rvm_bash_activation
+      code = <<EOS
+if [[ -n "$PS1" ]]; then
+  if [[ -s $HOME/.rvm/scripts/rvm ]] ; then source $HOME/.rvm/scripts/rvm ; fi
+fi
+EOS
+    end
+
   end
 end
-                       

data/lib/rconf/progress_reporter.rb

@@ -69,4 +69,4 @@ module RightConf
 end
 
 # Load all progress reporters
-Dir[File.join(File.dirname(__FILE__), 'progress_reporters', '*.rb')].each { |r| require r }
+Dir[File.join(File.dirname(__FILE__), 'progress_reporters', '*.rb')].sort.each { |r| require r }

data/lib/rconf/version.rb

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

data/lib/rconf.rb

@@ -11,7 +11,7 @@
 
 BASE_DIR = File.join(File.dirname(__FILE__), 'rconf')
 
-require 'FileUtils'
+require 'fileutils'
 require File.join(BASE_DIR, 'ruby_extensions')
 require File.join(BASE_DIR, 'progress_reporter')
 require File.join(BASE_DIR, 'command')

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -08:00
+date: 2011-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency