rconf 1.0.6 → 1.0.7

data/Rakefile

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

data/lib/rconf/command.rb

@@ -41,7 +41,7 @@ module RightConf
       if @verbose
         msg = ([command] + args).compact.join(' ') + ' => ' +
           res.status.to_s + ': ' + res.output
-        report(msg)
+        report("[rconf] " + msg)
       end
       if !res.success? && msg = opts[:abort_on_failure]
         report_fatal("#{msg}: '#{command} #{args.join(' ')}' returned\n#{res.output}")

data/lib/rconf/configurators/bundler_configurator.rb

@@ -32,11 +32,7 @@ module RightConf
     # true:: If bundler is already installed
     # false:: Otherwise
     def check_linux
-      report_check("Checking for bundler #{version}")
-      res = Command.execute('bundle', '--version')
-      success = (res.output =~ /#{version}/)
-      report_result(success)
-      success
+      check_bundler && check_bundle
     end
     alias :check_darwin :check_linux
 
@@ -48,19 +44,13 @@ module RightConf
       raise "Bundler is not supported on Windows!"
     end
 
-    # Install bundler if needed and run bundle install
+    # Install bundler if needed and run bundle install.
     #
     # === Return
     # true:: Always return true
     def run_linux
       install_bundler
-      report_check('Installing gems')
-      options = [ "_#{version}_", 'install' ]
-      options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
-      options += [ '--path', bundle_path ] unless bundle_path.nil?
-      options << { :abort_on_failure => 'Failed to install gems' }
-      res = Command.execute('bundle', *options)
-      report_success
+      install_bundle
       true
     end
     alias :run_darwin :run_linux
@@ -75,6 +65,32 @@ module RightConf
 
     protected
 
+    # Check whether bundler is already installed.
+    #
+    # === Return
+    # true:: If bundler is already installed
+    # false:: Otherwise
+    def check_bundler
+      report_check("Checking bundler #{version}")
+      res = Command.execute("bundle", "_#{version}_", '--version')
+      success = !!(res.output =~ /#{version}/)
+      report_result(success)
+      success
+    end
+
+    # Check whether the gems in the bundle are all installed.
+    #
+    # === Return
+    # true:: If bundle's gem dependencies are satisfied.
+    # false:: Otherwise
+    def check_bundle
+      report_check("Checking bundle")
+      res = Command.execute("bundle", "_#{version}_", 'check')
+      success = !!(res.output =~ /dependencies are satisfied/)
+      report_result(success)
+      success
+    end
+
     # Install bundler from gem in cache
     #
     # === Return
@@ -93,10 +109,28 @@ module RightConf
       options = [ 'gem','install' ]
       options += version_or_file
       options += [ '--no-ri', '--no-rdoc',  { :abort_on_failure => 'Failed to install bundler' } ]
-      res = Command.execute(*options)
+      Command.execute(*options)
       report_success
       true
     end
 
+    # Run "bundle install" to install the gems in the app's bundle.
+    #
+    # === Return
+    # true:: Always return true
+    #
+    # === Raise
+    # (Exception):: If one or gems in the bundle cannot be installed for any reason
+    def install_bundle
+      report_check('Installing gems')
+      options = [ "_#{version}_", 'install' ]
+      options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
+      options += [ '--path', bundle_path ] unless bundle_path.nil?
+      options << { :abort_on_failure => 'Failed to install gems' }
+      res = Command.execute('bundle', *options)
+      report_success
+      Command.execute('rbenv', 'rehash') # this is kind of optional
+      true
+    end
   end
 end

data/lib/rconf/configurators/ruby_configurator.rb

@@ -143,14 +143,19 @@ module RightConf
       Platform.dispatch(ruby) { :install_ruby_prerequisites }
       c_version = `system_profiler SPDeveloperToolsDataType -xml | xpath "//*[text()='_items']/following-sibling::array/dict/child::key[text()='spdevtools_version']/following-sibling::string/text()" 2> /dev/null`
       env = {}
+
+      # Ensure we're using a sane GCC 4.2, not Apple's LLVM-based lookalike.
       gcc42 = ['/usr/local/bin/gcc-4.2', '/usr/bin/gcc-4.2'].detect { |p| File.executable?(p) }
       if c_version =~ /^4\.2\.[0-9]+/
-        if !gcc42
+        if gcc42.nil?
           report_fatal("The C compiler included with Xcode #{c_version} produces buggy ruby interpreters, please install the C compilers from https://github.com/downloads/kennethreitz/osx-gcc-installer/GCC-10.7-v2.pkg or update your version of Xcode and re-run rconf")
         else
           env['CC'] = gcc42
         end
       end
+
+      # Ruby 1.8 force-installs the Tk stdlib extension, no way to opt out.
+      # Ensure XQuartz is installed and its headers are on the path.
       if ruby =~ /1\.8/
         if File.directory?('/opt/X11/include')
           env['CC'] = gcc42
@@ -159,6 +164,7 @@ module RightConf
           report_fatal("Installing ruby 1.8 (or ree 1.8) on Mac OS X requires that XQuartz be installed on the machine first, please go to http://xquartz.macosforge.org/landing/, install XQuartz and try again")
         end
       end
+
       Command.execute('rbenv', 'install', ruby, :abort_on_failure => 'Failed to install ruby', :env => env)
       report_success
     end

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -36,7 +36,8 @@ describe RightConf::BundlerConfigurator do
   end
 
   it 'should succeed when bundler succeeds' do
-    should_execute('bundle', '--version').once.and_return(success_result('0'))
+    should_execute('bundle', '_0_', '--version').once.and_return(success_result('0'))
+    should_execute('bundle', '_0_', 'check').once.and_return(success_result('dependencies are satisfied'))
     @configurator.check_linux.should be_true
   end
 
@@ -45,6 +46,7 @@ describe RightConf::BundlerConfigurator do
                    {:abort_on_failure=>"Failed to install bundler"}).once.and_return(success_result)
     should_execute('bundle','_0_', 'install',
                            {:abort_on_failure=>"Failed to install gems"}).once.and_return(success_result)
+    should_execute('rbenv', 'rehash').once.and_return(success_result)
     @configurator.run_linux
   end
 

metadata

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