rconf 0.9.18 → 0.9.19

data/README.rdoc

@@ -1,4 +1,6 @@
-= right_env
+
+= rconf
+
 
 == INTRODUCTION
 
@@ -11,9 +13,9 @@ application to another for development in particular is quickly becoming
 close to impossible.
 
 rconf aims at addressing some of these difficulties by providing a uniform
-and consistent mechanism for applications developed at RightScale to 
+and consistent mechanism for applications developed at RightScale to
 declaratively specify the tools they depend on various platforms (linux, darwin
-and potentially windows). 
+and potentially windows).
 
 rconf uses a DSL close to Chef recipes for defining an application configuration.
 Each application must be equipped with a definition that must reside at the top
@@ -21,37 +23,76 @@ level directory of the application and use the '.rconf' file extension. When run
 for the first time rconf sets up a .rvmrc file which gets invoked and sets up
 the environment each time the application directory gets 'cd-ed' into.
 
-Internally rconf relies on 'configurators' to configure the machine 
+Internally rconf relies on 'configurators' to configure the machine
 appropriately. There is one configurator per tool that needs configuration.
 Each configurator is dynamically instantiated by rconf as it reads the
 application configuration file. This makes for an extensible system where new
-configurator may be added to configure new tools that new applications may 
+configurator may be added to configure new tools that new applications may
 rely on.
 
-== REQUIREMENTS
 
-=== Running
+== REQUIREMENTS
 
-==== Linux and Mac OS X
+=== Linux and Mac OS X
 
 - ruby >= 1.8.6
 - curl
 - tar
 
-==== Windows
+=== Windows
 
 - ruby >= 1.8.6
 - Win32API gem
 
-=== Unit testing
 
-Install the following gems for testing:
-- rspec >= 2.0
-- flexmock
+== INSTALLING
+
+There are two installation cases
+
+a) you've already got a working install of RVM
+b) blank system
+
+=== a) Installing when RVM is already present
+
+It should be as simple as:
+
+  gem install rconf
+
+and then moving to your repository and running:
+
+  rconf
+
+to let rconf prepare your environment for the repository.
+
+=== b) Installing on a blank system
+
+If your system fits the requirements listed above, installing rconf will
+require you to make a system install of rconf:
+
+  sudo gem install rconf
+
+then you can go to your repository and run
+
+  rconf
+
+If you do not have a x.rconf equipped directory and you want rconf to install rvm for
+you, you can create a file named dummy.rconf containing:
+
+  ruby do
+    version 'ruby-1.9.2-p290'
+    rubygems '1.8.10'
+  end
+
+and then run rconf against it:
+
+  rconf dummy.rconf
+
+=== rconf and existing .rvmrc files
+
+If you have pre-existing .rvmrc files and they don't play well with your
+.rconf configuration file, don't hesitate to delete them and run rconf.
+rconf will create a new, working, .rvmrc.
 
-Then the build can be tested with
- 
-  rake spec
 
 == WRITING RCONF CONFIGURATION FILES
 
@@ -70,9 +111,23 @@ executed in order. For a complete list of available configurators run:
 
 The same configurator can appear multiple times in a configuration file.
 
-== EXTENDING RCONF WITH NEW CONFIGURATORS
 
-Writing a configurator consists of writing a ruby class which includes the 
+== DEVELOPING RCONF AND FOR RCONF
+
+=== Requirements
+
+Install the following gems for testing:
+- rspec >= 2.0
+- flexmock
+
+Then the build can be tested with
+
+  rake spec
+
+
+=== Extending rconf with new configurators
+
+Writing a configurator consists of writing a ruby class which includes the
 +RightConf::Configurator+ module and uses the class methods define there to
 register, provide a description and list its settings.
 
@@ -83,7 +138,7 @@ The exact methods are:
 - +settings+: The value should be a hash where the keys are the settings names (ruby symbols) and the value is the setting description.
 - +validate_has_settings+: An array of settings names (symbols) for all settings that must be set for a configuration to be valid when using that configurator.
 
-The configurator class then needs to implement the +run+ method which gets 
+The configurator class then needs to implement the +run+ method which gets
 called whenever rconf executes a configuration section using the configurator.
 
 Alternatively the configurator class may implement +run_<platform>+ where
@@ -91,12 +146,12 @@ Alternatively the configurator class may implement +run_<platform>+ where
 implementation needs to be platform specific.
 
 The configurator can also provide distribution specific implementations by
-implementing +run_<platform>_<flavor>+ where +<flavor>+ depends on the 
+implementing +run_<platform>_<flavor>+ where +<flavor>+ depends on the
 platform and can take the values 'ubuntu', 'centos' etc. (linux).
 
-Finally the +run+ method can also be implemented using the full specification 
+Finally the +run+ method can also be implemented using the full specification
 for a platform including the release number (e.g. +run_linux_ubuntu_10_10+). In
-each case rconf will use the most specific implementation (so if both 
+each case rconf will use the most specific implementation (so if both
 +run_linux+ and +run_linux_ubuntu+ are provided and the configurator is
 running on Ubuntu then rconf will call the +run_linux_ubuntu+ implementation).
 

data/Rakefile

@@ -30,15 +30,15 @@ end
 
 namespace :spec do
   desc "Run unit tests with RCov"
-  RSpec::Core::RakeTask.new(:rcov) do |t| 
+  RSpec::Core::RakeTask.new(:rcov) do |t|
     t.rcov = true
     t.rcov_opts = %q[--exclude "spec"]
-  end 
+  end
 
   desc "Print Specdoc for unit tests"
-  RSpec::Core::RakeTask.new(:doc) do |t| 
+  RSpec::Core::RakeTask.new(:doc) do |t|
     t.rspec_opts = ["--format", "documentation"]
-  end 
+  end
 end
 
 # == Gem == #

data/bin/rconf

@@ -178,7 +178,7 @@ where [options] are:
         end
       end
     end
-    
+
     # Remove rconf from all rubies/gemsets
     #
     # === Return
@@ -194,7 +194,7 @@ where [options] are:
         end
       end
     end
-        
+
     # Actually configure environment
     #
     # === Parameters

data/lib/rconf/command.rb

@@ -25,7 +25,7 @@ module RightConf
     # args(Array):: Command arguments
     #
     # === Options
-    # abort_on_failure(bool):: Whether to raise an exception in case command 
+    # abort_on_failure(bool):: Whether to raise an exception in case command
     #                          returns an error (false by default)
     # env:: Hash of environment variables keyed by name
     #
@@ -60,7 +60,7 @@ module RightConf
     # args(Array):: Command arguments
     #
     # === Options
-    # abort_on_failure(bool):: Whether to raise an exception in case command 
+    # abort_on_failure(bool):: Whether to raise an exception in case command
     #                          returns an error (false by default)
     # env:: Hash of environment variables keyed by name
     #
@@ -82,7 +82,7 @@ module RightConf
     # args(Array):: Command arguments
     #
     # === Options
-    # abort_on_failure(bool):: Whether to raise an exception in case command 
+    # abort_on_failure(bool):: Whether to raise an exception in case command
     #                          returns an error (false by default)
     # env:: Hash of environment variables keyed by name
     #
@@ -110,7 +110,7 @@ module RightConf
     end
 
     # Execute given command on *nix systems
-    # 
+    #
     # === Parameters
     # command(String):: Command name
     # env(Hash):: Hash of environment variables keyed by name
@@ -129,7 +129,7 @@ module RightConf
     alias :execute_darwin :execute_linux
 
     # Execute given command on Windows systems
-    # 
+    #
     # === Parameters
     # command(String):: Command name
     # env(Hash):: Hash of environment variables keyed by name

data/lib/rconf/configurator_registry.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/lib/rconf/configurators/build_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -53,7 +53,7 @@ module RightConf
         Dir.chdir(path) do
           filename = File.basename(tarball_url)
           unless File.exists?(File.join(Dir.pwd, filename))
-            Command.execute('curl', '-O', '-f', tarball_url, :abort_on_failure => "Failed to curl #{tarball_url}") 
+            Command.execute('curl', '-O', '-f', tarball_url, :abort_on_failure => "Failed to curl #{tarball_url}")
           end
           abf = { :abort_on_failure => "Failed to uncompress #{filename}" }
           case filename

data/lib/rconf/configurators/bundler_configurator.rb

@@ -25,7 +25,7 @@ module RightConf
              :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
 
     # Check whether bundler is already installed
@@ -55,7 +55,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def run_linux
-      install_bundler 
+      install_bundler
       report_check('Installing gems')
       options = [ "_#{version}_", 'install' ]
       options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
@@ -93,7 +93,7 @@ module RightConf
         report_success
       end
       report_check("Installing bundler #{version}")
-      if gem_path 
+      if gem_path
         bundler_file = [ File.join(gem_path, "bundler-#{version}.gem") ]
         report_fatal("Missing bundler gem at #{bundler_file}") unless File.exist?(bundler_file)
       else

data/lib/rconf/configurators/cassandra_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -13,7 +13,7 @@ module RightConf
 
   class CassandraConfigurator
 
-    SOURCE_BASE_URL  = 'http://mirror.metrocast.net/apache//cassandra/VERSION/apache-cassandra-VERSION-bin.tar.gz'
+    SOURCE_BASE_URL  = 'http://archive.apache.org/dist/cassandra/VERSION/apache-cassandra-VERSION-bin.tar.gz'
     DEFAULT_CASSANDRA_INSTALL = ['/opt/cassandra', File.join(ENV['HOME'], 'cassandra')]
 
     include Configurator
@@ -28,7 +28,7 @@ module RightConf
              :abort_on_failure => 'Whether to abort if Cassandra failed to install (false by default)'
 
     validate_has_settings :version
-    
+
     # Check whether Cassandra is installed
     #
     # === Return
@@ -36,7 +36,7 @@ module RightConf
     # false:: Otherwise
     def check_linux
       report_check('Checking for Cassandra')
-      installed = Command.execute('cassandra', '-h').success? 
+      installed = Command.execute('cassandra', '-h').success?
       report_result(installed)
       installed
     end

data/lib/rconf/configurators/execute_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/lib/rconf/configurators/git_repo_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -35,18 +35,18 @@ module RightConf
     end
     alias :check_darwin :check_linux
     alias :check_windows :check_linux
-    
+
     # Clone git repo and run build commands if given
     #
     # === Return
     # true:: Always return true
     def run_linux
       if File.exist?(path)
-        FileUtils.mv(path, "#{path}_old") 
+        FileUtils.mv(path, "#{path}_old")
         post_note "Had to move #{path} to #{path}_old"
       end
       report_check("Cloning #{repo} into #{path}")
-      Command.execute('git', 'clone', repo, path, 
+      Command.execute('git', 'clone', repo, path,
                       :abort_on_failure => "Failed to clone #{repo} into #{path}")
       report_success
       if tag

data/lib/rconf/configurators/mercurial_configurator.rb

@@ -33,7 +33,7 @@ module RightConf
     # false:: Otherwise
     def check_linux
       report_check("Checking for Mercurial")
-      installed = Command.execute('hg', '--version').success? 
+      installed = Command.execute('hg', '--version').success?
       report_result(installed)
       installed
     end
@@ -49,7 +49,7 @@ module RightConf
       PackageInstaller.install('mercurial', opts)
     end
 
-    # Brew does not have a package for mercurial :( 
+    # Brew does not have a package for mercurial :(
     #
     # === Return
     # true:: Always return true

data/lib/rconf/configurators/packages_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/lib/rconf/configurators/passenger_configurator.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -32,7 +32,7 @@ module RightConf
              :gem_version  => "Passenger gem version #{PASSENGER_GEM_VERSION} by default",
              :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
     #
     # === Return
@@ -75,7 +75,7 @@ module RightConf
     end
     alias :run_darwin :run_linux
 
-    # Not implemented on windows 
+    # Not implemented on windows
     #
     # === Raise
     # (Exception):: Always raise
@@ -141,7 +141,7 @@ module RightConf
 
     # Install passenger+nginx
     #
-    # === Return 
+    # === Return
     # true:: Always return true
     def install_passenger
       report_check('Installing passenger+nginx')
@@ -184,7 +184,7 @@ module RightConf
     def log_path
       File.join(install_path, 'logs', 'nginx-error.log')
     end
-    
+
     # Nginx pid file path
     def pid_path
       File.join(install_path, 'logs', 'nginx.pid')
@@ -232,7 +232,7 @@ http {
     gzip_disable "MSIE [1-6]\.";
     gzip_proxied any;
     gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-            
+
     server {
         ssi on;
         listen 3000;
@@ -240,59 +240,59 @@ http {
         root #{File.join(right_site_src_path, 'public')};
         passenger_enabled on;
         rails_env development;
-    
+
         # POST and AJAX requests need to proxied directly to the library app
         #####################################################################
         set $is_library_direct "";
-    
+
         # provisioning routes to the library
         if ($request_uri ~ ^/provisioning)
         {
         rewrite ^/provisioning(.*)$ /direct_library/provisioning$1 last;
         }
-    
+
         if ($request_uri ~ ^/aria_provisioning_callbacks)
         {
         rewrite ^/aria_provisioning_callbacks(.*)$ /direct_library/aria_provisioning_callbacks$1 last;
         }
-    
-        # request is for a library related action      
+
+        # request is for a library related action
         if ($request_uri ~ ^/library/)
         {
             set $is_library_direct  L;
         }
-    
+
         # request is a POST
         if ($request_method = POST)
         {
-            set $is_library_direct "${is_library_direct}P";       
+            set $is_library_direct "${is_library_direct}P";
         }
-    
+
         # request is an AJAX
         if ($http_x_requested_with = XMLHttpRequest)
-        {      
+        {
             set $is_library_direct "${is_library_direct}A";
         }
-    
+
         # library post request should be directly proxied
         if ($is_library_direct = LP)
         {
             rewrite  ^/library/(.*)$  /direct_library/$1  last;
         }
-    
+
         # library post ajax request should be directly proxied
         if ($is_library_direct = LPA)
         {
             rewrite  ^/library/(.*)$  /direct_library/$1  last;
         }
-    
+
         # library ajax request should be directly proxied
         if ($is_library_direct = LA)
         {
             rewrite  ^/library/(.*)$  /direct_library/$1  last;
         }
     #####################################################################
-    
+
         location /direct_library/
         {
             proxy_pass http://library.rightscale.local:3001/;
@@ -300,27 +300,27 @@ http {
             proxy_set_header   X-Embedded         on;
             proxy_set_header   X-Core-Site-Domain    right-site.rightscale.local;
         }
-    
+
         location ~ ^/library/users/(.+)/openid_consume
         {
             proxy_pass http://library.rightscale.local:3001/users/$1/openid_consume?$args;
             proxy_set_header   X-Relative-Root    library;
             proxy_set_header   X-Embedded         on;
         }
-    
-    
+
+
         location ~ ^/library/(.*).(css|js)
         {
-          # library assets get proxied directly to the library app    
+          # library assets get proxied directly to the library app
           proxy_pass http://library.rightscale.local:3001/$1.$2;
         }
-    
+
         location /library_images/
         {
           proxy_pass http://library.rightscale.local:3001/library_images/;
         }
-    
-    
+
+
         location /library_rest/
         {
           proxy_pass http://127.0.0.1:3001/;

data/lib/rconf/configurators/ruby_configurator.rb

@@ -30,7 +30,7 @@ module RightConf
     RVM_VERSION = '1.10.2'
 
     # RVM releases URL
-    RVM_RELEASES_URL = 'https://rvm.beginrescueend.com/releases'
+    RVM_RELEASES_URL = 'https://rvm.io/releases'
 
     # Let configurator run, it is idempotent
     #

data/lib/rconf/language.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -74,7 +74,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def method_missing(meth, *args, &blk)
-      if blk 
+      if blk
         klass = ConfiguratorRegistry[meth]
         if klass
           configurator = klass.new(@configurators.size)

data/lib/rconf/platform.rb

@@ -63,14 +63,14 @@ module RightConf
     #   Platform.dispatch(2) { :echo }
     #
     # will result in 'echo_linux(2)' being executed in self if running on linux,
-    # 'echo_windows(2)' if running on Windows and 'echo_darwin(2)' if on 
+    # 'echo_windows(2)' if running on Windows and 'echo_darwin(2)' if on
     # Mac OS X. Note that the method is run in the instance of the caller.
     #
     # === Parameters
     # args:: Pass-through arguments
     #
     # === Block
-    # Given block should not take any argument and return a symbol for the 
+    # Given block should not take any argument and return a symbol for the
     # method that should be called
     #
     # === Return
@@ -82,7 +82,7 @@ module RightConf
       target = dispatch_candidates(meth).detect do |candidate|
         binding.respond_to?(candidate)
       end
-      raise "No platform dispatch target found in #{binding.class} for " + 
+      raise "No platform dispatch target found in #{binding.class} for " +
             "'#{meth.inspect}', tried " + dispatch_candidates(meth).join(', ') unless target
       binding.__send__(target, *args)
     end

data/lib/rconf/platforms/darwin.rb

@@ -35,7 +35,6 @@ module RightConf
         7 => 'lion' }
     end
 
-
   end
 
 end

data/lib/rconf/platforms/linux.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/lib/rconf/platforms/windows.rb

@@ -1,5 +1,5 @@
 
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/lib/rconf/profile.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -56,7 +56,7 @@ module RightConf
 
     # Delete profile from disk
     #
-    # === Return 
+    # === Return
     # true:: Always return true
     def reset
       File.delete(profile_path) if File.file?(profile_path)
@@ -90,7 +90,7 @@ module RightConf
       res = @force_check || false
     end
 
-    # Bypass checks and always reconfigure 
+    # Bypass checks and always reconfigure
     #
     # === Return
     # true:: Always return true

data/lib/rconf/progress_reporter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -21,7 +21,7 @@ module RightConf
     # base(Object):: Object including this module
     def self.included(base)
       @@reporters ||= []
-      [ :report_section, :report, :report_check, :report_success, 
+      [ :report_section, :report, :report_check, :report_success,
         :report_failure, :report_error, :report_fatal, :report_result ].each do |meth|
         meta_def(meth) { |*args| @@reporters.each { |r| r.__send__(meth, *args) } }
       end

data/lib/rconf/progress_reporters/base_reporter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -25,7 +25,7 @@ module RightConf
   # - report_failure:: Report check failure
   # - report_result:: Report check success or failure depending on argument
   #
-  # Alternatively reporters can override any associated formatting method 
+  # Alternatively reporters can override any associated formatting method
   # (:format_message, :format_section, etc.) and/or the :write method used to
   # write the progress report.
   class BaseReporter

data/lib/rconf/progress_reporters/file_reporter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/lib/rconf/progress_reporters/stdout_reporter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/lib/rconf/ruby_extensions.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -46,9 +46,9 @@ class String
   def purple; colorize("\e[35m"); end
   def cyan; colorize("\e[36m"); end
   def white; colorize("\e[37m"); end
-  def colorize(color_code)  
+  def colorize(color_code)
     # Doesn't work with the Windows prompt...
-    (RightConf::Platform.windows? || !$stdout.isatty) ? to_s : "#{color_code}#{to_s}\e[0m" 
+    (RightConf::Platform.windows? || !$stdout.isatty) ? to_s : "#{color_code}#{to_s}\e[0m"
   end
 end
 

data/lib/rconf/support/brew_installer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -20,7 +20,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def self.check_and_install
-      installed = Command.execute('brew', '--version').success? 
+      installed = Command.execute('brew', '--version').success?
       return true if installed
       new.install
     end
@@ -66,7 +66,7 @@ module RightConf
         report("The following directories had their group set to staff: #{chgrps.join(', ')}")
       end
       unless ENV['PATH'].split(':').include? '/usr/local/bin'
-        report('/usr/local/bin is not in your PATH.') 
+        report('/usr/local/bin is not in your PATH.')
       end
     end
 

data/lib/rconf/support/environment_updater.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -54,7 +54,7 @@ module RightConf
       updated = false
       if bashrc_path
         content = IO.read(bashrc_path)
-        unless content.include?(code) 
+        unless content.include?(code)
           i = dependencies.inject(nil) do |m, d|
             index = content.index(/^\s*#{d}=/)
             m = if m.nil?

data/lib/rconf/support/package_installer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -27,7 +27,7 @@ module RightConf
     # === Block
     # If a block is given it will get called with no argument prior to the
     # packages being installed. If the block returns true then installation
-    # will proceed otherwise it won't. Use the block to check whether 
+    # will proceed otherwise it won't. Use the block to check whether
     # installation is required or whether the packages are already installed.
     # If no block is given then installation will always occur.
     #
@@ -58,8 +58,8 @@ module RightConf
     # === Return
     # true:: Always return true
     def install_linux_ubuntu(packages, opts)
-      return if packages.nil? 
-      args = packages.dup 
+      return if packages.nil?
+      args = packages.dup
       args << opts if opts
       Command.sudo('apt-get', 'install', '-y', *args)
     end
@@ -71,7 +71,7 @@ module RightConf
     # true:: Always return true
     def install_linux_centos(packages, opts)
       return if packages.nil?
-      args = packages.dup 
+      args = packages.dup
       args << opts if opts
       Command.sudo('yum', 'install', '-y', *args)
     end
@@ -92,7 +92,7 @@ module RightConf
         Command.sudo('brew', 'link', p) if installed
       end
     end
-    
+
     # Install Windows software
     #
     # === Return

data/lib/rconf/trollop.rb

@@ -12,7 +12,7 @@ VERSION = "1.16.2"
 ## Thrown by Parser in the event of a commandline error. Not needed if
 ## you're using the Trollop::options entry.
 class CommandlineError < StandardError; end
-  
+
 ## Thrown by Parser if the user passes in '-h' or '--help'. Handled
 ## automatically by Trollop#options.
 class HelpNeeded < StandardError; end
@@ -250,7 +250,7 @@ class Parser
     syms.each { |sym| raise ArgumentError, "unknown option '#{sym}'" unless @specs[sym] }
     @constraints << [:depends, syms]
   end
-  
+
   ## Marks two (or more!) options as conflicting.
   def conflicts *syms
     syms.each { |sym| raise ArgumentError, "unknown option '#{sym}'" unless @specs[sym] }
@@ -426,7 +426,7 @@ class Parser
           # call this unless the cursor's at the beginning of a line.
 
     left = {}
-    @specs.each do |name, spec| 
+    @specs.each do |name, spec|
       left[name] = "--#{spec[:long]}" +
         (spec[:short] && spec[:short] != :none ? ", -#{spec[:short]}" : "") +
         case spec[:type]
@@ -647,7 +647,7 @@ private
     start = 0
     ret = []
     until start > str.length
-      nextt = 
+      nextt =
         if start + width >= str.length
           str.length
         else

data/lib/rconf/version.rb

@@ -13,7 +13,7 @@ module RightConf
 
   MAJOR = 0
   MINOR = 9
-  BUILD = 18
+  BUILD = 19
 
   VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
 
@@ -23,7 +23,7 @@ the content of an application configuration file and installs and/or
 configures the required tools for running or developing the corresponding
 application. rconf can easily be extended to configure new tools and makes
 it easy to support multiple platforms.
-Consult the README.rdoc file for information on how to write rconf 
+Consult the README.rdoc file for information on how to write rconf
 configuration files.
   EOS
 

data/lib/rconf.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/rconf.rconf

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

data/spec/command_spec.rb

@@ -27,12 +27,12 @@ describe RightConf::Command do
   end
 
   it 'should report fatal errors when required to' do
-    flexmock(RightConf::Platform.instance).should_receive(:dispatch).with('test', nil, '42', 
+    flexmock(RightConf::Platform.instance).should_receive(:dispatch).with('test', nil, '42',
        Proc).once.and_return(failed_result)
     flexmock(RightConf::Command.instance).should_receive(:report_fatal).once.with("FAILED: 'test 42' returned\n1")
     RightConf::Command.execute('test', '42', :abort_on_failure => 'FAILED')
   end
-  
+
   it 'should setup environment variables' do
     ENV['THIS_IS_A_TEST_ENV_VALUE'].should be_nil
     res = RightConf::Command.execute('env', :env => { 'THIS_IS_A_TEST_ENV_VALUE' => '42' })
@@ -42,4 +42,3 @@ describe RightConf::Command do
 
 end
 
-

data/spec/configurator_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -37,7 +37,7 @@ describe RightConf::Configurator do
   before(:each) do
     @configurator = TestConfigurator.new(1)
   end
-    
+
   it 'should register configurators' do
     RightConf::ConfiguratorRegistry[:test].should == TestConfigurator
     RightConf::ConfiguratorRegistry[:another].should == AnotherConfigurator
@@ -88,5 +88,3 @@ describe RightConf::Configurator do
 
 end
 
-
-

data/spec/configurators/build_configurator_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/spec/configurators/bundler_configurator_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -33,7 +33,7 @@ describe RightConf::BundlerConfigurator do
 
   it 'should install bundler if needed' do
     should_execute_in_ruby('bundle', '--version').once.and_return(success_result('1'))
-    should_execute_in_ruby('bundle','_0_', 'install', 
+    should_execute_in_ruby('bundle','_0_', 'install',
                            {:abort_on_failure=>"Failed to install gems"}).once.and_return(success_result)
     should_execute_in_ruby('gem', 'uninstall', 'bundler', '-a', '-x').once.and_return(success_result)
     should_execute_in_ruby('gem', 'install', 'bundler', '-v', '0', '--no-ri', '--no-rdoc',
@@ -41,5 +41,4 @@ describe RightConf::BundlerConfigurator do
     @configurator.run_linux
   end
 
-  
 end

data/spec/configurators/git_repo_configurator_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -52,4 +52,3 @@ describe RightConf::GitRepoConfigurator do
 
 end
 
-

data/spec/configurators/packages_configurator_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -37,4 +37,4 @@ describe RightConf::PackagesConfigurator do
   end
 
 end
-  
+

data/spec/configurators/passenger_configurator_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/spec/configurators/ruby_configurator_spec.rb

@@ -36,7 +36,7 @@ describe RightConf::RubyConfigurator do
   it 'should install rvm if needed' do
     rvm_tar = "rvm-#{RVM_VERSION}.tar.gz"
     should_execute('rvm', '--version').once.and_return(success_result("rvm"))
-    should_execute('curl', '-O', '-f', "https://rvm.beginrescueend.com/releases/#{rvm_tar}",
+    should_execute('curl', '-O', '-f', "https://rvm.io/releases/#{rvm_tar}",
       {:abort_on_failure=>"Failed to download rvm #{RVM_VERSION}"}).once.and_return(success_result)
     should_execute('tar', 'zxf', rvm_tar,
       {:abort_on_failure=>"Failed to extract rvm tgz from #{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "rvm-#{RVM_VERSION}.tar.gz"))}"}).once.and_return(success_result)

data/spec/language_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -55,6 +55,5 @@ describe RightConf::Language do
       { :version => '3' }
   end
 
-
 end
 

data/spec/progress_reporters/base_reporter_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -82,3 +82,4 @@ describe RightConf::BaseReporter do
   end
 
 end
+

data/spec/progress_reporters/file_reporter_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -28,4 +28,3 @@ describe RightConf::FileReporter do
 
 end
 
-

data/spec/progress_reporters/stdout_reporter_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/spec/ruby_extensions_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -15,7 +15,7 @@ require "flexmock"
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'rconf')
 
-RSpec.configure do |c| 
+RSpec.configure do |c|
   c.mock_with(:flexmock)
 end
 
@@ -35,7 +35,7 @@ def create_configurator(code, opts={})
   end
   flexmock(configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
   flexmock(File).should_receive(:exist?).with(File.join(ENV['HOME'], '.rconf')).and_return(false)
-  flexmock(RightConf::EnvironmentUpdater).should_receive(:update) unless opts[:enable_updater] 
+  flexmock(RightConf::EnvironmentUpdater).should_receive(:update) unless opts[:enable_updater]
   configurator
 end
 

data/spec/support/package_installer_spec.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011 RightScale, Inc, All Rights Reserved Worldwide.
+# 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,
@@ -48,4 +48,4 @@ describe RightConf::PackageInstaller do
   end
 
 end
-  
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000Z
+date: 2012-06-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325338382960 !ruby/object:Gem::Requirement
+  requirement: &70217314208600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70325338382960
+  version_requirements: *70217314208600
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70325338382440 !ruby/object:Gem::Requirement
+  requirement: &70217314204080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,13 +32,22 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70325338382440
-description: ! "rconf configures the environment for a given application. rconf reads\nthe
-  content of an application configuration file and installs and/or\nconfigures the
-  required tools for running or developing the corresponding\napplication. rconf can
-  easily be extended to configure new tools and makes\nit easy to support multiple
-  platforms.\nConsult the README.rdoc file for information on how to write rconf \nconfiguration
-  files.\n"
+  version_requirements: *70217314204080
+description: ! 'rconf configures the environment for a given application. rconf reads
+
+  the content of an application configuration file and installs and/or
+
+  configures the required tools for running or developing the corresponding
+
+  application. rconf can easily be extended to configure new tools and makes
+
+  it easy to support multiple platforms.
+
+  Consult the README.rdoc file for information on how to write rconf
+
+  configuration files.
+
+'
 email:
 - raphael@rightscale.com
 executables:
@@ -121,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rconf
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration