rconf 1.0.8 → 1.0.9

data/bin/rconf

@@ -153,6 +153,14 @@ where [options] are:
       report_success
       report('Latest rconf version is ' + version.blue)
       update_rconf(version)
+      ConfiguratorRegistry.each do |_, configurator|
+        updater = configurator.updater
+
+        if updater
+          # Do not invoke "call" when no updater is available
+          updater.call
+        end
+      end
     end
 
     # Calls given block with all combination of installed rubies

data/lib/patches/ree-1.8.7-2012.02-rs-custom

@@ -0,0 +1,4 @@
+require_gcc
+configure_opts=--no-tcmalloc
+CFLAGS="-O2 -fno-tree-dce -fno-optimize-sibling-calls"
+install_package "ruby-enterprise-1.8.7-2012.02" "https://tools-engineer.s3.amazonaws.com/ree-1.8.7-2012.02-patched.tar.gz" ree_installer

data/lib/rconf/configurator.rb

@@ -72,6 +72,21 @@ module RightConf
         true
       end
 
+      # Define code to be run whenever rconf gets updated. Acts as a getter and setter
+      #
+      # === Parameters
+      # val(Proc):: Code to run when rconf is updated
+      #
+      # === Return
+      # true:: The updater if no parameter is passed, true otherwise
+      def updater(val=nil)
+        if val
+          @updater = val
+          true
+        else
+          @updater
+        end
+      end
     end
 
     # Extend base class with ClassMethods module methods

data/lib/rconf/configurators/bundler_configurator.rb

@@ -111,6 +111,7 @@ module RightConf
       options += [ '--no-ri', '--no-rdoc',  { :abort_on_failure => 'Failed to install bundler' } ]
       Command.execute(*options)
       report_success
+      Command.execute('rbenv', 'rehash') # this is optional; don't bother to report failures
       true
     end
 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -11,6 +11,18 @@
 
 module RightConf
 
+  # Specify rbenv and ruby-build git revision for installation
+  RBENV_GIT_REPO = 'git://github.com/sstephenson/rbenv.git'
+  RBENV_GIT_REVISION = "9375e99f921f428849f19efe2a2e500b3295d1a7"
+
+  RUBYBUILD_GIT_REPO = 'git://github.com/sstephenson/ruby-build.git'
+  RUBY_BUILD_GIT_REVISION = "28b9bcb6df1bc18fb2b06e25ee65f397ac3d4632"
+
+  # Local installation target folders
+  RBENV_INSTALL_TARGET = "#{ENV['HOME']}/.rbenv"
+  RUBYBUILD_TARGET = "#{RBENV_INSTALL_TARGET}/plugins/ruby-build"
+
+
   class RubyConfigurator
 
     include Configurator
@@ -22,13 +34,15 @@ module RightConf
 
     setting 'version',  'Ruby version using rbenv notation (see "rbenv versions")', :required => true
 
+    updater lambda { update_rbenv_installation }
+
+
     # 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"
+    PATH_ADVICE  = "You should add rbenv to your path and '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 'export PATH=\"$HOME/.rbenv/bin:$PATH\"' >> ~/.bash_profile\n" +
+        "  echo 'eval \"$(rbenv init -)\"' >> ~/.bash_profile\n\n"
 
     # Let configurator run, it is idempotent
     #
@@ -90,7 +104,7 @@ module RightConf
         # 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
+      elsif 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]
@@ -100,15 +114,92 @@ module RightConf
         end
       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)
+        install_rbenv_from_git
       end
 
       true
     end
 
+
+    # Overwrite ruby-build definition file to use our own, patched version of REE and to set certain compile options
+    # so that it REE works with newer versions of GCC as well.
+    #
+    # === Return
+    # true:: Always return true
+    def self.add_custom_ree_definition
+      curr_dir=File.dirname(__FILE__)
+      patched_ree = "#{curr_dir}/../../patches/ree-1.8.7-2012.02-rs-custom"
+      FileUtils.cp patched_ree, "#{RUBYBUILD_TARGET}/share/ruby-build/ree-1.8.7-2012.02"
+
+      true
+    end
+
+
+    # Update rbenv and ruby-build to the version specified through the git commit version constant
+    #
+    # === Return
+    # true:: Always return true
+    def self.update_rbenv_installation
+      puts "Updating rbenv ..."
+      if File.directory?("#{RBENV_INSTALL_TARGET}/.git")
+        # Perform the pull only if rbenv has been installed by using a git pull (and not through a package manager)
+        system("cd #{RBENV_INSTALL_TARGET}; git fetch -q; git checkout -q #{RBENV_GIT_REVISION}")
+      end
+
+      puts "Updating ruby-build ..."
+      if File.directory?("#{RUBYBUILD_TARGET}/.git")
+        # Perform the pull only if ruby-build has been installed by using a git pull (and not through a package manager)
+        # Before checking out the new branch, reset the repository to avoid conflicts
+        system("cd #{RUBYBUILD_TARGET}; git reset -q --hard; git fetch -q; git checkout -q #{RUBY_BUILD_GIT_REVISION}")
+
+        # Add our ree definition again because the repository has been reset
+        RubyConfigurator.add_custom_ree_definition
+      end
+
+      true
+    end
+
+
+    # Install rbenv
+    # 1. Fetch rbenv from repository and install it
+    # 2. Fetch ruby-build from repository and install it
+    # 3. Install custom ree installation definition into ruby-build so that our patched REE gets installed
+    #
+    # === Return
+    # true:: Always return true
+    def install_rbenv_from_git
+
+      # Require: git
+      res = Command.execute('git', '--version').success?
+      if !res
+        # Install git
+        opts = { :report => true, :post_install => update_msg }.merge(abort_option('Failed to install git, required for rbenv'))
+        PackageInstaller.install('git', opts)
+      end
+
+
+      # Fetch and install rbenv
+      # ***********************
+
+      # Fetch rbenv from git repo
+      Command.execute('git', 'clone', RBENV_GIT_REPO, RBENV_INSTALL_TARGET, {:abort_on_failure => 'Git clone of rbnev failed - server down?'})
+      Kernel.system("cd #{RBENV_INSTALL_TARGET}; git checkout #{RBENV_GIT_REVISION}")
+
+      # Fetch, install and patch ruby-build
+      # ***********************************
+
+      # Create plugins directory (target for ruby-build)
+      ret = FileUtils.mkdir_p(RUBYBUILD_TARGET)
+      if !ret
+        report_fatal("Could not create directory: #{RUBYBUILD_TARGET}");
+      end
+
+      Command.execute('git', 'clone', RUBYBUILD_GIT_REPO, RUBYBUILD_TARGET, {:abort_on_failure => 'Git clone of ruby-build failed - server down?'})
+      Kernel.system("cd #{RUBYBUILD_TARGET}; git checkout #{RUBY_BUILD_GIT_REVISION}")
+
+      RubyConfigurator.add_custom_ree_definition
+    end
+
     # Check .ruby-version and its content
     #
     # === Return
@@ -190,9 +281,7 @@ module RightConf
     def install_ruby_prerequisites_linux_ubuntu(ruby)
       report_check("Installing required packages, this could take a while")
       packages = []
-      if ruby =~ /^ree-|^ruby-/
-        packages = %w(build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev)
-      end # TBD Define packages needed for other rubies
+      packages = %w(build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev)
       Command.sudo('apt-get', 'install', '-y', *packages)
       report_success
     end

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -46,7 +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)
+    should_execute('rbenv', 'rehash').times(2).and_return(success_result)
     @configurator.run_linux
   end
 

data/spec/configurators/ruby_configurator_spec.rb

@@ -52,22 +52,27 @@ describe RightConf::RubyConfigurator do
 
   context "without rbenv installed" do
     before(:each) do
+      should_execute("git", "--version").once.and_return(success_result)
+      should_execute("git", "clone", "git://github.com/sstephenson/rbenv.git", "#{ENV['HOME']}/.rbenv", {:abort_on_failure=>"Git clone of rbnev failed - server down?"}).once.and_return(success_result)
+      should_execute("git", "clone", "git://github.com/sstephenson/ruby-build.git", "#{ENV['HOME']}/.rbenv/plugins/ruby-build", {:abort_on_failure=>"Git clone of ruby-build failed - server down?"}).once.and_return(success_result)
+
       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)
+
+      flexmock(FileUtils).should_receive(:cp).with(/.*\/patches\/ree-1.8.7-2012.02-rs-custom/, "#{ENV['HOME']}/.rbenv/plugins/ruby-build/share/ruby-build/ree-1.8.7-2012.02").and_return(true)
+      flexmock(FileUtils).should_receive(:mkdir_p).with("#{ENV['HOME']}/.rbenv/plugins/ruby-build").and_return(true)
+      flexmock(Kernel).should_receive(:system).and_return(true)
       should_execute('which', 'ruby').and_return(success_result(File.join(ENV['HOME'], '.rbenv', 'shims', 'ruby')))
     end
 
     it 'should install rbenv and ruby-build' do
-      flexmock(RightConf::PackageInstaller).should_receive(:install).with('rbenv', Hash).once
-      flexmock(RightConf::PackageInstaller).should_receive(:install).with('ruby-build', Hash).once
       should_execute('rbenv', 'local', '42').and_return(success_result)
       @configurator.run_linux
     end
 
     it 'should install ruby if needed' do
-      flexmock(RightConf::PackageInstaller).should_receive(:install).with('rbenv', Hash).once
-      flexmock(RightConf::PackageInstaller).should_receive(:install).with('ruby-build', Hash).once
+      flexmock(RightConf::Platform).should_receive(:dispatch).with(Proc)
       should_execute('rbenv', 'local', '42').and_return(failure_result)
       flexmock(RightConf::Platform).should_receive(:dispatch).with('42', Proc)
       should_execute('rbenv', 'local', '42').and_return(success_result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -73,6 +73,7 @@ files:
 - Rakefile
 - bin/rconf
 - examples/sample.rconf
+- lib/patches/ree-1.8.7-2012.02-rs-custom
 - lib/rconf.rb
 - lib/rconf/command.rb
 - lib/rconf/configurator.rb