rconf 0.5.1 → 0.5.3

data/.gitignore

@@ -0,0 +1,2 @@
+tags
+pkg/*

data/bin/rconf

@@ -20,7 +20,7 @@ module RightConf
 
     def self.run
       opts = Trollop::options do
-        version 'rconf 0.1 (c) 2011 RightScale'
+        version "rconf #{VERSION} (c) 2011 RightScale"
         banner <<-EOS
 #{DESCRIPTION}
 
@@ -33,6 +33,7 @@ where [options] are:
         opt :configurators, 'Show available configurators'
         opt :config, 'Set path to configuration file', :type => :string
         opt :output, 'Output file (output to STDOUT by default)', :type => :string
+        opt :verbose, 'Print debug output'
       end
       if opts[:config].nil?
         opts[:config] = Dir['./*.rc']
@@ -83,6 +84,7 @@ where [options] are:
       end
       ProgressReporter.report_to_stdout
       ProgressReporter.report_to_file(options[:output]) if options[:output]
+      Command.set_verbose if options[:verbose]
       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?
@@ -92,7 +94,7 @@ where [options] are:
         raise if e.is_a?(SystemExit)
         report_fatal("Execution failed with exception '#{e.message.red}'\n#{e.backtrace.join("\n").map(&:grey)}")
       ensure
-        lang.configurators.each { |c| report("!!NOTE: #{c.post_note}") if c.post_note }
+        lang.configurators.each { |c| report("\n!!NOTE: #{c.post_note}\n".green) if c.post_note }
       end
     end
 

data/lib/rconf/command.rb

@@ -33,6 +33,11 @@ module RightConf
         args = args[0..-2]
       end
       res = Platform.dispatch(command, *args) { :execute }
+      if @verbose
+        msg = (([command] + args).join(' ') + ' => ' +
+          res.status.to_s + ': ' + res.output).grey
+        report(msg)
+      end
       if !res.success? && msg = opts[:abort_on_failure]
         report_fatal("#{msg}: '#{command} #{args.join(' ')}' returned\n#{res.output}")
       end
@@ -77,6 +82,14 @@ module RightConf
       true
     end
 
+    # Enable debug output
+    #
+    # === Return
+    # true:: Always return true
+    def set_verbose
+      @verbose = true
+    end
+
   end
 
   # Command results

data/lib/rconf/configurators/bundler_configurator.rb

@@ -35,7 +35,7 @@ module RightConf
       res = Command.execute('bundle', '--version')
       success = (res.output =~ /#{bundler_version}/)
       report_result(success)
-      install_bundler(res.success?) unless success
+      install_bundler unless success
       report_check('Installing gems')
       res = Command.execute('bundle', 'install', :abort_on_failure => 'Failed to install gems')
       report_success
@@ -55,16 +55,14 @@ module RightConf
 
     # Install bundler from gem in cache
     #
-    # === Parameters
-    # exists(FalseClass|TrueClass):: Whether bundler is already installed
-    #                                (but is the wrong version)
-    #
     # === Return
     # true:: Always return true
     #
     # === Raise
     # (Exception):: If bundler gem cannot be found or installed
-    def install_bundler(exists)
+    def install_bundler
+      res = Command.execute('bundle', '--version')
+      exists = res.success? && res.output !~ /exec: bundle: not found/
       if exists
         report_check('Uninstalling existing versions of bundler')
         res = Command.execute('gem', 'uninstall', 'bundler', '-a', '-x', 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -56,19 +56,21 @@ module RightConf
           check_rvmrc
           Command.execute('rvm', ruby_version, 'exec', 'gem', 'install', 'rconf',
                           :abort_on_failure => "Failed to install rconf gem in #{ruby_version}")
-          post_note 'Configuration required switching the active ruby, please "cd" into the project directory again to activate it'
+          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}")
         end
       end
       if gemset
         report_check("Switching to gemset #{gemset}")
-        res = Command.execute('rvm', 'gemset', 'list')
+        res = Command.execute('rvm', ruby_version, 'gemset', 'list')
         unless res.output =~ /^#{gemset}$/
-          Command.execute('rvm', 'gemset', 'create',  gemset,
+          report_check("Creating gemset #{gemset} for  #{ruby_version}")
+          Command.execute('rvm', ruby_version, 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 
+          report_success
         end
-        Command.execute('rvm', 'gemset', 'use',  gemset,
+        Command.execute('rvm', ruby_version, 'gemset', 'use',  gemset,
                         :abort_on_failure => "Failed to switch to gemset '#{gemset}'") 
         report_success
       end
@@ -113,7 +115,7 @@ module RightConf
         end
         Dir.chdir(File.join(rvm_src, "rvm-#{version}")) do
           Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
-	  setup_bashrc
+	        setup_bashrc
         end
         report_success
       end
@@ -169,7 +171,7 @@ module RightConf
           content = rvm_bash_activation + "\n" + content
           FileUtils.mv(bashrc_path, bashrc_path + '.old')
           File.open(bashrc_path, 'w') { |f| f.puts content }
-          post_note 'rvm was installed, please reload your shell to activate it'
+          post_note 'rvm was installed, please reload your shell to activate it and re-run rconf'
         end
       else
         report_error("Failed to update bashrc to activate rvm, no bashrc found")

data/lib/rconf/progress_reporters/stdout_reporter.rb

@@ -28,6 +28,20 @@ module RightConf
       true
     end
 
+    # Format standard message
+    #
+    # === Parameters
+    # message(String):: Message
+    #
+    # === Return
+    # text(String):: Formatted text
+    def format_message(msg)
+      text = @in_check ? "\n" : ''
+      text += super(msg).green
+      @in_check = false
+      text
+    end
+
     # Format new progress report section
     #
     # === Parameters
@@ -36,6 +50,7 @@ module RightConf
     # === Return
     # text(String):: Formatted text
     def format_section(section)
+      @in_check = false
       text = super(section).green
     end
 
@@ -47,6 +62,7 @@ module RightConf
     # === Return
     # text(String):: Formatted text
     def format_check(check)
+      @in_check = true
       text = super(check)
     end
 
@@ -55,6 +71,7 @@ module RightConf
     # === Return
     # text(String):: Formatted text
     def format_success
+      @in_check = false
       text = super.blue
     end
 
@@ -63,6 +80,7 @@ module RightConf
     # === Return
     # text(String):: Formatted text
     def format_failure
+      @in_check = false
       text = super.red
     end
 

data/lib/rconf/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -08:00
+date: 2011-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - README.rdoc
 - Rakefile
 - bin/rconf