rconf 1.0.4 → 1.0.5

data/Rakefile

@@ -14,7 +14,7 @@ require 'rubygems'
 require 'fileutils'
 require 'rake'
 require 'rspec/core/rake_task'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/gempackagetask'
 require 'rake/clean'
 

data/lib/rconf/configurators/bundler_configurator.rb

@@ -33,7 +33,7 @@ module RightConf
     # false:: Otherwise
     def check_linux
       report_check("Checking for bundler #{version}")
-      res = Command.execute_in_ruby('bundle', '--version')
+      res = Command.execute('bundle', '--version')
       success = (res.output =~ /#{version}/)
       report_result(success)
       success
@@ -59,7 +59,7 @@ module RightConf
       options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
       options += [ '--path', bundle_path ] unless bundle_path.nil?
       options << { :abort_on_failure => 'Failed to install gems' }
-      res = Command.execute_in_ruby('bundle', *options)
+      res = Command.execute('bundle', *options)
       report_success
       true
     end
@@ -83,11 +83,11 @@ module RightConf
     # === Raise
     # (Exception):: If bundler gem cannot be found or installed
     def install_bundler
-      res = Command.execute_in_ruby('bundle', '--version')
+      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_in_ruby('gem', 'uninstall', 'bundler', '-a', '-x')
+        Command.execute('gem', 'uninstall', 'bundler', '-a', '-x')
         report_success
       end
       report_check("Installing bundler #{version}")
@@ -100,7 +100,7 @@ module RightConf
       options = [ 'gem','install' ]
       options += bundler_file
       options += [ '--no-ri', '--no-rdoc',  { :abort_on_failure => 'Failed to install bundler' } ]
-      res = Command.execute_in_ruby(*options)
+      res = Command.execute(*options)
       report_success
       true
     end

data/lib/rconf/configurators/ruby_configurator.rb

@@ -97,7 +97,7 @@ module RightConf
         opts = { :report => true, :post_install => update_msg }.merge(abort_option('Failed to install rbenv'))
         PackageInstaller.install('rbenv', opts)
         opts = { :report => true }.merge(abort_option('Failed to install ruby-build'))
-        PackageInstaller.install('ruby-build', opts) { !Command.execute('ruby-build') }
+        PackageInstaller.install('ruby-build', opts)
         true
       end
     end

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -36,16 +36,16 @@ describe RightConf::BundlerConfigurator do
   end
 
   it 'should succeed when bundler succeeds' do
-    should_execute_in_ruby('bundle', '--version').once.and_return(success_result('0'))
+    should_execute('bundle', '--version').once.and_return(success_result('0'))
     @configurator.check_linux.should be_true
   end
 
   it 'should install bundler if needed' do
-    should_execute_in_ruby('bundle', '--version').once.and_return(success_result('1'))
-    should_execute_in_ruby('bundle','_0_', 'install',
+    should_execute('bundle', '--version').once.and_return(success_result('1'))
+    should_execute('bundle','_0_', 'install',
                            {:abort_on_failure=>"Failed to install gems"}).once.and_return(success_result)
-    should_execute_in_ruby('gem', 'uninstall', 'bundler', '-a', '-x').once.and_return(success_result)
-    should_execute_in_ruby('gem', 'install', 'bundler', '-v', '0', '--no-ri', '--no-rdoc',
+    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

data/spec/configurators/ruby_configurator_spec.rb

@@ -57,14 +57,14 @@ describe RightConf::RubyConfigurator do
 
     it 'should install rbenv and ruby-build' do
       flexmock(RightConf::PackageInstaller).should_receive(:install).with('rbenv', Hash).once
-      flexmock(RightConf::PackageInstaller).should_receive(:install).with('ruby-build', Hash, Proc).once
+      flexmock(RightConf::PackageInstaller).should_receive(:install).with('ruby-build', Hash).once
       should_execute('rbenv', 'local', '42').and_return(success_result)
       @configurator.run_linux
     end
 
     it 'should install ruby if needed' do
       flexmock(RightConf::PackageInstaller).should_receive(:install).with('rbenv', Hash).once
-      flexmock(RightConf::PackageInstaller).should_receive(:install).with('ruby-build', Hash, Proc).once
+      flexmock(RightConf::PackageInstaller).should_receive(:install).with('ruby-build', Hash).once
       should_execute('rbenv', 'local', '42').and_return(failure_result)
       flexmock(RightConf::Platform).should_receive(:dispatch).with('42', Proc)
       should_execute('rbenv', 'local', '42').and_return(success_result)

metadata

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