rconf 0.9.25 → 0.10.0

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .rvmrc
 Gemfile.lock
 .idea/
+*.swp

data/bin/rconf

@@ -22,7 +22,7 @@ module RightConf
 
     def self.run
       opts = Trollop::options do
-        version "rconf #{VERSION} (c) 2011 RightScale"
+        version "rconf #{VERSION} (c) 2012 RightScale"
         banner <<-EOS
 #{DESCRIPTION}
 
@@ -34,11 +34,12 @@ where [options] are:
 
         opt :configurators, 'Show available configurators'
         opt :platform, 'Show current platform'
+        opt :overrides, 'Show current overrides'
         opt :update, 'Update rconf to latest version'
         opt :remove, 'Remove rconf from all gemsets'
         opt :config, 'Set path to configuration file', :type => :string
         opt :output, 'Output file (output to STDOUT by default)', :type => :string
-        opt :reconfigure, 'Bypass all checks and force configuration'
+        opt :reconfigure, 'Bypass all checks and force configuration and ignore overrides'
         opt :force,  'Run rconf even if configuration file has not changed'
         opt :verbose,'Print debug output'
       end
@@ -62,6 +63,8 @@ where [options] are:
         new.list_configurators
       elsif opts[:platform]
         new.show_platform
+      elsif opts[:overrides]
+        new.show_overrides
       elsif opts[:update]
         new.update
       elsif opts[:remove]
@@ -81,16 +84,14 @@ where [options] are:
         puts "== #{key} ==".bold
         puts configurator.desc
         puts 'Settings:'
-        max_size = configurator.all_settings.keys.map(&:to_s).map(&:size).max
-        configurator.all_settings.each do |name, desc|
-          num_spaces = max_size - name.to_s.size + 1
-          print "  - #{name.to_s.blue}:#{' ' * num_spaces}#{desc}"
-          required_settings = configurator.required_settings || []
-          if required_settings.include?(name)
-            puts ' [required]'.green
-          else
-            puts
-          end
+        max_size = configurator.all_settings.map { |s| s[:name] }.map(&:size).max
+        configurator.all_settings.each do |setting|
+          name = setting[:name]
+          desc = setting[:description]
+          options = setting[:options].keys.map { |k| "[#{k}]" }.join(' ')
+          num_spaces = max_size - name.size + 1
+          print "  - #{name.blue}:#{' ' * num_spaces}#{desc}"
+          puts ' ' + options.green
         end
         puts
       end
@@ -107,6 +108,32 @@ where [options] are:
       puts "Release: #{Platform.release}"
     end
 
+    # List current overrides as defined in ~/.rconf_overrides
+    #
+    # === Return
+    # true:: Always return true
+    def show_overrides
+      if !File.readable?(OverridesLanguage::OVERRIDES_FILE)
+        puts "No rconf overrides file at #{OverridesLanguage::OVERRIDES_FILE}"
+      else
+        overrides = OverridesLanguage.load
+        if overrides
+          puts "Loading overrides from #{OverridesLanguage::OVERRIDES_FILE}"
+          msg = ''
+          overrides.each do |key, setting|
+            msg += "* #{key}\n" +
+            msg += setting.inject([]) do |m, (name, value)|
+              m << "  - #{name} = #{value}"
+              m
+            end.join("\n")
+          end
+          puts msg
+        else
+          puts "Failed to load overrides from #{OverridesLanguage::OVERRIDES_FILE}: #{OverridesLanguage.parse_error.error_message}"
+        end
+      end
+    end
+
     # Update rconf to latest in all installed rubies
     #
     # === Return
@@ -116,7 +143,7 @@ where [options] are:
       report_check 'Retrieving latest rconf...'
       json = Command.execute('curl', '-s', 'http://rubygems.org/api/v1/gems/rconf.json').output
       json =~ /"version":"([^"]+)"/
-      version = Regexp.last_match(1)
+        version = Regexp.last_match(1)
       report_fatal 'Failed to retrieve rconf gem information, check network connectivity' unless version
       report_success
       report('Latest rconf version is ' + version.blue)
@@ -166,11 +193,11 @@ where [options] are:
         report_check("Checking rconf for #{ruby}@#{gs}")
         rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf').output
         if rconf =~ /rconf \(#{version}/
-          report_success
+                             report_success
         elsif rconf =~ /^rconf /
           report_failure
           report_check("Updating rconf for #{ruby}@#{gs}")
-          res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'install', 
+          res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'install',
                                 'rconf', '-v', version, '--no-ri', '--no-rdoc')
           report_result(res.success?)
         else

data/lib/rconf/configurator.rb

@@ -22,16 +22,13 @@ module RightConf
 
        # Key associated with configurator
       attr_reader :key
- 
+
       # Description
       attr_reader :desc
 
       # Access to settings for documentation
       attr_reader :all_settings
 
-      # Access to required settings for validation
-      attr_reader :required_settings
-
       # Associate configurator with given key
       #
       # === Parameters
@@ -57,32 +54,25 @@ module RightConf
         true
       end
 
-      # Store settings and their descriptions in a hash
+      # Store setting definition
+      # A definition consists of a name, a description and optionally options
+      # Possible options are:
+      #   :required         => true|false  Whether the setting is required
       #
       # === Parameters
       # settings(Hash):: Settings descriptions indexed by names
       #
       # === Return
       # true:: Always return true
-      def settings(settings)
-        default_settings = { :only_if => 'Ruby code that should return true for configurator to proceed' }
-        @all_settings = settings.merge(default_settings)
+      def setting(name, description, options={})
+        @all_settings ||= [{ :name => 'only_if',
+                             :description => 'Ruby code that should return true for configurator to proceed',
+                             :options => {} }]
+        @all_settings << { :name => name, :description => description, :options => options || {} }
         true
       end
 
-       # Store required settings for validation
-      #
-      # === Parameters
-      # settings(Array):: List of settings that should be checked
-      #
-      # === Return
-      # true:: Always return true
-      def validate_has_settings(*settings)
-        @required_settings = settings.flatten
-        true
-      end
-
-   end
+    end
 
     # Extend base class with ClassMethods module methods
     #
@@ -98,16 +88,21 @@ module RightConf
     # nil:: If settings are valid for this configurator
     # error(String):: Error message otherwise
     def validate
-      required = self.class.required_settings
-      return nil unless required
-      missing = required.flatten.select { |s| !@settings_values.include?(s) }
-      error = case missing.size
-        when 0 then nil
-        when 1 then "Required setting #{missing.first} is "
-        else
-          "Required settings #{missing.join(', ')} are "
+      @settings_values.merge!(OverridesLanguage.overrides_for(self.class.key.to_s)) unless Profile.force_reconfigure?
+      if e = OverridesLanguage.parse_error
+        error = "Could not load overrides file '#{OverridesLanguage::OVERRIDES_FILE}' (#{e.message})"
+      else
+        required = self.class.all_settings.select { |s| s[:options][:required] }.map { |s| s[:name] }
+        return nil unless required
+        missing = required.select { |s| !@settings_values.include?(s) }
+        error = case missing.size
+                when 0 then nil
+                when 1 then "Required setting #{missing.first} is "
+                else
+                  "Required settings #{missing.join(', ')} are "
+                end
+        error += "missing for configuration section '#{self.class.key}'" if error
       end
-      error += "missing for configuration section '#{self.class.key}'" if error
       error
     end
 
@@ -124,7 +119,7 @@ module RightConf
     #
     # === Parameters
     # args:: Pass-through arguments, given to platform specific implementation
-    # 
+    #
     # === Return
     # true:: Always return true
     def run(*args)
@@ -168,7 +163,7 @@ module RightConf
     # value:: Value of configuration option if there is one
     # nil:: Otherwise
     def [](config_option)
-      @settings_values[config_option]
+      @settings_values[config_option.to_s]
     end
 
     protected
@@ -192,10 +187,10 @@ module RightConf
         if self.public_methods.include?("#{method_name}=")
           res = self.send("#{method_name}=", value)
         else
-          res = @settings_values[meth] = value
+          res = @settings_values[meth.to_s] = value
         end
       end
-      res || @settings_values[meth]
+      res || @settings_values[meth.to_s]
     end
 
     # Initialize configuration settings hash and index

data/lib/rconf/configurators/build_configurator.rb

@@ -19,16 +19,14 @@ module RightConf
 
     description 'Builds a repository using the ./configure, make, make install commands'
 
-    settings :path           => 'Path to source files',
-             :tarball_url    => 'URL to source code tarball to be downloaded, supports .tgz and .zip',
-             :tarball_dir    => 'Name of directory created when untaring tarball, required if "tarball_url" is set',
-             :pre_step       => 'Command ran prior to ./configure',
-             :message        => 'Progress message to display if any while building',
-             :configure_opts => 'Hash of options to be given to the configure script. ' +
+    setting  'path',           'Path to source files', :required => true
+    setting  'tarball_url',    'URL to source code tarball to be downloaded, supports .tgz and .zip'
+    setting  'tarball_dir',    'Name of directory created when untaring tarball, required if "tarball_url" is set'
+    setting  'pre_step',       'Command ran prior to ./configure'
+    setting  'message',        'Progress message to display if any while building'
+    setting  'configure_opts', 'Hash of options to be given to the configure script. ' +
                                 'The keys are the platform families (:darwin, :linux or :windows)'
 
-    validate_has_settings :path
-
     # No way to check, return false
     #
     # === Return

data/lib/rconf/configurators/bundler_configurator.rb

@@ -21,12 +21,10 @@ module RightConf
 
     description 'Installs bundler and runs "bundle install"'
 
-    settings :version     => 'Version of bundler gem, e.g. "1.0.21"',
-             :exclusions  => 'Comma separated list of gem groups to be excluded when installing bundle',
-             :bundle_path => 'Path where bundle should be installed',
-             :gem_path    => 'Path to bundler gem, e.g. "vendor/system_gems/cache"'
-
-    validate_has_settings :version
+    setting  'version',     'Version of bundler gem, e.g. "1.0.21"', :required => true
+    setting  'exclusions',  'Comma separated list of gem groups to be excluded when installing bundle'
+    setting  'bundle_path', 'Path where bundle should be installed'
+    setting  'gem_path',    'Path to bundler gem, e.g. "vendor/system_gems/cache"'
 
     # Check whether bundler is already installed
     #

data/lib/rconf/configurators/cassandra_configurator.rb

@@ -22,13 +22,11 @@ module RightConf
 
     description 'Installs Cassandra'
 
-    settings :version          => 'Cassandra version to install',
-             :install_path     => 'Path to Cassandra installation directory, uses /opt/cassandra if it ' +
-                                  'is writable by the current user or ~/cassandra otherwise by default',
-             :abort_on_failure => 'Whether to abort if Cassandra failed to install (false by default)',
-             :endpoint_snitch  => 'Set custom endpoint snitch for installed cassandra'
-
-    validate_has_settings :version
+    setting  'version',         'Cassandra version to install', :required => true
+    setting  'install_path',    'Path to Cassandra installation directory, uses /opt/cassandra if it ' +
+                                  'is writable by the current user or ~/cassandra otherwise by default'
+    setting  'abort_on_failure','Whether to abort if Cassandra failed to install (false by default)'
+    setting  'endpoint_snitch', 'Set custom endpoint snitch for installed cassandra'
 
     # Check whether Cassandra is installed
     #

data/lib/rconf/configurators/execute_configurator.rb

@@ -19,13 +19,11 @@ module RightConf
 
     description 'Run arbitrary shell commands'
 
-    settings :command_line     => 'Command line to run',
-             :message          => 'Progress message to display if any while command is running',
-             :abort_on_failure => 'Message to display when aborting configuration if command fails. ' +
+    setting 'command_line',     'Command line to run', :required => true
+    setting 'message',          'Progress message to display if any while command is running'
+    setting 'abort_on_failure', 'Message to display when aborting configuration if command fails. ' +
                                   'Do not abort if not set'
 
-    validate_has_settings :command_line
-
     # No way to check, return false
     #
     # === Return

data/lib/rconf/configurators/git_repo_configurator.rb

@@ -19,11 +19,9 @@ module RightConf
 
     description 'Clone git repository and build if needed'
 
-    settings :repo => 'git repo URL',
-             :path => 'Path where git repo should be cloned to',
-             :tag  => 'git tag or branch or sha that should be checked out ("master" by default)'
-
-    validate_has_settings :repo, :path
+    setting 'repo','git repo URL', :required => true
+    setting 'path','Path where git repo should be cloned to', :required => true
+    setting 'tag', 'git tag or branch or sha that should be checked out ("master" by default)'
 
     # Check whether repo was already cloned
     #

data/lib/rconf/configurators/mercurial_configurator.rb

@@ -24,7 +24,7 @@ module RightConf
 
     description 'Installs Mercurial'
 
-    settings :abort_on_failure => 'Whether to abort if Mercurial failed to install (false by default)'
+    setting 'abort_on_failure', 'Whether to abort if Mercurial failed to install (false by default)'
 
     # Check whether Mercurial is installed
     #

data/lib/rconf/configurators/packages_configurator.rb

@@ -19,11 +19,11 @@ module RightConf
 
     description 'Installs packages defined for running platform'
 
-    settings :debian  => 'Packages to be installed on Debian based Linux',
-             :centos  => 'Packages to be installed on RedHat / Centos',
-             :windows => 'Softwared to be downloaded and installed on Windows',
-             :darwin  => 'Brew packages to be installed on Mac OS X (https://github.com/mxcl/homebrew)',
-             :abort_on_failure => 'Whether to abort if packages failed to install (false by default)'
+    setting 'debian',  'Packages to be installed on Debian based Linux'
+    setting 'centos',  'Packages to be installed on RedHat / Centos'
+    setting 'windows', 'Softwared to be downloaded and installed on Windows'
+    setting 'darwin',  'Brew packages to be installed on Mac OS X (https://github.com/mxcl/homebrew)'
+    setting 'abort_on_failure', 'Whether to abort if packages failed to install (false by default)'
 
     # Let package manager check for idempotency, return false
     #

data/lib/rconf/configurators/passenger_configurator.rb

@@ -28,9 +28,9 @@ module RightConf
                 'passenger section then that ruby will be used, otherwise ' +
                 'the default ruby will.'
 
-    settings :library_src_path => "Path to library sources, #{File.expand_path(File.join(Dir.getwd, '..', 'library'))} by default",
-             :gem_version  => "Passenger gem version #{PASSENGER_GEM_VERSION} by default",
-             :install_path => 'Path to nginx installation directory, uses /opt/nginx if it ' +
+    setting 'library_src_path', "Path to library sources, #{File.expand_path(File.join(Dir.getwd, '..', 'library'))} by default"
+    setting 'gem_version',  "Passenger gem version #{PASSENGER_GEM_VERSION} by default"
+    setting 'install_path', 'Path to nginx installation directory, uses /opt/nginx if it ' +
                               'is writable by the current user or ~/nginx otherwise by default'
 
     # Check that passenger gem is installed and that passenger+nginx is installed

data/lib/rconf/configurators/ruby_configurator.rb

@@ -20,11 +20,9 @@ module RightConf
     description "Installs ruby interpreter and rubygems.\n" +
                 'Installs and uses rvm on supported (i.e. non-Windows) platforms'
 
-    settings :version   => 'Ruby version using rvm notation (see "rvm list known")',
-             :rubygems  => 'Rubygems version, e.g. "1.3.7"',
-             :gemset    => 'Gemset to be used for platforms supporting rvm'
-
-    validate_has_settings :version
+    setting 'version',  'Ruby version using rvm notation (see "rvm list known")', :required => true
+    setting 'rubygems', 'Rubygems version, e.g. "1.3.7"'
+    setting 'gemset',   'Gemset to be used for platforms supporting rvm'
 
     # RVM version used to install rubies
     RVM_VERSION = '1.10.2'

data/lib/rconf/overrides_language.rb

@@ -0,0 +1,145 @@
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited. Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and
+# the licensee
+
+module RightConf
+
+  # Defines ~/.rconf_overrides file DSL
+  class OverridesLanguage
+
+    # Path to overrides file
+    OVERRIDES_FILE = File.join(ENV['HOME'], '.rconf_overrides')
+
+    # Return override for given configurator setting if any
+    #
+    # === Parameters
+    # key(String):: Configurator key
+    # setting(String):: Setting name
+    #
+    # === Return
+    # value(String||Nil):: Override value if any, nil otherwise
+    def self.overrides_for(key)
+      self.load unless @overrides
+      @overrides && @overrides[key] || {}
+    end
+
+    # Load overrides from file
+    #
+    # === Return
+    # overrides(Hash):: Loaded overrides
+    def self.load
+      return @overrides if @overrides
+      return {} unless File.readable?(OVERRIDES_FILE)
+      @overrides = self.parse(IO.read(OVERRIDES_FILE)) || {}
+    end
+
+    # Persist overrides to overrides file
+    #
+    # === Return
+    # true:: Always return true
+    def self.save
+      File.open(OVERRIDES_FILE, 'w') do |f|
+        @overrides.each do |key, settings|
+          settings.each do |name, value|
+            f.puts "#{key}.#{name}=#{value}"
+          end
+        end
+      end
+      true
+    end
+
+    # Return parse errors from last call to 'parse' if any
+    def self.parse_error
+      @parse_error
+    end
+
+    protected
+
+    # Load overrides from config file and produce hash of
+    # overrides keyed by configurator and setting name
+    #
+    # === Parameters
+    # source(String):: Overrides text
+    #
+    # === Return
+    # overrides(Hash):: Overrides hash
+    def self.parse(source)
+      @parse_error = nil
+      @overrides = nil
+      overrides = Object.new
+      ConfiguratorRegistry.each do |key, configurator|
+        klass, code = override_class_code(key, configurator)
+        overrides.class.class_eval(code)
+        overrides.instance_eval("@#{key} = #{klass}.new")
+      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'"
+          end
+          if operands[1].start_with?('"') || operands[1].start_with?("'")
+            value = operands[1]
+          else
+            value = "'#{operands[1]}'"
+          end
+          overrides.instance_eval("@#{operands[0]}=#{value}")
+        end
+      rescue Exception => e
+        @overrides = nil
+        @parse_error = e
+      end
+      @overrides
+    end
+
+    # Add override read from overrides file
+    #
+    # === Paramaters
+    # key(String):: Configurator key
+    # setting(String):: Setting name
+    # value(String):: Override value
+    #
+    # === Return
+    # true:: Always return true
+    def self.add_override(key, setting, value)
+      @overrides ||= {}
+      @overrides[key] ||= {}
+      @overrides[key][setting] = value
+      true
+    end
+
+    # Build code for override class associated with given configurator
+    # That class defines one setter method per setting which sets
+    # the value in the @overrides class variable of *this*
+    # (OverridesLanguage) class
+    #
+    # === Parameters
+    # key(String):: Configurator key
+    # configurator(Class):: Configurator class
+    #
+    # === Return
+    # res(Array):: Pair of class name and class ruby code
+    def self.override_class_code(key, configurator)
+      klass = key.capitalize
+      code = "class #{klass}\n"
+      configurator.all_settings.each do |s|
+        code += <<-EOS
+          def #{s[:name]}=(val)
+            OverridesLanguage.add_override('#{key}', '#{s[:name]}', val)
+          end
+        EOS
+      end
+      code += 'end'
+      [klass, code]
+    end
+
+  end
+end
+

data/lib/rconf/version.rb

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

data/lib/rconf.rb

@@ -18,6 +18,7 @@ require File.join(BASE_DIR, 'command')
 require File.join(BASE_DIR, 'configurator_registry')
 require File.join(BASE_DIR, 'configurator')
 require File.join(BASE_DIR, 'language')
+require File.join(BASE_DIR, 'overrides_language')
 require File.join(BASE_DIR, 'platform')
 require File.join(BASE_DIR, 'profile')
 require File.join(BASE_DIR, 'trollop')

data/rconf.rconf

@@ -1,11 +1,11 @@
 # Configuration settings for RightSite
 ruby do
   version  'ruby-1.9.2-p290'
-  rubygems '1.8.11'
+  rubygems '1.8.24'
   gemset   'rconf'
 end
 bundler do
-  version '1.1.3'
+  version '1.2.1'
 end
 
 

data/spec/configurator_spec.rb

@@ -16,8 +16,8 @@ describe RightConf::Configurator do
   class TestConfigurator
     include RightConf::Configurator
     register :test
-    validate_has_settings :required
-    attr_reader :custom_setting
+    attr_accessor :custom_setting
+    setting 'required', 'required setting', :required => true
     def test_setter(value)
       @custom_setting = value
     end
@@ -34,10 +34,22 @@ describe RightConf::Configurator do
     register :another
   end
 
+  before(:all) do
+    # Disable overrides
+    RightConf::OverridesLanguage.instance_variable_set(:@overrides, {})
+  end
+
   before(:each) do
     @configurator = TestConfigurator.new(1)
   end
 
+  after(:all) do
+    confs = RightConf::ConfiguratorRegistry.instance.instance_variable_get(:@configurators)
+    confs.delete(:test)
+    confs.delete(:another)
+    RightConf::OverridesLanguage.instance_variable_set(:@overrides, nil)
+  end
+
   it 'should register configurators' do
     RightConf::ConfiguratorRegistry[:test].should == TestConfigurator
     RightConf::ConfiguratorRegistry[:another].should == AnotherConfigurator

data/spec/configurators/bundler_configurator_spec.rb

@@ -17,6 +17,15 @@ describe RightConf::BundlerConfigurator do
     flexmock('res', :success? => true, :output => output)
   end
 
+  before(:all) do
+    # Disable overrides
+    RightConf::OverridesLanguage.instance_variable_set(:@overrides, {})
+  end
+
+  after(:all) do
+    RightConf::OverridesLanguage.instance_variable_set(:@overrides, nil)
+  end
+
   before(:each) do
     @configurator = create_configurator('bundler { version "0" }')
     RightConf::Command.instance.instance_variable_set(:@rvm_prefix, 'r@g')

data/spec/language_spec.rb

@@ -13,6 +13,15 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe RightConf::Language do
 
+  before(:all) do
+    # Disable overrides
+    RightConf::OverridesLanguage.instance_variable_set(:@overrides, {})
+  end
+
+  after(:all) do
+    RightConf::OverridesLanguage.instance_variable_set(:@overrides, nil)
+  end
+
   it 'should invalidate missing blocks' do
     lang = RightConf::Language.parse('toto')
     lang.validation_errors.size.should == 1
@@ -31,7 +40,7 @@ describe RightConf::Language do
     lang.configurators.size.should == 1
     lang.configurators.first.class.should == RightConf::RubyConfigurator
     lang.configurators.first.instance_variable_get(:@settings_values).should ==
-      { :version => '1', :rubygems => '2' }
+      { 'version' => '1', 'rubygems' => '2' }
   end
 
   it 'should parse multiple configurations' do
@@ -49,10 +58,10 @@ describe RightConf::Language do
     lang.configurators.size.should == 2
     lang.configurators[0].class.should == RightConf::RubyConfigurator
     lang.configurators[0].instance_variable_get(:@settings_values).should ==
-      { :version => '1', :rubygems => '2' }
+      { 'version' => '1', 'rubygems' => '2' }
     lang.configurators[1].class.should == RightConf::BundlerConfigurator
     lang.configurators[1].instance_variable_get(:@settings_values).should ==
-      { :version => '3' }
+      { 'version' => '3' }
   end
 
 end

data/spec/overrides_language_spec.rb

@@ -0,0 +1,37 @@
+# Copyright (C) 2011-2012 RightScale, Inc, All Rights Reserved Worldwide.
+#
+# THIS PROGRAM IS CONFIDENTIAL AND PROPRIETARY TO RIGHTSCALE
+# AND CONSTITUTES A VALUABLE TRADE SECRET. Any unauthorized use,
+# reproduction, modification, or disclosure of this program is
+# strictly prohibited. Any use of this program by an authorized
+# licensee is strictly subject to the terms and conditions,
+# including confidentiality obligations, set forth in the applicable
+# License Agreement between RightScale.com, Inc. and
+# the licensee
+
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe RightConf::OverridesLanguage do
+
+  it 'should load overrides' do
+    hash = RightConf::OverridesLanguage.parse("ruby.version='2.0'\nbundler.version = 3.0")
+    if e = RightConf::OverridesLanguage.parse_error
+      puts "Failed to parse overrides: #{e.message}"
+    end
+    hash.size.should == 2
+    hash['ruby'].size.should == 1
+    hash['ruby']['version'].should == '2.0'
+    hash['bundler'].size.should == 1
+    hash['bundler']['version'].should == '3.0'
+    RightConf::OverridesLanguage.parse_error.should be_nil
+  end
+
+  it 'should catch errors' do
+    hash = RightConf::OverridesLanguage.parse('foo')
+    hash.should be_nil
+    RightConf::OverridesLanguage.parse_error.should_not be_nil
+  end
+
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 0.9.25
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70216575231940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70216575231940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70216575228820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70216575228820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: ! 'rconf configures the environment for a given application. rconf reads
 
   the content of an application configuration file and installs and/or
@@ -76,6 +86,7 @@ files:
 - lib/rconf/configurators/passenger_configurator.rb
 - lib/rconf/configurators/ruby_configurator.rb
 - lib/rconf/language.rb
+- lib/rconf/overrides_language.rb
 - lib/rconf/platform.rb
 - lib/rconf/platforms/darwin.rb
 - lib/rconf/platforms/linux.rb
@@ -102,6 +113,7 @@ files:
 - spec/configurators/passenger_configurator_spec.rb
 - spec/configurators/ruby_configurator_spec.rb
 - spec/language_spec.rb
+- spec/overrides_language_spec.rb
 - spec/platform_spec.rb
 - spec/profile_spec.rb
 - spec/progress_reporters/base_reporter_spec.rb
@@ -130,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rconf
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration
@@ -144,6 +156,7 @@ test_files:
 - spec/configurators/passenger_configurator_spec.rb
 - spec/configurators/ruby_configurator_spec.rb
 - spec/language_spec.rb
+- spec/overrides_language_spec.rb
 - spec/platform_spec.rb
 - spec/profile_spec.rb
 - spec/progress_reporters/base_reporter_spec.rb