rconf 0.7.3 → 0.7.4

data/Rakefile

@@ -19,6 +19,7 @@ require 'rake/gempackagetask'
 require 'rake/clean'
 
 task :default => 'spec'
+task :build   => [ 'spec', 'gem' ]
 
 # == Unit Tests == #
 

data/lib/rconf/configurators/passenger_configurator.rb

@@ -103,7 +103,7 @@ module RightConf
     # === Return
     # path(String):: Path
     def pick_default_path(first_choice)
-      path = first_choice ? DEFAULT_NGINX_INSTALL[0] : DEFAULT_NGINX_INSTALL[1]
+      path = DEFAULT_NGINX_INSTALL[first_choice && 0 || 1]
     end
 
     # Install passenger gem

data/lib/rconf/configurators/ruby_configurator.rb

@@ -228,30 +228,9 @@ module RightConf
     # === Return
     # true:: Always return true
     def setup_bashrc
-      candidates = ['.bashrc', '.bash_profile']
-      candidates.map! { |c| File.join(ENV['HOME'], c) }
-      bashrc_path = candidates.detect { |c| File.exist?(c) }
-      if bashrc_path
-        content = IO.read(bashrc_path)
-        unless content.include?(rvm_bash_activation) 
-          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'
-          aborting(true)
-        end
-      else
-        report_error("Failed to update bashrc to activate rvm, no bashrc found")
+      if EnvironmentUpdater.update(rvm_bash_activation, ['PATH'])
+        post_note 'rvm was installed, please reload your shell to activate it and re-run rconf'
+        aborting(true)
       end
     end
 

data/lib/rconf/version.rb

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

data/spec/configurators/ruby_configurator_spec.rb

@@ -106,8 +106,7 @@ describe RightConf::RubyConfigurator 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
+#PATH=something:should be fine
 this should not:
 PATH=something
 AFTER
@@ -117,8 +116,7 @@ AFTER
       @bashrc_content.should == <<-EOS
 echo 'zobi la mouche'
 radio killed the radio star
-#PATH=something
-PATH=$PATH:should be fine
+#PATH=something:should be fine
 this should not:
 PATH=something
 #{@rvm_bash_activation}

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency