rconf 0.6.23 → 0.6.24

data/lib/rconf/command.rb

@@ -44,6 +44,19 @@ module RightConf
       res
     end
 
+    # Execute given command with given arguments using 'sudo'
+    #
+    # === Parameters
+    # command(String):: Command to run
+    # args(Array):: Command arguments
+    #
+    # === Return
+    # result(CommandResult):: Result of execution (output and exit status)
+    def sudo(*args)
+      args = args.unshift('/usr/bin/sudo')
+      Command.execute(*args)
+    end
+
     # Execute given command on *nix systems
     # 
     # === Parameters

data/lib/rconf/configurator.rb

@@ -202,4 +202,5 @@ module RightConf
 end
 
 # Load all configurators
+Dir[File.join(File.dirname(__FILE__), 'support', '*.rb')].each { |c| require c }
 Dir[File.join(File.dirname(__FILE__), 'configurators', '*.rb')].each { |c| require c }

data/lib/rconf/configurators/mercurial_configurator.rb

@@ -0,0 +1,97 @@
+# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited. Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and
+# the licensee
+
+module RightConf
+
+  class MercurialConfigurator
+
+    MAC_MERCURIAL_URL  = 'http://mercurial.berkwood.com/binaries/Mercurial-1.8.1-py2.6-macosx10.6.zip'
+    MAC_MERCURIAL_FILE = 'mercurial-1.8.1_20110310-py2.6-macosx10.6'
+
+    include Configurator
+
+    register :mercurial
+
+    description 'Installs Mercurial'
+
+    settings :abort_on_failure => 'Whether to abort if Mercurial failed to install (false by default)'
+
+    # Install Linux Mercurial package
+    #
+    # === Return
+    # true:: Always return true
+    def run_linux
+      unless mercurial_installed
+        opts = { :report => true }.merge(abort_option('Failed to install Mercurial'))
+        PackageInstaller.install('mercurial', opts)
+      end
+    end
+
+    # Brew does not have a package for mercurial :( 
+    #
+    # === Return
+    # true:: Always return true
+    def run_darwin
+      unless mercurial_installed
+        report_check('Installing Mercurial')
+        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'))
+        end
+        report_success
+      end
+    end
+
+    # Install Windows software
+    #
+    # === Return
+    # true:: Always return true
+    def run_windows
+      # TBD
+    end
+
+    protected
+
+    # Check whether Mercurial is installed
+    #
+    # === Return
+    # true:: If Mercurial is installed
+    # false:: Otherwise
+    def mercurial_installed
+      report_check("Checking for Mercurial")
+      installed = Command.execute('hg', '--version').success? 
+      report_result(installed)
+      installed
+    end
+
+    # Produce abort on failure option
+    #
+    # === Parameters
+    # message(String):: Abort message to be used in case abort option should be set
+    #
+    # === Return
+    # {}:: Empty hash if 'abort_on_failure' is notset
+    # opts(Hash):: Abort option with give message otherwise
+    def abort_option(message)
+      opts = abort_on_failure && { :abort_on_failure => message } || {}
+    end
+
+  end
+end
+

data/lib/rconf/configurators/packages_configurator.rb

@@ -22,51 +22,48 @@ module RightConf
     settings :debian  => 'Packages to be installed on Debian based Linux',
              :centos  => 'Packages to be installed on RedHat / Centos',
              :windows => 'Softwared to be downloaded and installed on Windows',
-             :mac     => 'Brew packages to be installed on Mac OS X (https://github.com/mxcl/homebrew)',
+             :darwin  => 'Brew packages to be installed on Mac OS X (https://github.com/mxcl/homebrew)',
              :abort_on_failure => 'Whether to abort if packages failed to install (false by default)'
 
-    # Install debian packages
+    # Install packages on debian based oses
     #
     # === Return
     # true:: Always return true
     def run_linux_ubuntu
-      return if debian.nil?
-      report_check("Installing the following packages:\n#{debian.join(' ')}\nThis could take a while")
-      opts = debian.dup 
-      opts << { :abort_on_failure => 'Failed to install packages' } if abort_on_failure
-      Command.execute('sudo', 'apt-get', 'install', '-y', *opts)
-      report_success
+      PackageInstaller.install(debian, options)
+      true
     end
     alias :run_linux_debian :run_linux_ubuntu
 
-    # Install yum packages
+    # Install packages on centos based oses
     #
     # === Return
     # true:: Always return true
     def run_linux_centos
-      return if centos.nil?
-      report_check("Installing the following packages:\n#{centos.join(' ')}\nThis could take a while")
-      opts = centos.dup
-      opts << { :abort_on_failure => 'Failed to install packages' } if abort_on_failure
-      Command.execute('sudo', 'yum', 'install', '-y', *opts)
-      report_success
+      PackageInstaller.install(centos, options)
+      true
     end
     alias :run_linux_redhat :run_linux_centos
 
-    # Install Windows software
+    # Install packages on macs
     #
     # === Return
     # true:: Always return true
-    def run_windows
-      # TBD
+    def run_darwin
+      PackageInstaller.install(darwin, options)
+      true
     end
 
-    # Use brew on Mac OS X
+    protected
+
+    # Calculate options to be given to installer
     #
     # === Return
-    # true:: Always return true
-    def run_darwin
-      # TBD, check brew is installed then use
+    # opts(Hash):: Hash of options to be given to installer
+    def options
+      opts = { :report => true }
+      opts.merge!({ :abort_on_failure => 'Failed to install packages' }) if abort_on_failure
+      opts
     end
 
   end

data/lib/rconf/configurators/ruby_configurator.rb

@@ -162,7 +162,7 @@ module RightConf
       if ruby =~ /^ree-|^ruby-/
         packages = %w(build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev)
       end # TBD Define packages needed for other rubies
-      Command.execute('sudo', 'apt-get', 'install', '-y', *packages) 
+      Command.sudo('apt-get', 'install', '-y', *packages) 
       report_success
     end
 
@@ -177,7 +177,7 @@ module RightConf
       if ruby =~ /^ree-|^ruby-/
         packages = %w(gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel openssl-devel iconv-devel)
       end # TBD Define packages needed for other rubies
-      Command.execute('sudo', 'yum', 'install', '-y', *packages) 
+      Command.sudo('yum', 'install', '-y', *packages) 
       report_success
     end
     alias :install_ruby_prerequesites_linux_redhat :install_ruby_prerequesites_linux_centos

data/lib/rconf/support/brew_installer.rb

@@ -0,0 +1,62 @@
+# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited. Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and
+# the licensee
+
+module RightConf
+
+  class BrewInstaller
+
+    include ProgressReporter
+
+    def self.check_and_install
+      return true if File.directory?('/usr/local/.git')
+      report_check('Installing Homebrew')
+
+      chmods = %w( . bin etc include lib lib/pkgconfig Library sbin share var share/locale share/man
+             share/man/man1 share/man/man2 share/man/man3 share/man/man4
+             share/man/man5 share/man/man6 share/man/man7 share/man/man8
+             share/info share/doc share/aclocal ).
+             map{ |d| "/usr/local/#{d}" }.
+             select{ |d| File.directory? d and not File.writable? d }
+      chgrps = chmods.reject{ |d| File.stat(d).grpowned? }
+
+      if File.directory?('/usr/local')
+        Command.sudo('/bin/chmod', 'g+w', *chmods) unless chmods.empty?
+        # all admin users are in staff
+        Command.sudo('/usr/bin/chgrp', 'staff', *chgrps) unless chgrps.empty?
+      else
+        Command.sudo('/bin/mkdir', '/usr/local')
+        Command.sudo('/bin/chmod', 'g+w', '/usr/local')
+        # the group is set to wheel by default for some reason
+        Command.sudo('/usr/bin/chgrp', 'staff', '/usr/local')
+      end
+
+      Dir.chdir('/usr/local') do
+        # -m to stop tar erroring out if it can't modify the mtime for root owned directories
+        # pipefail to cause the exit status from curl to propogate if it fails
+        system("/bin/bash -o pipefail -c '/usr/bin/curl -sSfL https://github.com/mxcl/homebrew/tarball/master | /usr/bin/tar xz -m --strip 1'")
+      end
+
+      report_success
+
+      unless chmods.empty?
+        report("The following directories had to be made group writable: #{chmods.join(', ')}")
+      end
+      unless chgrps.empty?
+        report("The following directories had their group set to staff: #{chgrps.join(', ')}")
+      end
+      unless ENV['PATH'].split(':').include? '/usr/local/bin'
+        report('/usr/local/bin is not in your PATH.') 
+      end
+    end
+
+  end
+end
+

data/lib/rconf/support/package_installer.rb

@@ -0,0 +1,87 @@
+# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited. Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and
+# the licensee
+
+module RightConf
+
+  class PackageInstaller
+
+    include Singleton
+    include ProgressReporter
+
+    # Install given packages
+    #
+    # === Parameters
+    # packages(String|Array):: Package name or Packages list
+    # opts[:abort_on_failure](String):: Optional, abort configuration
+    #   and display given error message if install fails when set
+    # opts[:report](TrueClass|FalseClass):: Whether to report installation
+    #
+    # === Return
+    # true:: Always return true
+    def install(packages, opts=nil)
+      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
+    end
+
+    protected
+
+    # Install debian packages
+    #
+    # === Return
+    # true:: Always return true
+    def install_linux_ubuntu(packages, opts)
+      return if packages.nil? 
+      args = packages.dup 
+      args << opts if opts
+      Command.sudo('apt-get', 'install', '-y', *args)
+    end
+    alias :install_linux_debian :install_linux_ubuntu
+
+    # Install yum packages
+    #
+    # === Return
+    # true:: Always return true
+    def install_linux_centos(packages, opts)
+      return if packages.nil?
+      args = packages.dup 
+      args << opts if opts
+      Command.sudo('yum', 'install', '-y', *args)
+    end
+    alias :install_linux_redhat :install_linux_centos
+
+    # Use brew on Mac OS X
+    #
+    # === Return
+    # true:: Always return true
+    def install_darwin(packages, opts)
+      return if packages.nil?
+      BrewInstaller.check_and_install
+      packages.each do |p|
+        args = [ p ]
+        args << opts if opts
+        Command.execute('brew', 'install', *args)
+      end
+    end
+    
+    # Install Windows software
+    #
+    # === Return
+    # true:: Always return true
+    def install_windows(packages, opts)
+      # TBD
+    end
+
+  end
+end
+

data/lib/rconf/version.rb

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

data/spec/configurators/packages_configurator_spec.rb

@@ -18,7 +18,7 @@ describe RightConf::PackagesConfigurator do
   end
 
   before(:each) do
-    lang = RightConf::Language.parse('packages { debian %w(deb1 deb2); centos %w(cent1 cent2) }')
+    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|
       flexmock(@configurator).should_receive(meth)
@@ -26,16 +26,19 @@ describe RightConf::PackagesConfigurator do
   end
 
   it 'should install packages on Ubuntu' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'sudo', 'apt-get', 'install', '-y', 'deb1', 'deb2').and_return(success_result)
+    flexmock(RightConf::PackageInstaller.instance).should_receive(:install).once.with(%w(deb1 deb2), { :report => true })
     @configurator.run_linux_ubuntu
   end
 
   it 'should install packages on Centos' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'sudo', 'yum', 'install', '-y', 'cent1', 'cent2').and_return(success_result)
+    flexmock(RightConf::PackageInstaller.instance).should_receive(:install).once.with(%w(cent1 cent2), { :report => true })
     @configurator.run_linux_centos
   end
 
+  it 'should install packages on Darwin' do
+    flexmock(RightConf::PackageInstaller.instance).should_receive(:install).once.with(%w(mac1 mac2), { :report => true })
+    @configurator.run_darwin
+  end
+
 end
   

data/spec/support/package_installer_spec.rb

@@ -0,0 +1,52 @@
+# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited. Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and
+# the licensee
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe RightConf::PackageInstaller do
+
+  def success_result(output=nil)
+    flexmock('res', :success? => true, :output => output)
+  end
+
+  before(:each) do
+    [:report_check, :report_result, :report_fatal, :report_success].each do |meth|
+      flexmock(RightConf::PackageInstaller.instance).should_receive(meth)
+    end
+  end
+
+  it 'should install packages on Ubuntu' do
+    flexmock(RightConf::Platform.instance).should_receive(:family).and_return(:linux)
+    flexmock(RightConf::Platform.instance).should_receive(:flavor).and_return('ubuntu')
+    flexmock(RightConf::Command.instance).should_receive(:sudo).once.with(
+      'apt-get', 'install', '-y', 'deb1', 'deb2').and_return(success_result)
+    RightConf::PackageInstaller.install(['deb1', 'deb2'])
+  end
+
+  it 'should install packages on Centos' do
+    flexmock(RightConf::Platform.instance).should_receive(:family).and_return(:linux)
+    flexmock(RightConf::Platform.instance).should_receive(:flavor).and_return('centos')
+    flexmock(RightConf::Command.instance).should_receive(:sudo).once.with(
+      'yum', 'install', '-y', 'cent1', 'cent2').and_return(success_result)
+    RightConf::PackageInstaller.install(['cent1', 'cent2'])
+  end
+
+  it 'should install packages on Darwin' do
+    flexmock(RightConf::Platform.instance).should_receive(:family).and_return(:darwin)
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'brew', 'install', 'mac1').and_return(success_result)
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+      'brew', 'install', 'mac2').and_return(success_result)
+    RightConf::PackageInstaller.install(['mac1', 'mac2'])
+  end
+
+end
+  

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.23
+  version: 0.6.24
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -07:00
+date: 2011-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - lib/rconf/configurator.rb
 - lib/rconf/configurator_registry.rb
 - lib/rconf/configurators/bundler_configurator.rb
+- lib/rconf/configurators/mercurial_configurator.rb
 - lib/rconf/configurators/packages_configurator.rb
 - lib/rconf/configurators/passenger_configurator.rb
 - lib/rconf/configurators/ruby_configurator.rb
@@ -89,6 +90,8 @@ files:
 - lib/rconf/progress_reporters/file_reporter.rb
 - lib/rconf/progress_reporters/stdout_reporter.rb
 - lib/rconf/ruby_extensions.rb
+- lib/rconf/support/brew_installer.rb
+- lib/rconf/support/package_installer.rb
 - lib/rconf/trollop.rb
 - lib/rconf/version.rb
 - rconf.gemspec
@@ -107,6 +110,7 @@ files:
 - spec/progress_reporters/stdout_reporter_spec.rb
 - spec/ruby_extensions_spec.rb
 - spec/spec_helper.rb
+- spec/support/package_installer_spec.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/rconf
 licenses: []
@@ -150,3 +154,4 @@ test_files:
 - spec/progress_reporters/stdout_reporter_spec.rb
 - spec/ruby_extensions_spec.rb
 - spec/spec_helper.rb
+- spec/support/package_installer_spec.rb