rconf 0.8.1 → 0.8.2

data/bin/rconf

@@ -12,7 +12,6 @@
 
 $stdout.sync = true
 
-require 'json'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'rconf')
 
 module RightConf

data/lib/rconf/configurators/ruby_configurator.rb

@@ -132,25 +132,23 @@ module RightConf
       else
         report_failure
         if out =~ /rvm ([^\s]+)/
-          report_fatal "You have rvm #{Regexp.last_match[1]} installed which is not compatible with rconf.\n" +
-            "Please uninstall your version of rvm and re-run rconf which will install rvm #{RVM_VERSION}.\n" + 
-            "You can uninstall rvm by running 'rvm implode' or 'rm -rf ~/.rvm'"
-        else
-          report_check("Installing rvm #{version}")
-          rvm_src = File.join(ENV['HOME'] || '/root', '.rvm/src')
-          FileUtils.mkdir_p(rvm_src)
-          Dir.chdir(rvm_src) do
-            Command.execute('curl', '-O', '-f',
-                            "#{RVM_RELEASES_URL}/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
-            Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
-          end
-          report_success
+          report_error "WARNING!: You have rvm #{Regexp.last_match[1]} installed which may not be compatible with rconf.\n" +
+            "rconf will proceed and try to install rvm #{version}."
+        end
+        report_check("Installing rvm #{version}")
+        rvm_src = File.join(ENV['HOME'] || '/root', '.rvm/src')
+        FileUtils.mkdir_p(rvm_src)
+        Dir.chdir(rvm_src) do
+          Command.execute('curl', '-O', '-f',
+                          "#{RVM_RELEASES_URL}/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
+          Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
+        end
+        report_success
       end
       setup_bashrc
       true

data/lib/rconf/version.rb

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

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rconf
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.1
+  hash: 59
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 -07:00
+date: 2011-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -32,6 +41,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id002
@@ -121,17 +134,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration