rconf 0.7.15 → 0.8.0

data/bin/rconf

@@ -35,12 +35,13 @@ where [options] are:
 
         opt :configurators, 'Show available configurators'
         opt :update, 'Update rconf to latest version'
+        opt :remove, 'Remove rconf from all gemsets'
         opt :config, 'Set path to configuration file', :type => :string
         opt :output, 'Output file (output to STDOUT by default)', :type => :string
         opt :force, 'Run rconf even if configuration file has not changed'
         opt :verbose, 'Print debug output'
       end
-      if opts[:config].nil? && !opts[:configurators] && !opts[:update]
+      if opts[:config].nil? && !opts[:configurators] && !opts[:update] && !opts[:remove]
         opts[:config] = Dir["./*#{CONFIG_EXTENSION}"]
         if opts[:config].empty?
           Trollop::die :config, "not used and could not find a '#{CONFIG_EXTENSION}' file in the working directory"
@@ -60,6 +61,8 @@ where [options] are:
         new.list_configurators
       elsif opts[:update]
         new.update
+      elsif opts[:remove]
+        new.remove
       else
         new.configure(opts)
       end
@@ -103,20 +106,21 @@ where [options] are:
       report_fatal 'Failed to retrieve rconf gem information, check network connectivity' unless version
       report_success
       report('Latest rconf version is ' + version.blue)
-      rubies = Command.execute('rvm', 'list').output
-      rubies = rubies.split("\n")[3..-1]
-      update_rconf(rubies, version)
+      update_rconf(version)
     end
 
-    # Update rconf for given rubies if required
+    # Calls given block with all combination of installed rubies/gemsets
     #
-    # === Parameters
-    # rubies(Array):: List of rubies as returned by 'rvm list'
-    # version(String):: Latest version
+    # === Block
+    # Given block should take two arguments:
+    #   ruby(String):: Ruby version
+    #   gemset(String):: Gemset
     #
     # === Return
     # true:: Always return true
-    def update_rconf(rubies, version)
+    def run_in_all_gemsets(&callback)
+      rubies = Command.execute('rvm', 'list').output
+      rubies = rubies.split("\n")[3..-1]
       rubies.each do |ruby|
         ruby =~ /(\s+| =>)([^ ]*)\s.*/
         ruby = Regexp.last_match(2)
@@ -125,25 +129,52 @@ where [options] are:
         gemsets = gemsets[i + 1..-1]
         gemsets.each do |gs|
           gs = gs.lstrip
-          report_check("Checking rconf for #{ruby}@#{gs}")
-          rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf').output
-          if rconf =~ /rconf \(#{version}/
-            report_success
-            next
-          elsif rconf =~ /rconf/
-            report_failure
-            report_check("Updating rconf for #{ruby}@#{gs}")
-            res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'install', 
-                                  'rconf', '-v', version, '--no-ri', '--no-rdoc')
-            report_result(res.success?)
-          else
-            report('SKIPPED (no rconf)')
-          end
+          callback.call(ruby, gs)
         end
       end
     end
 
-
+    # Update rconf for given rubies if required
+    #
+    # === Parameters
+    # version(String):: Latest version
+    #
+    # === Return
+    # true:: Always return true
+    def update_rconf(version)
+      run_in_all_gemsets do |ruby, gs|
+        report_check("Checking rconf for #{ruby}@#{gs}")
+        rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf').output
+        if rconf =~ /rconf \(#{version}/
+          report_success
+        elsif rconf =~ /^rconf /
+          report_failure
+          report_check("Updating rconf for #{ruby}@#{gs}")
+          res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'install', 
+                                'rconf', '-v', version, '--no-ri', '--no-rdoc')
+          report_result(res.success?)
+        else
+          report('SKIPPED (no rconf)')
+        end
+      end
+    end
+    
+    # Remove rconf from all rubies/gemsets
+    #
+    # === Return
+    # true:: Always return true
+    def remove
+      ProgressReporter.report_to_stdout
+      run_in_all_gemsets do |ruby, gs|
+        rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf').output
+        if rconf =~ /^rconf /
+          report_check("Removing rconf from #{ruby}@#{gs}")
+          res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'uninstall', '-a', '-x', 'rconf')
+          report_result(res.success?)
+        end
+      end
+    end
+        
     # Actually configure environment
     #
     # === Parameters

data/lib/rconf/configurators/ruby_configurator.rb

@@ -14,7 +14,10 @@ module RightConf
   class RubyConfigurator
 
     # RVM version used to install rubies
-    RVM_VERSION = '1.2.9'
+    RVM_VERSION = '1.6.2'
+
+    # RVM releases URL
+    RVM_RELEASES_URL = 'https://rvm.beginrescueend.com/releases'
 
     include Configurator
 
@@ -128,20 +131,25 @@ module RightConf
         report_success
       else
         report_failure
-        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',
-                          "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
-          Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
+        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}."
+        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
         end
-        report_success
       end
       setup_bashrc
       true

data/lib/rconf/version.rb

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

data/spec/configurators/ruby_configurator_spec.rb

@@ -36,7 +36,7 @@ describe RightConf::RubyConfigurator do
     rvm_tar = "rvm-#{RVM_VERSION}.tar.gz" 
     should_execute('rvm', '--version').once.and_return(success_result("rvm"))
     should_execute('rvm', 'list').once.and_return(success_result("=> rvm #{RVM_VERSION}"))
-    should_execute('curl', '-O', '-f', "http://rvm.beginrescueend.com/releases/#{rvm_tar}",
+    should_execute('curl', '-O', '-f', "https://rvm.beginrescueend.com/releases/#{rvm_tar}",
       {:abort_on_failure=>"Failed to download rvm #{RVM_VERSION}"}).once.and_return(success_result)
     should_execute('tar', 'zxf', rvm_tar, 
       {:abort_on_failure=>"Failed to extract rvm tgz from #{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "rvm-#{RVM_VERSION}.tar.gz"))}"}).once.and_return(success_result)

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.15
+  version: 0.8.0
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -07:00
+date: 2011-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency