rconf 0.8.21 → 0.8.29

data/bin/rconf

@@ -33,6 +33,7 @@ where [options] are:
         EOS
 
         opt :configurators, 'Show available configurators'
+        opt :platform, 'Show current platform'
         opt :update, 'Update rconf to latest version'
         opt :remove, 'Remove rconf from all gemsets'
         opt :config, 'Set path to configuration file', :type => :string
@@ -59,6 +60,8 @@ where [options] are:
       Command.set_verbose if opts[:verbose]
       if opts[:configurators]
         new.list_configurators
+      elsif opts[:platform]
+        new.show_platform
       elsif opts[:update]
         new.update
       elsif opts[:remove]
@@ -93,6 +96,17 @@ where [options] are:
       end
     end
 
+    # Show current platform as detected by rconf
+    #
+    # === Return
+    # true:: Always return true
+    def show_platform
+      puts "rconf detected the following:\n\n"
+      puts "Family: #{Platform.family}"
+      puts "Flavor: #{Platform.flavor}"
+      puts "Release: #{Platform.release}"
+    end
+
     # Update rconf to latest in all installed rubies
     #
     # === Return

data/lib/rconf/command.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -27,6 +27,11 @@ module RightConf
     # command(String):: Command to run
     # args(Array):: Command arguments
     #
+    # === Options
+    # abort_on_failure(bool):: Whether to raise an exception in case command 
+    #                          returns an error (false by default)
+    # env:: Hash of environment variables keyed by name
+    #
     # === Return
     # result(CommandResult):: Result of execution (output and exit status)
     def execute(command, *args)
@@ -35,7 +40,7 @@ module RightConf
         opts = args[-1]
         args = args[0..-2]
       end
-      res = Platform.dispatch(command, *args) { :execute }
+      res = Platform.dispatch(command, opts[:env], *args) { :execute }
       if @verbose
         msg = ([command] + args).compact.join(' ') + ' => ' +
           res.status.to_s + ': ' + res.output
@@ -53,6 +58,11 @@ module RightConf
     # command(String):: Command to run
     # args(Array):: Command arguments
     #
+    # === Options
+    # abort_on_failure(bool):: Whether to raise an exception in case command 
+    #                          returns an error (false by default)
+    # env:: Hash of environment variables keyed by name
+    #
     # === Return
     # result(CommandResult):: Result of execution (output and exit status)
     #   NOTE: This is the result returned by RVM, not the underlying command
@@ -85,12 +95,17 @@ module RightConf
     # 
     # === Parameters
     # command(String):: Command name
+    # env(Hash):: Hash of environment variables keyed by name
     # params(Array):: List of parameters to pass to command
     #
     # === Return
     # result(CommandResult):: Result of execution (output and exit status)
-    def execute_linux(command, *args)
+    def execute_linux(command, env, *args)
+      env ||= {}
+      old_envs = env.keys.inject({}) { |o, k| o[k] = ENV[k]; o }
+      env.each { |k, v| ENV[k] = v.to_s }
       out = `#{Shellwords.join([command, *args])} 2>&1`
+      old_envs.each { |k, v| ENV[k] = v }
       result = CommandResult.new(out, $?.exitstatus)
     end
     alias :execute_darwin :execute_linux
@@ -99,11 +114,12 @@ module RightConf
     # 
     # === Parameters
     # command(String):: Command name
+    # env(Hash):: Hash of environment variables keyed by name
     # params(Array):: List of parameters to pass to command
     #
     # === Return
     # result(CommandResult):: Result of execution (output and exit status)
-    def execute_windows(command, *args)
+    def execute_windows(command, env, *args)
       raise 'TBD!'
     end
 

data/lib/rconf/configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -136,7 +136,7 @@ module RightConf
           must_configure = (Profile.force_check? || sha != sig) && !check
         end
         Platform.dispatch(*args) { :run } if must_configure
-        Profile.set_configurator_signature(key, sig)
+        Profile.set_configurator_signature(key, sig) unless aborting
       true
     end
 

data/lib/rconf/configurators/mercurial_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -14,7 +14,9 @@ module RightConf
   class MercurialConfigurator
 
     MAC_MERCURIAL_URL  = 'http://mercurial.berkwood.com/binaries/Mercurial-1.8.1-py2.6-macosx10.6.zip'
+    MAC_10_7_MERCURIAL_URL  = 'http://mercurial.berkwood.com/binaries/Mercurial-2.0.2-py2.7-macosx10.7.zip'
     MAC_MERCURIAL_FILE = 'mercurial-1.8.1_20110310-py2.6-macosx10.6'
+    MAC_10_7_MERCURIAL_FILE = 'mercurial-2.0.2_20120104-py2.7-macosx10.7'
 
     include Configurator
 
@@ -43,10 +45,8 @@ module RightConf
     # === 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) { !mercurial_installed }
-      end
+      opts = { :report => true }.merge(abort_option('Failed to install Mercurial'))
+      PackageInstaller.install('mercurial', opts)
     end
 
     # Brew does not have a package for mercurial :( 
@@ -54,26 +54,54 @@ module RightConf
     # === 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)
-        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)
+      report_check('Installing Mercurial')
+      tempdir = File.join(ENV['HOME'], '.rconf_temp')
+      FileUtils.mkdir_p(tempdir)
+      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
-        report_success
+      ensure
+        FileUtils.rm_rf(tempdir)
       end
+      report_success
+    end
+
+    # URL to mercurial installer for Mac OS X
+    def mac_mercurial_url
+      Platform.dispatch { :mac_mercurial_url }
+    end
+
+    # URL to mercurial installer for Mac OS X < 10.7
+    def mac_mercurial_url_darwin
+      MAC_MERCURIAL_URL
+    end
+
+    # URL to mercurial installer for Mac OS X >= 10.7
+    def mac_mercurial_url_darwin_lion
+      MAC_10_7_MERCURIAL_URL
+    end
+
+    # File name of mercurial installer for Mac OS X
+    def mac_mercurial_file
+      Platform.dispatch { :mac_mercurial_file }
+    end
+
+    # File name of mercurial installer for Mac OS X < 10.7
+    def mac_mercurial_file_darwin
+      MAC_MERCURIAL_FILE
+    end
+
+    # File name of mercurial installer for Mac OS X >= 10.7
+    def mac_mercurial_file_darwin_lion
+      MAC_10_7_MERCURIAL_FILE
     end
 
     # Install Windows software

data/lib/rconf/configurators/ruby_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -64,7 +64,7 @@ module RightConf
         when /is not installed\./
           report_failure
           report_fatal "Failed to install #{ruby}" if @tried
-          install_ruby(version)
+          Platform.dispatch(version) { :install_ruby }
           @tried = true
           Command.execute_in_ruby('gem', 'install', 'rconf') unless gemset
           run
@@ -185,6 +185,30 @@ module RightConf
       true
     end
 
+    # Install given ruby version using rvm
+    # On Lion, need to setup CC env var before running rvm install
+    #
+    # === Parameters
+    # ruby(String):: Ruby version compatible with rvm
+    #
+    # === Return
+    # true:: Always return true
+    def install_ruby_darwin(ruby)
+      report_check("Installing #{ruby} (this will take a while, please be patient)")
+      xml = Command.execute('system_profiler', 'SPDeveloperToolsDataType', '-xml')
+      version = Command.execute('xpath', '"//*[text()=\'_items\']/following-sibling::array/dict/child::key[text()=\'spdevtools_version\']/following-sibling::string/text()"')
+      env = {}
+      if version =~ /^4\.2\./ 
+        if !File.executable?('/usr/bin/gcc-4.2')
+          report_fatal("The C compiler included with Xcode #{version} produces buggy ruby interpreters, please install the C compilers from https://github.com/downloads/kennethreitz/osx-gcc-installer/GCC-10.7-v2.pkg and re-run rconf")
+        else
+          env['CC'] = '/usr/bin/gcc-4.2'
+        end
+      end
+      Command.execute('rvm', 'install', ruby, :abort_on_failure => 'Failed to install ruby', :env => env)
+      report_success
+    end
+
     # Make sure to install all required linux packages first
     #
     # === Return 

data/lib/rconf/platform.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -106,7 +106,8 @@ module RightConf
     def dispatch_candidates(prefix)
       candidates = ["#{prefix}_#{family}_#{flavor}_#{release}",
                     "#{prefix}_#{family}_#{flavor}",
-                    "#{prefix}_#{family}"]
+                    "#{prefix}_#{family}",
+                    "#{prefix}"]
       candidates.map(&:to_sym)
     end
 

data/lib/rconf/platforms/darwin.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -20,8 +20,22 @@ module RightConf
     def init
       @flavor = 'mac_os_x'
       @release = `sw_vers -productVersion`
+      distros.keys.each do |k|
+        if @release =~ /^10\.#{k}\.[0-9]+/
+          @flavor = distros[k]
+          return
+        end
+      end
     end
 
+    # Mac OS X distros used to setup 'flavor'
+    def distros
+      { 5 => 'leopard',
+        6 => 'snow leopard',
+        7 => 'lion' }
+    end
+
+
   end
 
 end

data/lib/rconf/version.rb

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

data/spec/command_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -22,16 +22,23 @@ describe RightConf::Command do
   end
 
   it 'should execute' do
-    flexmock(RightConf::Platform.instance).should_receive(:dispatch).with('test', '42', Proc).once.and_return(success_result)
+    flexmock(RightConf::Platform.instance).should_receive(:dispatch).with('test', nil, '42', Proc).once.and_return(success_result)
     RightConf::Command.execute('test', '42')
   end
 
   it 'should report fatal errors when required to' do
-    flexmock(RightConf::Platform.instance).should_receive(:dispatch).with('test', '42', 
+    flexmock(RightConf::Platform.instance).should_receive(:dispatch).with('test', nil, '42', 
        Proc).once.and_return(failed_result)
     flexmock(RightConf::Command.instance).should_receive(:report_fatal).once.with("FAILED: 'test 42' returned\n1")
     RightConf::Command.execute('test', '42', :abort_on_failure => 'FAILED')
   end
+  
+  it 'should setup environment variables' do
+    ENV['THIS_IS_A_TEST_ENV_VALUE'].should be_nil
+    res = RightConf::Command.execute('env', :env => { 'THIS_IS_A_TEST_ENV_VALUE' => '42' })
+    ENV['THIS_IS_A_TEST_ENV_VALUE'].should be_nil
+    res.output.should =~ /^THIS_IS_A_TEST_ENV_VALUE=42$/
+  end
 
 end
 

data/spec/platform_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -13,20 +13,20 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe RightConf::Platform do
 
-   it 'should try to dispatch using platform family' do
+  it 'should try to dispatch using platform family' do
     def test_amiga(val); val; end
     flexmock(RightConf::Platform.instance).should_receive(:family).and_return('amiga')
     RightConf::Platform.dispatch(44) { :test }.should == 44
   end
 
-   it 'should try to dispatch using platform family and flavor' do
+  it 'should try to dispatch using platform family and flavor' do
     def test_atari_st(val); val; end
     flexmock(RightConf::Platform.instance).should_receive(:flavor).and_return('st')
     flexmock(RightConf::Platform.instance).should_receive(:family).and_return('atari')
     RightConf::Platform.dispatch(43) { :test }.should == 43
   end
 
-it 'should try to dispatch using platform family, flavor and release' do
+  it 'should try to dispatch using platform family, flavor and release' do
     def test_commodore_c_64(val); val; end
     flexmock(RightConf::Platform.instance).should_receive(:release).and_return('64')
     flexmock(RightConf::Platform.instance).should_receive(:flavor).and_return('c')
@@ -34,4 +34,10 @@ it 'should try to dispatch using platform family, flavor and release' do
     RightConf::Platform.dispatch(42) { :test }.should == 42
   end
 
+  it 'should default to no suffix' do
+    def test(val); val; end
+    flexmock(RightConf::Platform.instance).should_receive(:family).and_return('non-existent')
+    RightConf::Platform.dispatch(41) { :test }.should == 41
+  end
+
 end

data/spec/profile_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -20,14 +20,18 @@ describe RightConf::Profile do
 
   it 'should reset when forcing checks' do
     flexmock(RightConf::Profile.instance).should_receive(:reset).once
+    old_check = RightConf::Profile.instance.instance_variable_get(:@force_check)
     RightConf::Profile.force_check
     RightConf::Profile.force_check?.should be_true
+    RightConf::Profile.instance.instance_variable_set(:@force_check, old_check)
   end
 
   it 'should reset when forcing re-configuration' do
     flexmock(RightConf::Profile.instance).should_receive(:reset).once
+    old_reconfigure = RightConf::Profile.instance.instance_variable_get(:@force_reconfigure)
     RightConf::Profile.force_reconfigure
     RightConf::Profile.force_reconfigure?.should be_true
+    RightConf::Profile.instance.instance_variable_set(:@force_reconfigure, old_reconfigure)
   end
 
 end

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 21
-  version: 0.8.21
+  - 29
+  segments_generated: true
+  version: 0.8.29
 platform: ruby
 authors: 
 - Raphael Simon
@@ -14,37 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 -08:00
+date: 2012-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 5
+        segments_generated: true
         version: "2.5"
+  requirement: *id001
+  name: rspec
+  prerelease: false
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: flexmock
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 9
+        segments_generated: true
         version: "0.9"
+  requirement: *id002
+  name: flexmock
+  prerelease: false
   type: :development
-  version_requirements: *id002
 description: |
   rconf configures the environment for a given application. rconf reads
   the content of an application configuration file and installs and/or
@@ -127,25 +128,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration