rconf 0.6.25 → 0.6.30

data/lib/rconf/command.rb

@@ -18,6 +18,9 @@ module RightConf
     include Singleton
     include ProgressReporter
 
+    # Builtin RVM commands
+    RVM_COMMANDS = [ 'gem', 'rubygems' ]
+
     # Execute given command with given arguments
     #
     # === Parameters
@@ -34,7 +37,7 @@ module RightConf
       end
       res = Platform.dispatch(command, *args) { :execute }
       if @verbose
-        msg = (([@prefix, command] + args).compact.join(' ') + ' => ' +
+        msg = (([command] + args).compact.join(' ') + ' => ' +
           res.status.to_s + ': ' + res.output).grey
         report(msg)
       end
@@ -44,6 +47,27 @@ module RightConf
       res
     end
 
+    # Execute command in context of activated ruby
+    #
+    # === Parameters
+    # command(String):: Command to run
+    # args(Array):: Command arguments
+    #
+    # === Return
+    # result(CommandResult):: Result of execution (output and exit status)
+    #   NOTE: This is the result returned by RVM, not the underlying command
+    #   and thus could be successful when the command actually failed...
+    def execute_in_ruby(command, *args)
+      report_fatal('Failed to run in ruby context, no ruby specified') unless @rvm_prefix
+      commands = if RVM_COMMANDS.include?(command)
+                   [ @rvm_prefix, command ]
+                 else
+                   [ @rvm_prefix, 'exec', '--', command ]
+                 end
+      args = commands + args
+      execute('rvm', *args)
+    end
+
     # Execute given command with given arguments using 'sudo'
     #
     # === Parameters
@@ -66,7 +90,7 @@ module RightConf
     # === Return
     # result(CommandResult):: Result of execution (output and exit status)
     def execute_linux(command, *args)
-      out = `#{@prefix} #{Shellwords.join([command, *args])} 2>&1`
+      out = `#{Shellwords.join([command, *args])} 2>&1`
       result = CommandResult.new(out, $?.exitstatus)
     end
     alias :execute_darwin :execute_linux
@@ -83,15 +107,16 @@ module RightConf
       raise 'TBD!'
     end
 
-    # Set prefix to be used for all commands
+    # Set ruby to be used by 'execute_in_ruby'
     #
     # === Parameters
-    # prefix(String):: Commands prefix
+    # ruby(String):: RVM ruby
+    # gemset(String):: RVM gemset
     #
     # === Return
     # true:: Always return true
-    def set_prefix(prefix)
-      @prefix = prefix
+    def set_ruby(ruby, gemset)
+      @rvm_prefix = "#{ruby}@#{gemset}"
       true
     end
 

data/lib/rconf/configurators/bundler_configurator.rb

@@ -34,7 +34,7 @@ module RightConf
     # true:: Always return true
     def run_linux
       report_check("Checking for bundler #{version}")
-      res = Command.execute('bundle', '--version')
+      res = Command.execute_in_ruby('bundle', '--version')
       success = (res.output =~ /#{version}/)
       report_result(success)
       install_bundler unless success
@@ -43,7 +43,7 @@ module RightConf
       options << "--without=#{exclusions}" unless exclusions.nil?
       options << "--path #{bundle_path}" unless bundle_path.nil?
       options << { :abort_on_failure => 'Failed to install gems' }
-      res = Command.execute('bundle', *options)
+      res = Command.execute_in_ruby('bundle', *options)
       report_success
       true
     end
@@ -67,11 +67,11 @@ module RightConf
     # === Raise
     # (Exception):: If bundler gem cannot be found or installed
     def install_bundler
-      res = Command.execute('bundle', '--version')
+      res = Command.execute_in_ruby('bundle', '--version')
       exists = res.success? && res.output !~ /exec: bundle: not found/
       if exists
         report_check('Uninstalling existing versions of bundler')
-        Command.execute('gem', 'uninstall', 'bundler', '-a', '-x')
+        Command.execute_in_ruby('gem', 'uninstall', 'bundler', '-a', '-x')
         report_success
       end
       report_check("Installing bundler #{version}")
@@ -84,7 +84,7 @@ module RightConf
       options = [ 'gem','install' ]
       options += bundler_file
       options += [ '--no-ri', '--no-rdoc',  { :abort_on_failure => 'Failed to install bundler' } ]
-      res = Command.execute(*options)
+      res = Command.execute_in_ruby(*options)
       report_success
       true
     end

data/lib/rconf/configurators/mercurial_configurator.rb

@@ -31,7 +31,7 @@ module RightConf
     def run_linux
       unless mercurial_installed
         opts = { :report => true }.merge(abort_option('Failed to install Mercurial'))
-        PackageInstaller.install('mercurial', opts)
+        PackageInstaller.install('mercurial', opts) { !mercurial_installed }
       end
     end
 
@@ -42,17 +42,21 @@ module RightConf
     def run_darwin
       unless mercurial_installed
         report_check('Installing Mercurial')
-        tempdir = File.join(ENV['HOME'], '.rconf', 'temp')
+        tempdir = File.join(ENV['HOME'], '.rconf_temp')
         FileUtils.mkdir_p(tempdir)
-        Dir.chdir(tempdir) do
-          Command.execute('curl', '-O', '-f', MAC_MERCURIAL_URL,
-                          abort_option('Failed to download Mercurial'))
-          Command.execute('unzip', File.basename(MAC_MERCURIAL_URL),
-                          abort_option('Failed to unzip Mercurial'))
-        end
-        Dir.chdir(File.join(tempdir, MAC_MERCURIAL_FILE)) do
-          Command.sudo('installer', '-pkg', MAC_MERCURIAL_FILE.gsub('_', '+') + '.mpkg', '-target', '/',
-                       abort_option('Failed to install Mercurial'))
+        begin
+          Dir.chdir(tempdir) do
+            Command.execute('curl', '-O', '-f', MAC_MERCURIAL_URL,
+                            abort_option('Failed to download Mercurial'))
+            Command.execute('unzip', File.basename(MAC_MERCURIAL_URL),
+                            abort_option('Failed to unzip Mercurial'))
+          end
+          Dir.chdir(File.join(tempdir, MAC_MERCURIAL_FILE)) do
+            Command.sudo('installer', '-pkg', MAC_MERCURIAL_FILE.gsub('_', '+') + '.mpkg', '-target', '/',
+                         abort_option('Failed to install Mercurial'))
+          end
+        ensure
+          FileUtils.rm_rf(tempdir)
         end
         report_success
       end

data/lib/rconf/configurators/passenger_configurator.rb

@@ -40,7 +40,7 @@ module RightConf
     def run_linux
       set_defaults
       report_check("Checking for passenger gem #{gem_version}")
-      res = Command.execute('gem', 'list', 'passenger')
+      res = Command.execute_in_ruby('gem', 'list', 'passenger')
       success = (res.output =~ /^passenger \(#{gem_version}\)$/)
       report_result(success)
       install_gem unless success
@@ -112,7 +112,7 @@ module RightConf
     # true:: Always return true
     def install_gem
       report_check('Installing passenger gem')
-      Command.execute('gem', 'install', 'passenger', '-v', gem_version,
+      Command.execute_in_ruby('gem', 'install', 'passenger', '-v', gem_version,
                       :abort_on_failure => "Failed to install passenger gem version #{gem_version}")
       report_success
     end
@@ -126,7 +126,7 @@ module RightConf
       # Grrrrr passenger installer expect rake where it's not... HACK
       ruby_dir = File.dirname(`which ruby`.chomp)
       FileUtils.cp(`which rake`.chomp, ruby_dir) unless rake_exist = File.exist?(File.join(ruby_dir, 'rake'))
-      Command.execute('passenger-install-nginx-module', '--auto',
+      Command.execute_in_ruby('passenger-install-nginx-module', '--auto',
                       '--auto-download', '--prefix', install_path,
                       :abort_on_failure => "Failed to install nginx into #{install_path}")
       FileUtils.mkdir_p(File.join(install_path, 'sites-enabled'))
@@ -173,8 +173,8 @@ module RightConf
     # === Return
     # config(String):: Nginx config
     def nginx_config
-      ruby_bin = Command.execute('which', 'ruby').output.chomp
-      res = Command.execute('ruby', '-e', "require 'rubygems';puts Gem.source_index.find_name('passenger').detect { |g| g.version.to_s == '#{PASSENGER_GEM_VERSION}' }.full_gem_path",
+      ruby_bin = Command.execute_in_ruby('which', 'ruby').output.chomp
+      res = Command.execute_in_ruby('ruby', '-e', "require 'rubygems';puts Gem.source_index.find_name('passenger').detect { |g| g.version.to_s == '#{PASSENGER_GEM_VERSION}' }.full_gem_path",
                             :abort_on_failure => 'Could not find passenger gem to build passenger_root')
       passenger_root = res.output.chomp
       report_fatal('Could not find passenger gem') if passenger_root.empty?

data/lib/rconf/configurators/ruby_configurator.rb

@@ -36,6 +36,7 @@ module RightConf
     # true:: Always return true
     def run_linux
       check_rvm(RVM_VERSION)
+      Command.set_ruby(version, gemset)
       report_check("Checking whether #{version} is the active ruby")
       out = Command.execute('rvm', 'list').output
       if out =~ /^=> #{version.gsub('.', '\\.')}/
@@ -47,8 +48,10 @@ module RightConf
         case out
         when /is not installed\./
           report_failure
-          report_fatal "Failed to install #{ruby}: #{@out}" if @out
-          @out = install_ruby(version)
+          report_fatal "Failed to install #{ruby}" if @tried
+          install_ruby(version)
+          @tried = true
+          Command.execute_in_ruby('gem', 'install', 'rconf') unless gemset
           run
           return true
         when /^Using /
@@ -69,7 +72,7 @@ module RightConf
           report_check("Creating gemset #{gemset} for  #{version}")
           Command.execute('rvm', version, 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 
-          Command.execute('rvm', "#{version}@#{gemset}", 'gem', 'install', 'rconf')
+          Command.execute_in_ruby('gem', 'install', 'rconf')
           report_success
         end
         report_check("Switching to gemset #{gemset}")
@@ -77,6 +80,16 @@ module RightConf
                         :abort_on_failure => "Failed to switch to gemset '#{gemset}'") 
         report_success
       end
+      report_check("Checking whether rubygems #{rubygems} is installed")
+      res = Command.execute_in_ruby('gem', '--version')
+      if res.success? && res.output.chomp == rubygems
+        report_success
+      else
+        report_failure
+        report_check("Installing rubygems #{rubygems}")
+        Command.execute_in_ruby('rubygems', rubygems, :abort_on_failure => 'Failed to install rubygems')
+        report_success
+      end
       true
     end
     alias :run_darwin :run_linux
@@ -95,7 +108,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def post_process
-      Command.set_prefix("rvm #{version}@#{gemset} exec --")
+      Command.set_ruby(version, gemset)
       check_rvmrc
       true
     end
@@ -142,14 +155,13 @@ module RightConf
     # ruby(String):: Ruby version compatible with rvm
     #
     # === Return
-    # out(String):: Installation output
+    # true:: Always return true
     def install_ruby(ruby)
       Platform.dispatch(ruby) { :install_ruby_prerequesites } 
       report_check("Installing #{ruby} (this will take a while, please be patient)")
       Command.execute('rvm', 'install', ruby, :abort_on_failure => 'Failed to install ruby')
-      res = Command.execute('rvm', ruby, 'gem', 'install', 'rconf')
       report_success
-      res.output
+      true
     end
 
     # Make sure to install all required linux packages first

data/lib/rconf/support/package_installer.rb

@@ -24,14 +24,30 @@ module RightConf
     #   and display given error message if install fails when set
     # opts[:report](TrueClass|FalseClass):: Whether to report installation
     #
+    # === Block
+    # If a block is given it will get called with no argument prior to the
+    # packages being installed. If the block returns true then installation
+    # will proceed otherwise it won't. Use the block to check whether 
+    # installation is required or whether the packages are already installed.
+    # If no block is given then installation will always occur.
+    #
     # === Return
     # true:: Always return true
-    def install(packages, opts=nil)
+    def install(packages, opts=nil, &install_check)
       packages = [ packages ].flatten
       report = opts && opts.delete(:report)
-      report_check("Installing the following packages:\n#{packages.join(' ')}\nThis could take a while") if report
-      Platform.dispatch(packages, opts) { :install }
-      report_success if report
+      must_install = true
+      if install_check
+        report_check("Checking for #{packages.join(', ')}") if report
+        must_install = install_check.call
+        report_result(must_install) if report
+      end
+      if must_install
+        report_check("Installing #{packages.join(', ')}") if report
+        Platform.dispatch(packages, opts) { :install }
+        report_success if report
+      end
+      true
     end
 
     protected

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -20,27 +20,33 @@ describe RightConf::BundlerConfigurator do
   before(:each) do
     lang = RightConf::Language.parse('bundler { version "0" }')
     @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_fatal, :report_success].each do |meth|
+    [:report_check, :report_result, :report_success].each do |meth|
       flexmock(@configurator).should_receive(meth)
     end
+    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
+    RightConf::Command.instance.instance_variable_set(:@rvm_prefix, 'r@g')
+  end
+
+  after(:each) do
+    RightConf::Command.instance.instance_variable_set(:@rvm_prefix, nil)
   end
 
   it 'should succeed when bundler succeeds' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+    flexmock(RightConf::Command.instance).should_receive(:execute_in_ruby).once.with(
       'bundle', '--version').and_return(success_result('0'))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+    flexmock(RightConf::Command.instance).should_receive(:execute_in_ruby).once.with(
       'bundle','_0_', 'install', {:abort_on_failure=>"Failed to install gems"}).and_return(success_result)
     @configurator.run_linux
   end
 
   it 'should install bunlder if needed' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).twice.with(
+    flexmock(RightConf::Command.instance).should_receive(:execute_in_ruby).twice.with(
       'bundle', '--version').and_return(success_result('1'))
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+    flexmock(RightConf::Command.instance).should_receive(:execute_in_ruby).once.with(
       'bundle','_0_', 'install', {:abort_on_failure=>"Failed to install gems"}).and_return(success_result)
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+    flexmock(RightConf::Command.instance).should_receive(:execute_in_ruby).once.with(
       'gem', 'uninstall', 'bundler', '-a', '-x').and_return(success_result)
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+    flexmock(RightConf::Command.instance).should_receive(:execute_in_ruby).once.with(
       'gem', 'install', 'bundler', '-v', '0', '--no-ri', '--no-rdoc',
       {:abort_on_failure=>"Failed to install bundler"}).once.and_return(success_result)
     @configurator.run_linux

data/spec/configurators/packages_configurator_spec.rb

@@ -20,9 +20,10 @@ describe RightConf::PackagesConfigurator do
   before(:each) do
     lang = RightConf::Language.parse('packages { debian %w(deb1 deb2); centos %w(cent1 cent2); darwin %w(mac1 mac2) }')
     @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_fatal, :report_success].each do |meth|
+    [:report_check, :report_result, :report_success].each do |meth|
       flexmock(@configurator).should_receive(meth)
     end
+    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
   end
 
   it 'should install packages on Ubuntu' do

data/spec/configurators/passenger_configurator_spec.rb

@@ -16,9 +16,10 @@ describe RightConf::PassengerConfigurator do
   before(:each) do
     lang = RightConf::Language.parse('passenger {}')
     @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_fatal, :report_success].each do |meth|
+    [:report_check, :report_result, :report_success].each do |meth|
       flexmock(@configurator).should_receive(meth)
     end
+    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
   end
 
   it 'should set defaults' do

data/spec/configurators/ruby_configurator_spec.rb

@@ -22,9 +22,10 @@ describe RightConf::RubyConfigurator do
   before(:each) do
     lang = RightConf::Language.parse('ruby { version "0"; rubygems "1" }')
     @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_fatal, :report_success, :report].each do |meth|
+    [:report_check, :report_result, :report_success, :report].each do |meth|
       flexmock(@configurator).should_receive(meth)
     end
+    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
   end
 
   it 'should succeed on linux when rvm succeeds' do
@@ -33,7 +34,9 @@ describe RightConf::RubyConfigurator do
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'rvm', 'list').and_return(success_result("=> rvm #{RVM_VERSION}"))
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'use', '0').and_return(success_result('Using'))
+      'rvm', 'use', '0').and_return(success_result('Using '))
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'rvm', '0@', 'gem', '--version').and_return(success_result('1'))
     @configurator.run_linux
   end
 
@@ -54,8 +57,25 @@ describe RightConf::RubyConfigurator do
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       './install', {:abort_on_failure=>"Failed to install rvm #{RVM_VERSION}"}).and_return(success_result)
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'use', '0').and_return(success_result('Using'))
-      flexmock(@configurator).should_receive(:setup_bashrc).once.and_return(true)
+      'rvm', 'use', '0').and_return(success_result('Using '))
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'rvm', '0@', 'gem', '--version').and_return(success_result('1'))
+    flexmock(@configurator).should_receive(:setup_bashrc).once.and_return(true)
+    @configurator.run_linux
+  end
+
+  it 'should install rubygems if needed' do
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'rvm', '--version').and_return(success_result("rvm #{RVM_VERSION}"))
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'rvm', 'list').and_return(success_result("=> rvm #{RVM_VERSION}"))
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'rvm', 'use', '0').and_return(success_result('Using '))
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'rvm', '0@', 'gem', '--version').and_return(success_result('0'))
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'rvm', '0@', 'rubygems', '1',
+      {:abort_on_failure=>'Failed to install rubygems'}).and_return(success_result)
     @configurator.run_linux
   end
 

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.25
+  version: 0.6.30
 platform: ruby
 authors: 
 - Raphael Simon