rconf 0.5.5 → 0.5.6

data/lib/rconf/command.rb

@@ -34,7 +34,7 @@ module RightConf
       end
       res = Platform.dispatch(command, *args) { :execute }
       if @verbose
-        msg = (([command] + args).join(' ') + ' => ' +
+        msg = (([@prefix, command] + args).compact.join(' ') + ' => ' +
           res.status.to_s + ': ' + res.output).grey
         report(msg)
       end

data/lib/rconf/configurators/ruby_configurator.rb

@@ -54,8 +54,6 @@ module RightConf
         when /^Using /
           report_success
           check_rvmrc
-          Command.execute('rvm', version, 'exec', 'gem', 'install', 'rconf',
-                          :abort_on_failure => "Failed to install rconf gem in #{version}")
           post_note "Configuration required switching the active ruby\nPlease 'cd' into the project directory again to activate it"
         else
           report_fatal("Failed to use #{version}:\n#{out}")
@@ -71,6 +69,8 @@ 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}", 'exec', 'gem', 'install', 'rconf',
+                          :abort_on_failure => "Failed to install rconf gem in #{version}@#{gemset}")
           report_success
         end
         report_check("Switching to gemset #{gemset}")
@@ -191,7 +191,7 @@ module RightConf
           f.puts "type -P rconf &>/dev/null && { rconf; }"
           f.puts "type -P rconf &>/dev/null || { echo 'rconf not installed, skipping (see .rvmrc)'; }"
         end
-        Command.execute('rvm', 'trust', 'rvmrc')
+        Command.execute('rvm', "#{version}@#{gemset}", 'trust', 'rvmrc')
         report_success
       rescue Exception => e
         report_failure

data/lib/rconf/version.rb

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

data/spec/configurators/packages_configurator_spec.rb

@@ -26,14 +26,14 @@ describe RightConf::PackagesConfigurator do
   end
 
   it 'should install packages on Ubuntu' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).with(
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'sudo', 'aptitude', 'install', 'deb1', 'deb2', 
       {:abort_on_failure=>"Failed to install packages"}).and_return(success_result)
     @configurator.run_linux_ubuntu
   end
 
   it 'should install packages on Centos' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).with(
+    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'sudo', 'yum', 'install', '-y', 'cent1', 'cent2',
       {:abort_on_failure=>"Failed to install packages"}).and_return(success_result)
     @configurator.run_linux_centos

data/spec/configurators/ruby_configurator_spec.rb

@@ -13,6 +13,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe RightConf::RubyConfigurator do
 
+  RVM_VERSION = RightConf::RubyConfigurator::RVM_VERSION
+
   def success_result(output=nil)
     flexmock('res', :success? => true, :output => output)
   end
@@ -27,30 +29,30 @@ describe RightConf::RubyConfigurator do
 
   it 'should succeed on linux when rvm succeeds' do
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', '--version').and_return(success_result("rvm #{RightConf::RubyConfigurator::RVM_VERSION}"))
+      '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 #{RightConf::RubyConfigurator::RVM_VERSION}"))
+      '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'))
     @configurator.run_linux
   end
 
   it 'should install rvm if needed' do
-    rvm_tar = "rvm-#{RightConf::RubyConfigurator::RVM_VERSION}.tar.gz" 
+    rvm_tar = "rvm-#{RVM_VERSION}.tar.gz" 
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'rvm', '--version').and_return(success_result("rvm"))
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'rvm', 'list').and_return(success_result("=> rvm #{RightConf::RubyConfigurator::RVM_VERSION}"))
+      'rvm', 'list').and_return(success_result("=> rvm #{RVM_VERSION}"))
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'curl', '-O', '-f',
       "http://rvm.beginrescueend.com/releases/#{rvm_tar}",
-      {:abort_on_failure=>"Failed to download rvm #{RightConf::RubyConfigurator::RVM_VERSION}"}).and_return(success_result)
+      {:abort_on_failure=>"Failed to download rvm #{RVM_VERSION}"}).and_return(success_result)
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'tar', 'zxf', rvm_tar, 
-      {:abort_on_failure=>"Failed to extract rvm tgz from /Users/raphael/src/right_env/rvm-1.2.6.tar.gz"}).and_return(success_result)
+      {:abort_on_failure=>"Failed to extract rvm tgz from #{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "rvm-#{RVM_VERSION}.tar.gz"))}"}).and_return(success_result)
     flexmock(Dir).should_receive(:chdir).and_yield
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      './install', {:abort_on_failure=>"Failed to install rvm #{RightConf::RubyConfigurator::RVM_VERSION}"}).and_return(success_result)
+      './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'))
     @configurator.run_linux

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rconf
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 5
-  version: 0.5.5
+  prerelease: 
+  version: 0.5.6
 platform: ruby
 authors: 
 - Raphael Simon
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -41,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   version_requirements: *id002
@@ -117,23 +104,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration