rconf 0.9.17 → 0.9.18

data/lib/rconf/command.rb

@@ -75,6 +75,27 @@ module RightConf
       execute('rvm', *args)
     end
 
+    # Execute rvm command
+    #
+    # === Parameters
+    # command(String):: rvm 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_rvm(command, *args)
+      report_fatal('Failed to run in ruby context, no ruby specified') unless @rvm_prefix
+      commands = @rvm_prefix + [ command ]
+      args = commands + args
+      execute('rvm', *args)
+    end
+
+
     # Execute given command with given arguments using 'sudo'
     #
     # === Parameters

data/lib/rconf/configurators/ruby_configurator.rb

@@ -110,7 +110,7 @@ module RightConf
         else
           report_failure
           report_check("Installing rubygems #{rubygems}")
-          Command.execute_in_ruby('rubygems', rubygems, :abort_on_failure => 'Failed to install rubygems')
+          Command.execute_rvm('rubygems', rubygems, :abort_on_failure => 'Failed to install rubygems')
           report_success
         end
       end

data/lib/rconf/version.rb

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

data/spec/configurators/ruby_configurator_spec.rb

@@ -29,16 +29,16 @@ describe RightConf::RubyConfigurator do
   it 'should succeed on linux when rvm succeeds' do
     should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))
     should_execute('rvm', 'current').once.and_return(success_result("0@"))
-    should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('1'))
+    should_execute('rvm', '0@', 'exec', '--', 'gem', '--version').once.and_return(success_result('1'))
     @configurator.run_linux
   end
 
   it 'should install rvm if needed' do
-    rvm_tar = "rvm-#{RVM_VERSION}.tar.gz" 
+    rvm_tar = "rvm-#{RVM_VERSION}.tar.gz"
     should_execute('rvm', '--version').once.and_return(success_result("rvm"))
     should_execute('curl', '-O', '-f', "https://rvm.beginrescueend.com/releases/#{rvm_tar}",
       {:abort_on_failure=>"Failed to download rvm #{RVM_VERSION}"}).once.and_return(success_result)
-    should_execute('tar', 'zxf', rvm_tar, 
+    should_execute('tar', 'zxf', rvm_tar,
       {:abort_on_failure=>"Failed to extract rvm tgz from #{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "rvm-#{RVM_VERSION}.tar.gz"))}"}).once.and_return(success_result)
     flexmock(Dir).should_receive(:chdir).and_yield
     should_execute('./install', {:abort_on_failure=>"Failed to install rvm #{RVM_VERSION}"}).once.and_return(success_result)
@@ -49,7 +49,7 @@ describe RightConf::RubyConfigurator do
   it 'should install rubygems if needed' do
     should_execute('rvm', '--version').once.and_return(success_result("rvm #{RVM_VERSION}"))
     should_execute('rvm', 'current').once.and_return(success_result("0@"))
-    should_execute('rvm', '0@', 'gem', '--version').once.and_return(success_result('0'))
+    should_execute('rvm', '0@', 'exec', '--', 'gem', '--version').once.and_return(success_result('0'))
     should_execute('rvm', '0@', 'rubygems', '1',
       {:abort_on_failure=>'Failed to install rubygems'}).once.and_return(success_result)
     @configurator.run_linux

metadata

@@ -1,68 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rconf
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 17
-  version: 0.9.17
+version: !ruby/object:Gem::Version
+  version: 0.9.18
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Raphael Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-25 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70325338382960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: flexmock
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70325338382960
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &70325338382440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   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
-  configures the required tools for running or developing the corresponding
-  application. rconf can easily be extended to configure new tools and makes
-  it easy to support multiple platforms.
-  Consult the README.rdoc file for information on how to write rconf 
-  configuration files.
-
-email: 
+  prerelease: false
+  version_requirements: *70325338382440
+description: ! "rconf configures the environment for a given application. rconf reads\nthe
+  content of an application configuration file and installs and/or\nconfigures the
+  required tools for running or developing the corresponding\napplication. rconf can
+  easily be extended to configure new tools and makes\nit easy to support multiple
+  platforms.\nConsult the README.rdoc file for information on how to write rconf \nconfiguration
+  files.\n"
+email:
 - raphael@rightscale.com
-executables: 
+executables:
 - rconf
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -118,39 +101,31 @@ files:
 - 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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rconf
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration
-test_files: 
+test_files:
 - spec/command_spec.rb
 - spec/configurator_spec.rb
 - spec/configurators/build_configurator_spec.rb