rconf 0.6.11 → 0.6.13

data/bin/rconf

@@ -39,9 +39,9 @@ where [options] are:
         opt :verbose, 'Print debug output'
       end
       if opts[:config].nil? && !opts[:configurators]
-        opts[:config] = Dir['./*.rc']
+        opts[:config] = Dir["./*#{CONFIG_EXTENSION}"]
         if opts[:config].empty?
-          Trollop::die :config, "not used and could not find a '.rc' file in the working directory"
+          Trollop::die :config, "not used and could not find a '#{CONFIG_EXTENSION}' file in the working directory"
         else
           opts[:config] = opts[:config].first
         end
@@ -93,14 +93,21 @@ where [options] are:
       begin
         lang = Language.load(options[:config])
         report_fatal("Validation of configuration file failed:\n  -#{lang.validation_errors.join("\n  -").map(&:red)}") unless lang.validation_errors.empty?
+        aborted = false
         Dir.chdir(File.dirname(options[:config])) do
           lang.configurators.each do |c|
             c.run
-            break if c.aborting
+            break if aborted = c.aborting
             c.post_process
           end
         end
-        report("Successfully configured #{File.basename(options[:config], '.rc').blue} for #{Platform.family.to_s.blue}")
+        project  = File.basename(options[:config], CONFIG_EXTENSION).blue
+        platform = Platform.family.to_s.blue
+        if aborted
+          report("Configuration of #{project} stopped, please follow instructions above to proceed")
+        else
+          report("Successfully configured #{project} for #{platform}")
+        end
       rescue Exception => e
         raise if e.is_a?(SystemExit)
         report_fatal("Execution failed with exception '#{e.message.red}'\n#{e.backtrace.join("\n").grey}")

data/examples/{sample.rc → sample.rconf}

@@ -5,5 +5,5 @@ ruby do
   gemset           'my_project'
 end
 bundler do
-  bundler_version '1.0.7'
+  bundler_version '1.0.10'
 end

data/lib/rconf/configurators/passenger_configurator.rb

@@ -68,7 +68,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def set_defaults
-      right_site_src_path(Dir.getwd)
+      right_site_src_path(File.expand_path(Dir.getwd))
       library_src_path(File.expand_path(File.join(Dir.getwd, '..', 'library'))) if library_src_path.nil?
       gem_version(PASSENGER_GEM_VERSION) if gem_version.nil?
       install_path(default_install_path) if install_path.nil?
@@ -212,7 +212,7 @@ http {
         ssi on;
         listen 8080;
         server_name right-site.rightscale.local;
-        root /Users/raphael/src/right_site/public;
+        root #{File.join(right_site_src_path, 'public')};
         passenger_enabled on;
         rails_env development;
     

data/lib/rconf/configurators/ruby_configurator.rb

@@ -69,8 +69,6 @@ module RightConf
           report_check("Creating gemset #{gemset} for  #{version}")
           Command.execute('rvm', version, 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 
-          Command.execute('rvm', "#{version}@#{gemset}", 'exec', 'gem', 'install', 'rconf',
-                          :abort_on_failure => "Failed to install rconf gem in #{version}@#{gemset}")
           report_success
         end
         report_check("Switching to gemset #{gemset}")
@@ -146,8 +144,9 @@ module RightConf
     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?)
+      Command.execute('rvm', 'install', ruby, :abort_on_failure => 'Failed to install ruby')
+      Command.execute("rvm #{version}@#{gemset} exec -- gem install rconf")
+      report_success
       res.output
     end
 
@@ -204,7 +203,7 @@ module RightConf
         end
         Command.execute('rvm', "#{version}@#{gemset}", 'trust', 'rvmrc')
         report_success
-        post_note "Configuration required switching the active ruby\nPlease run " + 'cd ..;cd -'.blue + ' to activate it and re-run rconf'
+        post_note "Configuration required switching the active ruby\nPlease run " + 'cd ..;cd -'.blue + ' to activate it and finish configuration'.green
       rescue Exception => e
         report_failure
         report_error(e.message)

data/lib/rconf/profile.rb

@@ -13,6 +13,9 @@ require 'yaml'
 
 module RightConf
 
+  # rconf configuration file extension
+  CONFIG_EXTENSION = '.rconf'
+
   class Profile
 
     include Singleton
@@ -76,7 +79,7 @@ module RightConf
     # === Return
     # path(String):: Profile file path
     def profile_path
-      profile_path = ENV['RCONF_PROFILE'] || File.join(ENV['HOME'], '.rconf')
+      profile_path = ENV['RCONF_PROFILE'] || File.join(ENV['HOME'], CONFIG_EXTENSION)
     end
 
     # Persist profile to file

data/lib/rconf/version.rb

@@ -13,18 +13,18 @@ module RightConf
 
   MAJOR = 0
   MINOR = 6
-  BUILD = 11
+  BUILD = 13
 
   VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
 
   DESCRIPTION = <<-EOS
 rconf configures the environment for a given application. rconf reads
-the content of an application configuration file (.rc) and installs and/or
+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 (.rc).
+configuration files.
   EOS
 
 end

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.11
+  version: 0.6.13
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -08:00
+date: 2011-03-12 23:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,12 +37,12 @@ dependencies:
   version_requirements: *id002
 description: |
   rconf configures the environment for a given application. rconf reads
-  the content of an application configuration file (.rc) and installs and/or
+  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 (.rc).
+  configuration files.
 
 email: 
 - raphael@rightscale.com
@@ -57,7 +57,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/rconf
-- examples/sample.rc
+- examples/sample.rconf
 - lib/rconf.rb
 - lib/rconf/command.rb
 - lib/rconf/configurator.rb