rconf 1.0.5 → 1.0.6

data/Rakefile

@@ -14,10 +14,16 @@ require 'rubygems'
 require 'fileutils'
 require 'rake'
 require 'rspec/core/rake_task'
-require 'rdoc/task'
 require 'rake/gempackagetask'
 require 'rake/clean'
 
+begin
+  require 'rdoc/task'
+rescue LoadError => e
+  warn "Older RDoc detected; falling back to legacy RDoc+Rake bindings"
+  require 'rake/rdoctask'
+end
+
 task :default => 'spec'
 task :build   => [ 'spec', 'gem' ]
 

data/lib/rconf/configurators/bundler_configurator.rb

@@ -83,22 +83,15 @@ module RightConf
     # === Raise
     # (Exception):: If bundler gem cannot be found or installed
     def install_bundler
-      res = Command.execute('bundle', '--version')
-      exists = res.success? && res.output !~ /exec: bundle: not found/
-      if exists && res.output !~ /#{version}/
-        report_check('Uninstalling existing versions of bundler')
-        Command.execute('gem', 'uninstall', 'bundler', '-a', '-x')
-        report_success
-      end
       report_check("Installing bundler #{version}")
       if gem_path
-        bundler_file = [ File.join(gem_path, "bundler-#{version}.gem") ]
-        report_fatal("Missing bundler gem at #{bundler_file}") unless File.exist?(bundler_file)
+        version_or_file = [ File.join(gem_path, "bundler-#{version}.gem") ]
+        report_fatal("Missing bundler gem at #{version_or_file}") unless File.exist?(version_or_file)
       else
-        bundler_file = [ 'bundler', '-v', version ]
+        version_or_file = [ 'bundler', '-v', version ]
       end
       options = [ 'gem','install' ]
-      options += bundler_file
+      options += version_or_file
       options += [ '--no-ri', '--no-rdoc',  { :abort_on_failure => 'Failed to install bundler' } ]
       res = Command.execute(*options)
       report_success

data/lib/rconf/configurators/ruby_configurator.rb

@@ -143,7 +143,7 @@ module RightConf
       Platform.dispatch(ruby) { :install_ruby_prerequisites }
       c_version = `system_profiler SPDeveloperToolsDataType -xml | xpath "//*[text()='_items']/following-sibling::array/dict/child::key[text()='spdevtools_version']/following-sibling::string/text()" 2> /dev/null`
       env = {}
-      gcc42 = ['/usr/bin/gcc-4.2', '/usr/local/bin/gcc-4.2'].detect { |p| File.executable?(p) }
+      gcc42 = ['/usr/local/bin/gcc-4.2', '/usr/bin/gcc-4.2'].detect { |p| File.executable?(p) }
       if c_version =~ /^4\.2\.[0-9]+/
         if !gcc42
           report_fatal("The C compiler included with Xcode #{c_version} produces buggy ruby interpreters, please install the C compilers from https://github.com/downloads/kennethreitz/osx-gcc-installer/GCC-10.7-v2.pkg or update your version of Xcode and re-run rconf")
@@ -200,8 +200,15 @@ module RightConf
     # === Return
     # true:: Always return true
     def install_ruby_prerequisites_darwin(ruby)
-      if ruby =~ /1\.8/
-        report_check("Detected ruby 1.8 install, making sure gcc 4.2 is available")
+      version_output = `sw_vers`
+      if m = /ProductVersion:\s*([0-9.]+)/m.match(version_output)
+        osx_version = m[1].split(".").map { |c| c.to_i }
+      else
+        raise RuntimeError, "Can't determine OS X version from sw_vers output (#{version_output})"
+      end
+
+      if (osx_version[0] > 10 || osx_version[1] > 6)
+        report_check("installing non-LLVM GCC 4.2")
         PackageInstaller.install('https://raw.github.com/Homebrew/homebrew-dupes/master/apple-gcc42.rb', :abort_on_failure => "Could not install gcc 4.2")
         report_success
       end

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -41,12 +41,10 @@ describe RightConf::BundlerConfigurator do
   end
 
   it 'should install bundler if needed' do
-    should_execute('bundle', '--version').once.and_return(success_result('1'))
+    should_execute('gem', 'install', 'bundler', '-v', '0', '--no-ri', '--no-rdoc',
+                   {:abort_on_failure=>"Failed to install bundler"}).once.and_return(success_result)
     should_execute('bundle','_0_', 'install',
                            {:abort_on_failure=>"Failed to install gems"}).once.and_return(success_result)
-    should_execute('gem', 'uninstall', 'bundler', '-a', '-x').once.and_return(success_result)
-    should_execute('gem', 'install', 'bundler', '-v', '0', '--no-ri', '--no-rdoc',
-                           {:abort_on_failure=>"Failed to install bundler"}).once.and_return(success_result)
     @configurator.run_linux
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec