rconf 1.0.1 → 1.0.3

data/bin/rconf

@@ -64,18 +64,20 @@ where [options] are:
         end
       end
       Command.set_verbose if opts[:verbose]
-      if opts[:configurators]
-        new.list_configurators
-      elsif opts[:platform]
-        new.show_platform
-      elsif opts[:overrides]
-        new.show_overrides
-      elsif opts[:update]
-        new.update
-      elsif opts[:remove]
-        new.remove
-      else
-        new.configure(opts)
+      Dir.chdir(File.dirname(opts[:config])) do
+        if opts[:configurators]
+          new.list_configurators
+        elsif opts[:platform]
+          new.show_platform
+        elsif opts[:overrides]
+          new.show_overrides
+        elsif opts[:update]
+          new.update
+        elsif opts[:remove]
+          new.remove
+        else
+          new.configure(opts)
+        end
       end
     end
 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -107,18 +107,10 @@ module RightConf
     # === Return
     # true:: Always return true
     def check_ruby
-      exists = File.exist?('.ruby-version')
-      if exists
-        contents = IO.read('.ruby-version')
-        right_ruby = !!(contents =~ /#{ruby_version}/)
-      end
-
-      unless exists && right_ruby
-        unless Command.execute('rbenv', 'local', ruby_version).success?
-          report_check("Installing ruby #{ruby} (this will take a while, please be patient)")
-          Platform.dispatch(ruby_version) { :install_ruby }
-          Command.execute('rbenv', 'local', ruby_version)
-        end
+      unless Command.execute('rbenv', 'local', ruby_version).success?
+        report_check("Installing ruby #{ruby_version} (this will take a while, please be patient)")
+        Platform.dispatch(ruby_version) { :install_ruby }
+        Command.execute('rbenv', 'local', ruby_version)
       end
       true
     end
@@ -148,6 +140,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def install_ruby_darwin(ruby)
+      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) }

data/lib/rconf/support/package_installer.rb

@@ -86,11 +86,16 @@ module RightConf
     def install_darwin(packages, opts)
       return if packages.nil?
       BrewInstaller.check_and_install
+      res = Command.execute('brew', 'list')
+      all_installed = res.success? ? res.output.gsub("\t", "\n") : ''
       packages.each do |p|
         args = [ p ]
         args << opts if opts
+        formula = p.split('/').last.split('.rb').first
+        already_installed  = all_installed =~ /^#{formula}$/
+        next if already_installed
         res = Command.execute('brew', 'install', *args)
-        installed = res.success? && res.output !~ /Formula already installed/
+        installed = res.success? && res.output !~ /already installed/
         Command.sudo('brew', 'link', p) if installed
       end
     end

data/lib/rconf/version.rb

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

data/spec/configurators/ruby_configurator_spec.rb

@@ -33,8 +33,7 @@ describe RightConf::RubyConfigurator do
   context "with rbenv installed" do
     before(:each) do
       should_execute('rvm').once.and_return(failure_result)
-      flexmock(File).should_receive(:exist?).with('.ruby-version').and_return(true)
-      flexmock(IO).should_receive(:read).with('.ruby-version').and_return("42")
+      should_execute('rbenv', 'local', '42').and_return(success_result)
     end
 
     it 'should succeed' do
@@ -53,7 +52,6 @@ describe RightConf::RubyConfigurator do
     before(:each) do
       should_execute('rvm').once.and_return(failure_result)
       should_execute('rbenv').once.and_return(failure_result)
-      flexmock(File).should_receive(:exist?).with('.ruby-version').and_return(false)
       flexmock(File).should_receive(:exist?).with(File.join(ENV['HOME'], '.rbenv', 'bin', 'rbenv')).and_return(false)
     end
 

data/spec/support/package_installer_spec.rb

@@ -40,6 +40,7 @@ describe RightConf::PackageInstaller do
   it 'should install packages on Darwin' do
     flexmock(RightConf::Platform.instance).should_receive(:family).and_return(:darwin)
     flexmock(RightConf::BrewInstaller).should_receive(:check_and_install).once
+    should_execute('brew', 'list').once.and_return(success_result(''))
     should_execute('brew', 'install', 'mac1').once.and_return(success_result)
     should_sudo('brew', 'link', 'mac1').once.and_return(success_result)
     should_execute('brew', 'install', 'mac2').once.and_return(success_result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: