rconf 1.0.7 → 1.0.8

data/Rakefile

@@ -24,6 +24,9 @@ rescue LoadError => e
   require 'rake/rdoctask'
 end
 
+task :default => 'spec'
+task :build   => [ 'spec', 'gem' ]
+
 # == Unit Tests == #
 
 desc "Run unit tests"
@@ -65,6 +68,3 @@ Rake::RDocTask.new do |rd|
   rd.rdoc_files.include 'README.rdoc', "lib/**/*.rb"
 end
 
-task :default => 'spec'
-task :build   => [ 'spec', 'gem' ]
-

data/bin/rconf

@@ -252,7 +252,8 @@ where [options] are:
         raise if e.is_a?(SystemExit)
         report_fatal("Execution failed with exception '#{e.message.red}'\n#{e.backtrace.join("\n")}")
       ensure
-        lang.configurators.each { |c| report("\n!!NOTE: #{c.post_note}\n".green) if c.post_note }
+        note = '----['.bold.white + 'NOTE'.bold.green + ']----'.bold.white
+        lang.configurators.each { |c| report("\n#{note}\n#{c.post_note.green}") if c.post_note }
       end
     end
 

data/lib/rconf/configurators/bundler_configurator.rb

@@ -73,7 +73,7 @@ module RightConf
     def check_bundler
       report_check("Checking bundler #{version}")
       res = Command.execute("bundle", "_#{version}_", '--version')
-      success = !!(res.output =~ /#{version}/)
+      success = !!(res.output =~ /^Bundler version #{version}$/)
       report_result(success)
       success
     end
@@ -129,7 +129,7 @@ module RightConf
       options << { :abort_on_failure => 'Failed to install gems' }
       res = Command.execute('bundle', *options)
       report_success
-      Command.execute('rbenv', 'rehash') # this is kind of optional
+      Command.execute('rbenv', 'rehash') # this is optional; don't bother to report failures
       true
     end
   end

data/lib/rconf/configurators/ruby_configurator.rb

@@ -22,6 +22,14 @@ module RightConf
 
     setting 'version',  'Ruby version using rbenv notation (see "rbenv versions")', :required => true
 
+    # Message to display to the user when rbenv isn't in the path.
+    PATH_ADVICE  = "You should add 'eval \"$(rbenv init -)\"' to your .bash_profile / .bashrc etc. " +
+      "so rbenv is properly initialized in new shells.\n\n" +
+      "If you are a bash user (e.g. Mac OS X), you can add the following to ~/.bash_profile:\n\n" +
+      "  echo 'eval \"$(rbenv init -)\"' >> ~/.bash_profile\n\n" +
+      "You should also update your PATH environment variable with:\n\n" +
+      "  echo 'export PATH=\"$HOME/.rbenv/shims:$PATH\" >> ~/.bash_profile'\n"
+
     # Let configurator run, it is idempotent
     #
     # === Return
@@ -63,7 +71,7 @@ module RightConf
 
     protected
 
-    # Make version compatible with RVM
+    # Make our version specifier compatible with RVM-style specifiers (override base class accessor)
     def ruby_version
       @ruby_version ||= version.start_with?('ruby-') ? version[5..-1] : version
     end
@@ -73,33 +81,32 @@ module RightConf
     # === Return
     # true:: Always return true
     def check_rbenv
+      rbenv_present = File.exist?(File.join(ENV['HOME'], '.rbenv', 'bin', 'rbenv'))
+
       res = Command.execute('rbenv')
       rbenv_in_path = res.success?
-      if rbenv_in_path
+
+      if rbenv_present && !rbenv_in_path
+        # Bail if rbenv isn't correctly initialized (we can't use it in this state)
+        post_note "rconf detected rbenv is installed in #{rbenv_path} but it is not in the PATH.\n" + PATH_ADVICE
+        aborting(true)
+      elsif rbenv_present && rbenv_in_path
+        # rbenv is installed and initialized; make sure we have a suitable version
         res.output =~ /^rbenv ([0-9]+)\.([0-9]+)\.([0-9]+)$/
         maj, min, build = [$1.to_i, $2.to_i, $3.to_i]
         if maj == 0 && min < 4
-          report_fatal("rconf requires rbenv version 0.4.0 or greater, you have #{maj}.#{min}.#{build} installed, please upgrade (e.g. via brew upgrade rbenv) and try again")
+          report_fatal("rconf requires rbenv version 0.4.0 or greater, you have #{maj}.#{min}.#{build} installed, "+
+                       "please upgrade (e.g. via 'brew upgrade rbenv') and try again")
         end
-        return true
-      end
-      rbenv_present = File.exist?(File.join(ENV['HOME'], '.rbenv', 'bin', 'rbenv'))
-      update_msg  = "You should add 'eval \"$(rbenv init -)\"' to your .bash_profile / .bashrc etc. " +
-                    "so rbenv is properly initialized in new shells, the following assumes ~/.bash_profile is used (Mac OS X):\n\n" +
-                    "echo 'eval \"$(rbenv init -)\"' >> ~/.bash_profile\n\n".blue +
-                    "You should also update your PATH environment variable with:\n\n" +
-                    "echo 'export PATH=\"$HOME/.rbenv/shims:$PATH\" >> ~/.bash_profile'\n".blue
-      if rbenv_present
-        post_note "rconf detected rbenv is installed in #{rbenv_path} but it is not in the PATH.\n" + update_msg
-        aborting(true)
-        return true
       else
+        # No sign of rbenv; try to install it
         opts = { :report => true, :post_install => update_msg }.merge(abort_option('Failed to install rbenv'))
         PackageInstaller.install('rbenv', opts)
         opts = { :report => true }.merge(abort_option('Failed to install ruby-build'))
         PackageInstaller.install('ruby-build', opts)
-        true
       end
+
+      true
     end
 
     # Check .ruby-version and its content
@@ -112,6 +119,13 @@ module RightConf
         Platform.dispatch(ruby_version) { :install_ruby }
         Command.execute('rbenv', 'local', ruby_version)
       end
+
+      which = Command.execute('which', 'ruby').output.strip
+      if (which =~ %r(^(/usr)?/bin.*ruby$))
+        post_note "Your PATH is not setup correctly for rbenv; ('which ruby' => #{which}).\n" + PATH_ADVICE
+        aborting(true)
+      end
+
       true
     end
 

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -36,7 +36,7 @@ describe RightConf::BundlerConfigurator do
   end
 
   it 'should succeed when bundler succeeds' do
-    should_execute('bundle', '_0_', '--version').once.and_return(success_result('0'))
+    should_execute('bundle', '_0_', '--version').once.and_return(success_result('Bundler version 0'))
     should_execute('bundle', '_0_', 'check').once.and_return(success_result('dependencies are satisfied'))
     @configurator.check_linux.should be_true
   end

data/spec/configurators/ruby_configurator_spec.rb

@@ -33,7 +33,9 @@ describe RightConf::RubyConfigurator do
   context "with rbenv installed" do
     before(:each) do
       should_execute('rvm').once.and_return(failure_result)
+      flexmock(File).should_receive(:exist?).with(File.join(ENV['HOME'], '.rbenv', 'bin', 'rbenv')).and_return(true)
       should_execute('rbenv', 'local', '42').and_return(success_result)
+      should_execute('which', 'ruby').and_return(success_result(File.join(ENV['HOME'], '.rbenv', 'shims', 'ruby')))
     end
 
     it 'should succeed' do
@@ -53,6 +55,7 @@ describe RightConf::RubyConfigurator do
       should_execute('rvm').once.and_return(failure_result)
       should_execute('rbenv').once.and_return(failure_result)
       flexmock(File).should_receive(:exist?).with(File.join(ENV['HOME'], '.rbenv', 'bin', 'rbenv')).and_return(false)
+      should_execute('which', 'ruby').and_return(success_result(File.join(ENV['HOME'], '.rbenv', 'shims', 'ruby')))
     end
 
     it 'should install rbenv and ruby-build' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec