rconf 1.0.12 → 1.0.13

data/lib/rconf/configurator.rb

@@ -146,7 +146,13 @@ module RightConf
           must_configure = (Profile.force_check? || sha != sig) && !check
         end
         Platform.dispatch(*args) { :run } if must_configure
-        Profile.set_configurator_signature(key, sig) unless aborting
+
+        # clear any leftover signature in case of aborting to prevent rconf
+        # doing nothing on restart.
+        #
+        # FIX: there seems to be an issue when a new ruby version is installed
+        # and rconf aborts and has to be restarted (on Ubuntu?)
+        Profile.set_configurator_signature(key, aborting ? nil : sig)
       true
     end
 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
+# Copyright (C) 2011-2013 RightScale, Inc, All Rights Reserved Worldwide.
 #
 # THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
 # AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
@@ -9,19 +9,25 @@
 # License Agreement between RightScale.com, Inc. and
 # the licensee
 
+require 'fileutils'
+require 'tmpdir'
+
 module RightConf
 
   # Specify rbenv and ruby-build git revision for installation
   RBENV_GIT_REPO = 'git://github.com/sstephenson/rbenv.git'
-  RBENV_GIT_REVISION = "9375e99f921f428849f19efe2a2e500b3295d1a7"
+  RBENV_GIT_REVISION = "605e691bff4863e5014ba5ad750ad65e3278aea3"
 
   RUBYBUILD_GIT_REPO = 'git://github.com/sstephenson/ruby-build.git'
-  RUBY_BUILD_GIT_REVISION = "28b9bcb6df1bc18fb2b06e25ee65f397ac3d4632"
+  RUBY_BUILD_GIT_REVISION = "57cb1e98c6ec695c130e369629d02417ccc1a51a"
 
   # Local installation target folders
   RBENV_INSTALL_TARGET = "#{ENV['HOME']}/.rbenv"
   RUBYBUILD_TARGET = "#{RBENV_INSTALL_TARGET}/plugins/ruby-build"
+  RUBYBUILD_DEFINITIONS_PATH = ::File.join(RUBYBUILD_TARGET, 'share', 'ruby-build')
 
+  # rubygems
+  RUBYGEMS_URI_PREFIX = 'http://production.cf.rubygems.org/rubygems'
 
   class RubyConfigurator
 
@@ -32,7 +38,8 @@ module RightConf
     description "Installs ruby interpreter and rubygems.\n" +
                 'Installs and uses rbenv on supported (i.e. non-Windows) platforms'
 
-    setting 'version',  'Ruby version using rbenv notation (see "rbenv versions")', :required => true
+    setting 'version', 'Ruby version using rbenv notation (see "rbenv versions")', :required => true
+    setting 'rubygems', 'RubyGems version using semantic versioning'
 
     updater lambda { update_rbenv_installation }
 
@@ -70,7 +77,8 @@ module RightConf
       check_rbenv
       return true if aborting
       check_ruby
-      Command.set_ruby(ruby_version)
+      Command.set_ruby(ruby_with_rubygems_version)
+      check_rubygems
      true
     end
     alias :run_darwin :run_linux
@@ -90,12 +98,25 @@ module RightConf
       @ruby_version ||= version.start_with?('ruby-') ? version[5..-1] : version
     end
 
+    # appends a rubygems version specifier only when necessary.
+    def ruby_with_rubygems_version
+      @ruby_with_rubygems_version ||= (rubygems ? "#{ruby_version}_rubygems-#{rubygems}" : ruby_version)
+    end
+
+    def ruby_bin_path_for(version)
+      ::File.join(RBENV_INSTALL_TARGET, 'versions', version, 'bin', 'ruby')
+    end
+
+    def gem_bin_path_for(version)
+      ::File.join(RBENV_INSTALL_TARGET, 'versions', version, 'bin', 'gem')
+    end
+
     # Check whether rbenv and ruby-build are installed and installs it/them if not
     #
     # === Return
     # true:: Always return true
     def check_rbenv
-      rbenv_present = File.exist?(File.join(ENV['HOME'], '.rbenv', 'bin', 'rbenv'))
+      rbenv_present = File.exist?(File.join(RBENV_INSTALL_TARGET, 'bin', 'rbenv'))
 
       res = Command.execute('rbenv')
       rbenv_in_path = res.success?
@@ -127,10 +148,10 @@ module RightConf
     # === 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"
-
+      puts "Adding custom ruby enterprise edition definition to ruby-build ..."
+      src_patched_ree = ::File.expand_path('../../../patches/ree-1.8.7-2012.02-rs-custom', __FILE__)
+      dst_patched_ree = ::File.join(RUBYBUILD_DEFINITIONS_PATH, 'ree-1.8.7-2012.02')
+      ::FileUtils.cp(src_patched_ree, dst_patched_ree)
       true
     end
 
@@ -143,14 +164,14 @@ module RightConf
       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}")
+        system("cd #{RBENV_INSTALL_TARGET}; git fetch -q; git checkout -f -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}")
+        system("cd #{RUBYBUILD_TARGET}; git reset -q --hard; git fetch -q; git checkout -f -q #{RUBY_BUILD_GIT_REVISION}")
 
         # Add our ree definition again because the repository has been reset
         RubyConfigurator.add_custom_ree_definition
@@ -205,9 +226,57 @@ module RightConf
     # === Return
     # true:: Always return true
     def check_ruby
-      unless Command.execute('rbenv', 'local', ruby_version).success?
-        report_check("Installing ruby #{ruby_version} (this will take a while, please be patient)")
-        Platform.dispatch(ruby_version) { :install_ruby }
+      if Command.execute('rbenv', 'local', ruby_with_rubygems_version).success?
+        # always (re)install latest rconf gem because switched-to ruby may exist
+        # but not have rconf.
+        install_rconf(ruby_with_rubygems_version)
+      else
+        report_check("Installing ruby #{ruby_with_rubygems_version} (this will take a while, please be patient)")
+
+        # create a ruby+rubygems definition file in order to isolate any
+        # differences in rubygems versions between projects. ideally only a
+        # single rubygems version will be specified for use with a given ruby
+        # platform version.
+        #
+        # note that copying/renaming an existing installed ruby directory does
+        # not work as expected because the installed files contain shebangs that
+        # refer back to the original installed directory.
+        if ruby_version != ruby_with_rubygems_version
+          # ruby+rubygems definition may already exist because it was previously
+          # created here, checked into source control, etc.
+          dst_def_path = ::File.join(RUBYBUILD_DEFINITIONS_PATH, ruby_with_rubygems_version)
+          unless ::File.file?(dst_def_path)
+            src_def_path = ::File.join(RUBYBUILD_DEFINITIONS_PATH, ruby_version)
+            if ::File.file?(src_def_path)
+              # existing ruby platform definition may include a specifier for
+              # the requested rubygems version or some other version but not all
+              # definitions will have this specifier. in any case, we need to
+              # run and then restart rconf and maintain state so we need to
+              # create a custom ruby platform definition.
+              #
+              # remove any existing rubygems specifier.
+              src_def_text = ::File.read(src_def_path)
+              any_rubygems_regex = /^install_package\s+"rubygems\-.*$/
+              dst_def_text = src_def_text.gsub(any_rubygems_regex, '').gsub("\n\n", "\n").strip
+
+              # append full rubygems specifier to definition to make
+              # rbenv install do the work of installing correct rubygems version.
+              rubygems_basename = "rubygems-#{rubygems}"
+              rubygems_specifier_prefix = "install_package #{rubygems_basename.inspect}"
+              rubygems_filename = "#{rubygems_basename}.tgz"
+              rubygems_tarball_url = ::File.join(RUBYGEMS_URI_PREFIX, rubygems_filename)
+              rubygems_specifier_full = "#{rubygems_specifier_prefix} #{rubygems_tarball_url.inspect} ruby"
+              dst_def_text += "\n#{rubygems_specifier_full}"
+
+              # write custom ruby platform definition.
+              ::File.open(dst_def_path, 'w') { |f| f.write(dst_def_text) }
+            else
+              post_note "Requested ruby version definition not found: #{ruby_version}"
+              aborting(true)
+            end
+          end
+        end
+        Platform.dispatch(ruby_with_rubygems_version) { :install_ruby }
       end
 
       which = Command.execute('which', 'ruby').output.strip
@@ -216,6 +285,13 @@ module RightConf
         aborting(true)
       end
 
+      # if currenly executing ruby is not our selected ruby then we must abort
+      # and run rconf again or else bundler will install gems to wrong directory.
+      which = Command.execute('rbenv', 'which', 'ruby').output.strip
+      if which != ruby_bin_path_for(ruby_with_rubygems_version)
+        post_note "rconf selected ruby #{ruby_with_rubygems_version} and needs to be restarted so the right ruby tools get activated\nPlease run 'rconf' again."
+        aborting(true)
+      end
       true
     end
 
@@ -232,11 +308,27 @@ module RightConf
       # Can't abort on failure rbenv install seems to exist with a non zero error code even when successful :(
       Command.execute('rbenv', 'install', ruby)
       report_success
+      abort_message = <<EOF
+Failed to select installed ruby or else installation failed.
+Try running 'rconf -u' to update rbenv to latest known ruby definitions (for REE, etc.)
+Run 'rbenv install --list' to see current list of available rubies.
+EOF
+      Command.execute('rbenv', 'local', ruby, :abort_on_failure => abort_message.chomp)
+      install_rconf(ruby)
       post_note "rconf installed ruby #{ruby} and needs to be restarted so the right ruby tools get activated\nPlease run 'rconf' again."
       aborting(true)
       true
     end
 
+    # gem install the latest greatest rconf before leaving to avoid confusion
+    # when user tries and fails to restart rconf as indicated. assumes some
+    # version of rubygems is provided by every ruby install.
+    def install_rconf(ruby_selector)
+      report_check("Installing latest rconf gem into selected ruby '#{ruby_selector}'")
+      Command.execute(gem_bin_path_for(ruby_selector), 'install', 'rconf', '--no-rdoc', '--no-ri', :abort_on_failure => "Failed to install rconf gem in selected ruby")
+      report_success
+    end
+
     # Install given ruby version using rbenv
     # On Lion, need to setup CC env var before running rbenv install
     #
@@ -326,6 +418,49 @@ module RightConf
       true
     end
 
+    # check if rubygems is installed and has the expected version or else kick
+    # off installation when required.
+    def check_rubygems
+      return true unless rubygems
+      report_check("Checking for rubygems #{rubygems}")
+      gem_bin_path = gem_bin_path_for(ruby_with_rubygems_version)
+      result = Command.execute(gem_bin_path, '-v', :abort_on_failure => nil)
+      current_rubygems = result.success? ? result.output.strip : ''
+      if current_rubygems == rubygems
+        report_success
+      else
+        install_rubygems(rubygems)
+        result = Command.execute(gem_bin_path, '-v', :abort_on_failure => nil)
+        current_rubygems = result.success? ? result.output.strip : ''
+        if current_rubygems == rubygems
+          report_success
+        else
+          post_note "Failed to update RubyGems to v#{rubygems}:\n#{result.output.strip}"
+          report_failure
+        end
+      end
+      true
+    end
+
+    # installs, upgrades, downgrades, or reinstalls rubygems to specified
+    # version by downloading source tarball and executing 'setup.rb'.
+    def install_rubygems(version)
+      report_check("Installing rubygems #{version}")
+      basename = "rubygems-#{version}"
+      filename = "#{basename}.tgz"
+      tarball_url = ::File.join(RUBYGEMS_URI_PREFIX, filename)
+      ::Dir.mktmpdir do |tmpdir|
+        ::Dir.chdir(tmpdir) do
+          Command.execute('curl', '-O', '-f', tarball_url, :abort_on_failure => "Failed to curl #{tarball_url}")
+          Command.execute('tar', '-xzvf', filename, :abort_on_failure => "Failed to explode #{filename}")
+
+          # rubygems 'setup.rb' needs it's root dir to be the working dir.
+          ::Dir.chdir(basename) do
+            Command.execute(ruby_bin_path_for(ruby_with_rubygems_version), 'setup.rb', :abort_on_failure => "Failed to setup rubygems")
+          end
+        end
+      end
+    end
 
     # Produce abort on failure option
     #

data/lib/rconf/overrides_language.rb

@@ -85,23 +85,25 @@ module RightConf
       end
       begin
         source.split("\n").each do |o|
-          operands = o.gsub(/\s+/, '').split('=')
-          if operands.size != 2
-            raise "Invalid syntax '#{o}', must be of the form 'key.setting=value'"
+          unless o.start_with?('#')  # ignore commented-out lines
+            operands = o.gsub(/\s+/, '').split('=')
+            if operands.size != 2
+              raise "Invalid syntax '#{o}', must be of the form 'key.setting=value'"
+            end
+
+            if operands[1].start_with?('"') || operands[1].start_with?("'")
+              # Quoted string
+              value = operands[1]
+            elsif operands[1] =~ NIL_LITERAL
+              # Literal nil
+              value = 'nil'
+            else
+              # Anything else: assume unquoted string
+              value = "'#{operands[1]}'"
+            end
+
+            overrides.instance_eval("@#{operands[0]}=#{value}")
           end
-
-          if operands[1].start_with?('"') || operands[1].start_with?("'")
-            # Quoted string
-            value = operands[1]
-          elsif operands[1] =~ NIL_LITERAL
-            # Literal nil
-            value = 'nil'
-          else
-            # Anything else: assume unquoted string
-            value = "'#{operands[1]}'"
-          end
-
-          overrides.instance_eval("@#{operands[0]}=#{value}")
         end
       rescue Exception => e
         @overrides = nil

data/lib/rconf/version.rb

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

data/rconf.rconf

@@ -1,9 +1,8 @@
-# Configuration settings for RightSite
+# Configuration settings for rconf
 ruby do
-  version  'ruby-1.9.3-p392'
+  version  'ruby-1.9.3-p448'
+  rubygems '1.8.26'
 end
 bundler do
   version '1.3.5'
 end
-
-

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
+  prerelease: 
 platform: ruby
 authors:
 - Raphael Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -121,26 +126,33 @@ files:
 - spec/support/package_installer_spec.rb
 homepage: http://rubygems.org/gems/rconf
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2553812799441389264
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2553812799441389264
 requirements: []
 rubyforge_project: rconf
-rubygems_version: 2.1.8
+rubygems_version: 1.8.26
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Cross platform environment configuration
 test_files:
 - spec/command_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTg4MDQ2NGY4ZTI1NDMzZTFiNzc5NzYwZTBmMTlkZDQ5NjhhMjM5Nw==
-  data.tar.gz: !binary |-
-    OTliZTY2MjBjMDZhOGFjZTM3ZTQ5ZmJkOWIzYTdjNGRkZDc1MzU4NA==
-SHA512:
-  metadata.gz: !binary |-
-    ZDNkZTUwYzAwMzMyZTk1OTBhMmI1YmVlZDYzMTI2Yzc4OTE5ODM1MDU5YTZi
-    MTcwN2Q5NWVkZmE5NzBiMzYyZGM3NjMyMWMzZTc1ZTE2YjFkODIxODA3OGU5
-    NDVhMmY5M2NlNGJlNTM2MjgwZTdlNDkyMWQ2MTZhNWFkNzMwOTY=
-  data.tar.gz: !binary |-
-    MmYwY2I0ZTRlMjRhYTBjYTM2YjdmZjU4Yjk5YzNhNTkxMTdhMGU2YjkzNDdk
-    OWUwYThiYTcyZjExODE1MzUyMmM2OWE3ZjYwMjY3NzdiMGIzZmNjOTI2Mjgy
-    MTljMThhZGU2MjJkNzk0MzY3YTBlNzQ0MjRjMWUyNGU4OWZiZjk=