rconf 0.6.10 → 0.6.11

data/lib/rconf/configurators/bundler_configurator.rb

@@ -39,7 +39,7 @@ module RightConf
       report_result(success)
       install_bundler unless success
       report_check('Installing gems')
-      options = [ 'install', "_#{version}_" ]
+      options = [ "_#{version}_", 'install' ]
       options << "--without=#{exclusions}" unless exclusions.nil?
       options << "--path #{bundle_path}" unless bundle_path.nil?
       options << { :abort_on_failure => 'Failed to install gems' }

data/lib/rconf/configurators/ruby_configurator.rb

@@ -54,7 +54,6 @@ module RightConf
         when /^Using /
           report_success
           check_rvmrc
-          post_note "Configuration required switching the active ruby\nPlease run " + 'cd ..;cd -'.blue + ' to activate it and re-run rconf'
           aborting(true)
         else
           report_fatal("Failed to use #{version}:\n#{out}")
@@ -92,11 +91,13 @@ module RightConf
     end
 
     # Set command prefix when already configured
+    # Re-create .rvmrc if needed
     #
     # === Return
     # true:: Always return true
     def post_process
       Command.set_prefix("rvm #{version}@#{gemset} exec --")
+      check_rvmrc
       true
     end
 
@@ -128,10 +129,10 @@ module RightConf
         end
         Dir.chdir(File.join(rvm_src, "rvm-#{version}")) do
           Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
-	        setup_bashrc
         end
         report_success
       end
+      setup_bashrc
       true
     end
 
@@ -193,6 +194,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def check_rvmrc
+      return true if File.exist?('.rvmrc')
       report_check('Setting up .rvmrc')
       begin
         File.open('.rvmrc', 'w') do |f|
@@ -202,6 +204,7 @@ module RightConf
         end
         Command.execute('rvm', "#{version}@#{gemset}", 'trust', 'rvmrc')
         report_success
+        post_note "Configuration required switching the active ruby\nPlease run " + 'cd ..;cd -'.blue + ' to activate it and re-run rconf'
       rescue Exception => e
         report_failure
         report_error(e.message)
@@ -220,7 +223,17 @@ module RightConf
       if bashrc_path
         content = IO.read(bashrc_path)
         unless content.include?(rvm_bash_activation) 
-          content = rvm_bash_activation + "\n" + content
+          i = content.index(/^\s*PATH=[^$PATH]/)
+          if i
+            next_line = content.index("\n", i + 1)
+            if next_line
+              content.insert(next_line + 1, rvm_bash_activation + "\n")
+            else
+              content += "\n" + rvm_bash_activation
+            end
+          else
+            content = rvm_bash_activation + "\n" + content
+          end
           FileUtils.mv(bashrc_path, bashrc_path + '.old')
           File.open(bashrc_path, 'w') { |f| f.puts content }
           post_note 'rvm was installed, please reload your shell to activate it and re-run rconf'
@@ -237,6 +250,7 @@ module RightConf
     # code(String):: Code that needs to be added to bashrc to activate rvm
     def rvm_bash_activation
       code = <<EOS
+export rvm_trust_rvmrcs_flag=1
 if [[ -n "$PS1" ]]; then
   if [[ -s $HOME/.rvm/scripts/rvm ]] ; then source $HOME/.rvm/scripts/rvm ; fi
 fi

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -29,7 +29,7 @@ describe RightConf::BundlerConfigurator do
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'bundle', '--version').and_return(success_result('0'))
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'bundle', 'install', '_0_', {:abort_on_failure=>"Failed to install gems"}).and_return(success_result)
+      'bundle','_0_', 'install', {:abort_on_failure=>"Failed to install gems"}).and_return(success_result)
     @configurator.run_linux
   end
 
@@ -37,7 +37,7 @@ describe RightConf::BundlerConfigurator do
     flexmock(RightConf::Command.instance).should_receive(:execute).twice.with(
       'bundle', '--version').and_return(success_result('1'))
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'bundle', 'install', '_0_', {:abort_on_failure=>"Failed to install gems"}).and_return(success_result)
+      'bundle','_0_', 'install', {:abort_on_failure=>"Failed to install gems"}).and_return(success_result)
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'gem', 'uninstall', 'bundler', '-a', '-x').and_return(success_result)
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(

data/spec/configurators/ruby_configurator_spec.rb

@@ -55,9 +55,58 @@ describe RightConf::RubyConfigurator do
       './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)
     @configurator.run_linux
   end
 
-  
+  describe 'bashrc update' do
+
+    before(:each) do
+      flexmock(File).should_receive(:exist?).once.with(File.join(ENV['HOME'], '.bashrc')).once.and_return(true)
+      flexmock(FileUtils).should_receive(:mv).and_return(true)
+      f = flexmock('f')
+      f.should_receive(:puts).and_return { |c| @bashrc_content = c }
+      flexmock(File).should_receive(:open).and_yield(f)
+      @rvm_bash_activation = @configurator.__send__(:rvm_bash_activation)
+    end
+
+    it 'should install rvm hook in bashrc when not present' do
+      flexmock(IO).should_receive(:read).and_return('test')
+      @configurator.__send__(:setup_bashrc)
+      @bashrc_content.should == "#{@rvm_bash_activation}\ntest"
+    end
+
+    it 'should not install rvm hook in bashrc when present' do
+      flexmock(IO).should_receive(:read).and_return('test' + @rvm_bash_activation)
+      @configurator.__send__(:setup_bashrc)
+      @bashrc_content.should be_nil
+    end
+
+    it 'should install rvm hook after path is set' do
+      flexmock(IO).should_receive(:read).and_return(<<-EOS
+echo 'zobi la mouche'
+radio killed the radio star
+#PATH=something
+PATH=$PATH:should be fine
+this should not:
+PATH=something
+AFTER
+      EOS
+      )
+      @configurator.__send__(:setup_bashrc)
+      @bashrc_content.should == <<-EOS
+echo 'zobi la mouche'
+radio killed the radio star
+#PATH=something
+PATH=$PATH:should be fine
+this should not:
+PATH=something
+#{@rvm_bash_activation}
+AFTER
+      EOS
+    end
+
+  end
+
 end
 

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -08:00
+date: 2011-03-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency