rconf 0.6.30 → 0.6.31

data/bin/rconf

@@ -182,4 +182,6 @@ where [options] are:
 end
 
 # Yeeeehaaaa!
+ENV['rvm_interactive_flag'] = '0' # Prevent RVM from re-loading rvmrc
+trap("INT") { puts "\nAborted!".red; exit 1 }
 RightConf::Configurer.run

data/lib/rconf/configurator.rb

@@ -143,8 +143,8 @@ module RightConf
     # === Return
     # sha(String):: SHA for current settings
     def signature
-      return '' if @settings_values.nil?
-      blob = @settings_values.inject('') { |b, (k, v)| b += "#{k}:#{v};" }
+      blob = VERSION
+      blob = @settings_values.inject(blob) { |b, (k, v)| b += "#{k}:#{v};" } if @settings_values
       sha = Digest::SHA1.hexdigest(blob)
     end
 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -14,7 +14,7 @@ module RightConf
   class RubyConfigurator
 
     # RVM version used to install rubies
-    RVM_VERSION = '1.2.6'
+    RVM_VERSION = '1.2.9'
 
     include Configurator
 
@@ -57,7 +57,6 @@ module RightConf
         when /^Using /
           report_success
           check_rvmrc
-          aborting(true)
         else
           report_fatal("Failed to use #{version}:\n#{out}")
         end
@@ -65,11 +64,11 @@ module RightConf
       if gemset
         report_check("Checking whether gemset #{gemset} exists")
         res = Command.execute('rvm', version, 'gemset', 'list')
-        if res.output =~ /^#{gemset}$/
+        if res.output =~ /^(\s+|=> )#{gemset}$/
           report_success
         else
           report_failure
-          report_check("Creating gemset #{gemset} for  #{version}")
+          report_check("Creating gemset #{gemset} for #{version}")
           Command.execute('rvm', version, 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 
           Command.execute_in_ruby('gem', 'install', 'rconf')
@@ -143,7 +142,6 @@ module RightConf
           Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
         end
         report_success
-        aborting(true)
       end
       setup_bashrc
       true
@@ -217,6 +215,7 @@ module RightConf
         end
         report_success
         post_note "Configuration required switching the active ruby\nPlease run " + 'cd ..;cd -'.blue + ' to activate it and finish configuration'.green
+        aborting(true)
       rescue Exception => e
         report_failure
         report_error(e.message)

data/lib/rconf/version.rb

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

data/rconf.rconf

@@ -1,7 +1,7 @@
 # Configuration settings for RightSite
 ruby do
-  version  'ruby-1.9.2-p136'
-  rubygems '1.3.7'
+  version  'ruby-1.9.2-p180'
+  rubygems '1.6.2'
   gemset   'rconf'
 end
 bundler do

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.30
+  version: 0.6.31
 platform: ruby
 authors: 
 - Raphael Simon
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration