rconf 0.5.3 → 0.5.5

data/bin/rconf

@@ -10,6 +10,8 @@
 # License Agreement between RightScale.com, Inc. and
 # the licensee
 
+$stdout.sync = true
+
 require File.join(File.dirname(__FILE__), '..', 'lib', 'rconf')
 
 module RightConf

data/lib/rconf/configurators/bundler_configurator.rb

@@ -21,19 +21,19 @@ module RightConf
 
     description 'Installs bundler and runs "bundle install"'
 
-    settings :bundler_version  => 'Version of bundler gem, e.g. "1.0.10"',
-             :bundler_gem_path => 'Path to bundler gem, e.g. "vendor/system_gems/cache"' 
+    settings :version  => 'Version of bundler gem, e.g. "1.0.10"',
+             :gem_path => 'Path to bundler gem, e.g. "vendor/system_gems/cache"' 
              
-    validate_has_settings :bundler_version
+    validate_has_settings :version
 
     # Install bundler if needed and run bundle install
     #
     # === Return
     # true:: Always return true
     def run_linux
-      report_check("Checking for bundler #{bundler_version}")
+      report_check("Checking for bundler #{version}")
       res = Command.execute('bundle', '--version')
-      success = (res.output =~ /#{bundler_version}/)
+      success = (res.output =~ /#{version}/)
       report_result(success)
       install_bundler unless success
       report_check('Installing gems')
@@ -69,9 +69,9 @@ module RightConf
                               :abort_on_failure => 'Failed to uninstall bundler')
         report_success
       end
-      report_check("Installing bundler #{bundler_version}")
-      bundler_gem_path DEFAULT_GEM_PATH unless bundler_gem_path
-      bundler_file = File.join(bundler_gem_path, "bundler-#{bundler_version}.gem")
+      report_check("Installing bundler #{version}")
+      gem_path DEFAULT_GEM_PATH unless gem_path
+      bundler_file = File.join(gem_path, "bundler-#{version}.gem")
       report_fatal("Missing bundler gem at #{bundler_file}") unless File.exist?(bundler_file)
       res = Command.execute('gem','install',  bundler_file, '--no-ri', '--no-rdoc',
                            :abort_on_failure => 'Failed to install bundler')

data/lib/rconf/configurators/packages_configurator.rb

@@ -0,0 +1,70 @@
+# Copyright (C) 2011 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
+
+  class PackagesConfigurator
+
+    include Configurator
+
+    register :packages
+
+    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',
+             :mac     => 'Brew packages to be installed on Mac OS X (https://github.com/mxcl/homebrew)'
+
+    # Install debian packages
+    #
+    # === Return
+    # true:: Always return true
+    def run_linux_ubuntu
+      return if debian.nil?
+      report_check("Installing the following packages:\n#{debian.join(' ')}\nThis could take a while")
+      opts = debian << { :abort_on_failure => 'Failed to install packages' }
+      Command.execute('sudo', 'aptitude', 'install', *opts)
+      report_success
+    end
+    alias :run_linux_debian :run_linux_ubuntu
+
+    # Install yum packages
+    #
+    # === Return
+    # true:: Always return true
+    def run_linux_centos
+      return if centos.nil?
+      report_check("Installing the following packages:\n#{centos.join(' ')}\nThis could take a while")
+      opts = centos << { :abort_on_failure => 'Failed to install packages' }
+      Command.execute('sudo', 'yum', 'install', '-y', *opts)
+      report_success
+    end
+    alias :run_linux_redhat :run_linux_centos
+
+    # Install Windows software
+    #
+    # === Return
+    # true:: Always return true
+    def run_windows
+      # TBD
+    end
+
+    # Use brew on Mac OS X
+    #
+    # === Return
+    # true:: Always return true
+    def run_darwin
+      # TBD, check brew is installed then use
+    end
+
+  end
+end

data/lib/rconf/configurators/ruby_configurator.rb

@@ -23,11 +23,11 @@ module RightConf
     description "Installs ruby interpreter and rubygems.\n" +
                 'Installs and uses rvm on supported (i.e. non-Windows) platforms'
 
-    settings :ruby_version     => 'Ruby version using rvm notation (see "rvm list known")',
-             :rubygems_version => 'Rubygems version, e.g. "1.3.7"',
-             :gemset           => 'Gemset to be used for platforms supporting rvm'
+    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 :ruby_version, :rubygems_version
+    validate_has_settings :version, :rubygems
 
     # Switch to ruby version defined in settings
     # Use rvm and install it if needed
@@ -36,45 +36,49 @@ module RightConf
     # true:: Always return true
     def run_linux
       check_rvm(RVM_VERSION)
-      report_check("Checking whether #{ruby_version} is the active ruby")
+      report_check("Checking whether #{version} is the active ruby")
       out = Command.execute('rvm', 'list').output
-      if out =~ /^=> #{ruby_version.gsub('.', '\\.')}/
+      if out =~ /^=> #{version.gsub('.', '\\.')}/
         report_success
       else
         report_failure
-        report_check("Switching to #{ruby_version}")
-        out = Command.execute('rvm', 'use', ruby_version).output
+        report_check("Switching to #{version}")
+        out = Command.execute('rvm', 'use', version).output
         case out
         when /is not installed\./
           report_failure
           report_fatal "Failed to install #{ruby}: #{@out}" if @out
-          @out = install_ruby(ruby_version)
+          @out = install_ruby(version)
           run
           return true
         when /^Using /
           report_success
           check_rvmrc
-          Command.execute('rvm', ruby_version, 'exec', 'gem', 'install', 'rconf',
-                          :abort_on_failure => "Failed to install rconf gem in #{ruby_version}")
+          Command.execute('rvm', version, 'exec', 'gem', 'install', 'rconf',
+                          :abort_on_failure => "Failed to install rconf gem in #{version}")
           post_note "Configuration required switching the active ruby\nPlease 'cd' into the project directory again to activate it"
         else
-          report_fatal("Failed to use #{ruby_version}:\n#{out}")
+          report_fatal("Failed to use #{version}:\n#{out}")
         end
       end
       if gemset
-        report_check("Switching to gemset #{gemset}")
-        res = Command.execute('rvm', ruby_version, 'gemset', 'list')
-        unless res.output =~ /^#{gemset}$/
-          report_check("Creating gemset #{gemset} for  #{ruby_version}")
-          Command.execute('rvm', ruby_version, 'gemset', 'create',  gemset,
+        report_check("Checking whether gemset #{gemset} exists")
+        res = Command.execute('rvm', version, 'gemset', 'list')
+        if res.output =~ /^#{gemset}$/
+          report_success
+        else
+          report_fail
+          report_check("Creating gemset #{gemset} for  #{version}")
+          Command.execute('rvm', version, 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 
           report_success
         end
-        Command.execute('rvm', ruby_version, 'gemset', 'use',  gemset,
+        report_check("Switching to gemset #{gemset}")
+        Command.execute('rvm', version, 'gemset', 'use',  gemset,
                         :abort_on_failure => "Failed to switch to gemset '#{gemset}'") 
         report_success
       end
-      Command.set_prefix("rvm #{ruby_version}@#{gemset} exec --")
+      Command.set_prefix("rvm #{version}@#{gemset} exec --")
       true
     end
     alias :run_darwin :run_linux
@@ -130,12 +134,51 @@ module RightConf
     # === Return
     # out(String):: Installation output
     def install_ruby(ruby)
+      Platform.dispatch(ruby) { :install_ruby_prerequesites } 
       report_check("Installing #{ruby} (this will take a while, please be patient)")
       res = Command.execute('rvm', 'install', ruby)
       report_result(res.success?)
       res.output
     end
 
+    # Make sure to install all required linux packages first
+    #
+    # === Return 
+    # true:: Always return true
+    def install_ruby_prerequesites_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
+      Command.execute('sudo', 'aptitude', 'install', *packages) 
+      report_success
+    end
+
+    # Make sure to install all required CentOS / RedHhat packages first
+    # NOTE: For centos 5.4 final iconv-devel might not be available :(
+    #
+    # === Return
+    # true:: Always return true
+    def install_ruby_prerequesites_linux_centos(ruby)
+      report_check("Installing required packages, this could take a while")
+      packages = [] 
+      if ruby =~ /^ree-|^ruby-/
+        packages = %w(gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel openssl-devel iconv-devel)
+      end # TBD Define packages needed for other rubies
+      Command.execute('sudo', 'yum', 'install', '-y', *packages) 
+      report_success
+    end
+    alias :install_ruby_prerequesites_linux_redhat :install_ruby_prerequesites_linux_centos
+
+    # No pre-requesites to install ree or Matz ruby on Mac (TBD others)
+    #
+    # === Return
+    # true:: Always return true
+    def install_ruby_prerequesites_darwin(ruby)
+      true
+    end
+
     # Check .rvmrc and its content
     #
     # === Return
@@ -144,7 +187,7 @@ module RightConf
       report_check('Setting up .rvmrc')
       begin
         File.open('.rvmrc', 'w') do |f|
-          f.puts "rvm #{ruby_version}@#{gemset}"
+          f.puts "rvm #{version}@#{gemset}"
           f.puts "type -P rconf &>/dev/null && { rconf; }"
           f.puts "type -P rconf &>/dev/null || { echo 'rconf not installed, skipping (see .rvmrc)'; }"
         end

data/lib/rconf/progress_reporters/stdout_reporter.rb

@@ -37,7 +37,7 @@ module RightConf
     # text(String):: Formatted text
     def format_message(msg)
       text = @in_check ? "\n" : ''
-      text += super(msg).green
+      text += super(msg)
       @in_check = false
       text
     end

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -18,7 +18,7 @@ describe RightConf::BundlerConfigurator do
   end
 
   before(:each) do
-    lang = RightConf::Language.parse('bundler { bundler_version "0" }')
+    lang = RightConf::Language.parse('bundler { version "0" }')
     @configurator = lang.configurators.first
     [:report_check, :report_result, :report_fatal, :report_success].each do |meth|
       flexmock(@configurator).should_receive(meth)
@@ -34,7 +34,7 @@ describe RightConf::BundlerConfigurator do
   end
 
   it 'should install bunlder if needed' do
-    flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
+    flexmock(RightConf::Command.instance).should_receive(:execute).twice.with(
       'bundle', '--version').and_return(success_result('1'))
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       'bundle', 'install', {:abort_on_failure=>"Failed to install gems"}).and_return(success_result)

data/spec/configurators/packages_configurator_spec.rb

@@ -0,0 +1,43 @@
+# Copyright (C) 2011 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.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe RightConf::PackagesConfigurator do
+
+  def success_result(output=nil)
+    flexmock('res', :success? => true, :output => output)
+  end
+
+  before(:each) do
+    lang = RightConf::Language.parse('packages { debian %w(deb1 deb2); centos %w(cent1 cent2) }')
+    @configurator = lang.configurators.first
+    [:report_check, :report_result, :report_fatal, :report_success].each do |meth|
+      flexmock(@configurator).should_receive(meth)
+    end
+  end
+
+  it 'should install packages on Ubuntu' do
+    flexmock(RightConf::Command.instance).should_receive(:execute).with(
+      'sudo', 'aptitude', 'install', 'deb1', 'deb2', 
+      {:abort_on_failure=>"Failed to install packages"}).and_return(success_result)
+    @configurator.run_linux_ubuntu
+  end
+
+  it 'should install packages on Centos' do
+    flexmock(RightConf::Command.instance).should_receive(:execute).with(
+      'sudo', 'yum', 'install', '-y', 'cent1', 'cent2',
+      {:abort_on_failure=>"Failed to install packages"}).and_return(success_result)
+    @configurator.run_linux_centos
+  end
+
+end
+  

data/spec/configurators/ruby_configurator_spec.rb

@@ -18,7 +18,7 @@ describe RightConf::RubyConfigurator do
   end
 
   before(:each) do
-    lang = RightConf::Language.parse('ruby { ruby_version "0"; rubygems_version "1" }')
+    lang = RightConf::Language.parse('ruby { version "0"; rubygems "1" }')
     @configurator = lang.configurators.first
     [:report_check, :report_result, :report_fatal, :report_success, :report].each do |meth|
       flexmock(@configurator).should_receive(meth)
@@ -46,7 +46,8 @@ describe RightConf::RubyConfigurator do
       "http://rvm.beginrescueend.com/releases/#{rvm_tar}",
       {:abort_on_failure=>"Failed to download rvm #{RightConf::RubyConfigurator::RVM_VERSION}"}).and_return(success_result)
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'tar', 'zxf', rvm_tar).and_return(success_result)
+      'tar', 'zxf', rvm_tar, 
+      {:abort_on_failure=>"Failed to extract rvm tgz from /Users/raphael/src/right_env/rvm-1.2.6.tar.gz"}).and_return(success_result)
     flexmock(Dir).should_receive(:chdir).and_yield
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
       './install', {:abort_on_failure=>"Failed to install rvm #{RightConf::RubyConfigurator::RVM_VERSION}"}).and_return(success_result)

data/spec/language_spec.rb

@@ -26,22 +26,22 @@ describe RightConf::Language do
   end
 
   it 'should parse correctly' do
-    lang = RightConf::Language.parse('ruby { ruby_version "1"; rubygems_version "2" }')
+    lang = RightConf::Language.parse('ruby { version "1"; rubygems "2" }')
     lang.validation_errors.size.should == 0
     lang.configurators.size.should == 1
     lang.configurators.first.class.should == RightConf::RubyConfigurator
     lang.configurators.first.instance_variable_get(:@settings_values).should ==
-      { :ruby_version => '1', :rubygems_version => '2' }
+      { :version => '1', :rubygems => '2' }
   end
 
   it 'should parse multiple configurations' do
     lang = RightConf::Language.parse(<<-EOS
       ruby do
-        ruby_version "1"
-        rubygems_version "2" 
+        version "1"
+        rubygems "2" 
       end
       bundler do
-        bundler_version "3"
+        version "3"
       end
     EOS
     )
@@ -49,10 +49,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 ==
-      { :ruby_version => '1', :rubygems_version => '2' }
+      { :version => '1', :rubygems => '2' }
     lang.configurators[1].class.should == RightConf::BundlerConfigurator
     lang.configurators[1].instance_variable_get(:@settings_values).should ==
-      { :bundler_version => '3' }
+      { :version => '3' }
   end
 
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rconf
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.3
+  hash: 1
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 -08:00
+date: 2011-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -32,6 +41,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id002
@@ -63,6 +76,7 @@ files:
 - lib/rconf/configurator.rb
 - lib/rconf/configurator_registry.rb
 - lib/rconf/configurators/bundler_configurator.rb
+- lib/rconf/configurators/packages_configurator.rb
 - lib/rconf/configurators/ruby_configurator.rb
 - lib/rconf/language.rb
 - lib/rconf/platform.rb
@@ -80,6 +94,7 @@ files:
 - spec/command_spec.rb
 - spec/configurator_spec.rb
 - spec/configurators/bundler_configurator_spec.rb
+- spec/configurators/packages_configurator_spec.rb
 - spec/configurators/ruby_configurator_spec.rb
 - spec/language_spec.rb
 - spec/platform_spec.rb
@@ -102,17 +117,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration
@@ -120,6 +141,7 @@ test_files:
 - spec/command_spec.rb
 - spec/configurator_spec.rb
 - spec/configurators/bundler_configurator_spec.rb
+- spec/configurators/packages_configurator_spec.rb
 - spec/configurators/ruby_configurator_spec.rb
 - spec/language_spec.rb
 - spec/platform_spec.rb