rconf 0.8.3 → 0.8.4

data/bin/rconf

@@ -37,8 +37,9 @@ where [options] are:
         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 :force, 'Run rconf even if configuration file has not changed'
-        opt :verbose, 'Print debug output'
+        opt :reconfigure, 'Bypass all checks and force configuration'
+        opt :force,  'Run rconf even if configuration file has not changed'
+        opt :verbose,'Print debug output'
       end
       if opts[:config].nil? && !opts[:configurators] && !opts[:update] && !opts[:remove]
         opts[:config] = Dir["./*#{CONFIG_EXTENSION}"]
@@ -183,7 +184,8 @@ where [options] are:
     # === Return
     # true:: Always return true
     def configure(options)
-      Profile.force if options[:force]
+      Profile.force_check if options[:force]
+      Profile.force_reconfigure if options[:reconfigure]
       ProgressReporter.report_to_stdout
       ProgressReporter.report_to_file(options[:output]) if options[:output]
       begin
@@ -207,7 +209,7 @@ where [options] are:
         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}")
+        report_fatal("Execution failed with exception '#{e.message.red}'\n#{e.backtrace.join("\n")}")
       ensure
         lang.configurators.each { |c| report("\n!!NOTE: #{c.post_note}\n".green) if c.post_note }
       end

data/lib/rconf/command.rb

@@ -37,8 +37,8 @@ module RightConf
       end
       res = Platform.dispatch(command, *args) { :execute }
       if @verbose
-        msg = (([command] + args).compact.join(' ') + ' => ' +
-          res.status.to_s + ': ' + res.output).grey
+        msg = ([command] + args).compact.join(' ') + ' => ' +
+          res.status.to_s + ': ' + res.output
         report(msg)
       end
       if !res.success? && msg = opts[:abort_on_failure]

data/lib/rconf/configurator.rb

@@ -111,6 +111,15 @@ module RightConf
       error
     end
 
+    # Check system to determine whether configurator needs to run
+    #
+    # === Return
+    # true:: If configurator needs to run
+    # false:: Otherwise
+    def check
+      Platform.dispatch { :check }
+    end
+
     # Run configurator for current platform
     #
     # === Parameters
@@ -119,15 +128,14 @@ module RightConf
     # === Return
     # true:: Always return true
     def run(*args)
-      key = "#{self.class.key}-#{@index}"
-      sha = Profile.configurator_signature(key)
-      sig = signature
-      if sha != sig
-        if only_if.nil? || instance_eval(only_if) || Profile.force?
+        key = "#{self.class.key}-#{@index}"
+        sha = Profile.configurator_signature(key)
+        sig = signature
+        if Profile.force_reconfigure? || 
+            (Profile.force_check? || sha != sig && (only_if.nil? || instance_eval(only_if))) && !check
           Platform.dispatch(*args) { :run }
           Profile.set_configurator_signature(key, sig)
         end
-      end
       true
     end
 

data/lib/rconf/configurators/build_configurator.rb

@@ -29,6 +29,16 @@ module RightConf
 
     validate_has_settings :path
 
+    # No way to check, return false
+    #
+    # === Return
+    # false:: Always return false
+    def check_linux
+      false
+    end
+    alias :check_darwin :check_linux
+    alias :check_windows :check_linux
+
     # Run command line
     #
     # === Return

data/lib/rconf/configurators/bundler_configurator.rb

@@ -28,25 +28,41 @@ module RightConf
              
     validate_has_settings :version
 
-    # Install bundler if needed and run bundle install
+    # Check whether bundler is already installed
     #
     # === Return
-    # true:: Always return true
-    def run_linux
+    # true:: If bundler is already installed
+    # false:: Otherwise
+    def check_linux
       report_check("Checking for bundler #{version}")
       res = Command.execute_in_ruby('bundle', '--version')
       success = (res.output =~ /#{version}/)
       report_result(success)
-      unless success
-        install_bundler 
-        report_check('Installing gems')
-        options = [ "_#{version}_", 'install' ]
-        options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
-        options += [ '--path', bundle_path ] unless bundle_path.nil?
-        options << { :abort_on_failure => 'Failed to install gems' }
-        res = Command.execute_in_ruby('bundle', *options)
-        report_success
-      end
+      success
+    end
+    alias :check_darwin :check_linux
+
+    # Not implemented on windows
+    #
+    # === Raise
+    # (Exception):: Always raise
+    def check_windows
+      raise "Bundler is not supported on Windows!"
+    end
+
+    # Install bundler if needed and run bundle install
+    #
+    # === Return
+    # true:: Always return true
+    def run_linux
+      install_bundler 
+      report_check('Installing gems')
+      options = [ "_#{version}_", 'install' ]
+      options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
+      options += [ '--path', bundle_path ] unless bundle_path.nil?
+      options << { :abort_on_failure => 'Failed to install gems' }
+      res = Command.execute_in_ruby('bundle', *options)
+      report_success
       true
     end
     alias :run_darwin :run_linux
@@ -71,7 +87,7 @@ module RightConf
     def install_bundler
       res = Command.execute_in_ruby('bundle', '--version')
       exists = res.success? && res.output !~ /exec: bundle: not found/
-      if exists
+      if exists && res.output !~ /#{version}/
         report_check('Uninstalling existing versions of bundler')
         Command.execute_in_ruby('gem', 'uninstall', 'bundler', '-a', '-x')
         report_success

data/lib/rconf/configurators/cassandra_configurator.rb

@@ -29,6 +29,27 @@ module RightConf
 
     validate_has_settings :version
     
+    # Check whether Cassandra is installed
+    #
+    # === Return
+    # true:: If Cassandra is installed
+    # false:: Otherwise
+    def check_linux
+      report_check('Checking for Cassandra')
+      installed = Command.execute('cassandra', '-h').success? 
+      report_result(installed)
+      installed
+    end
+    alias :check_darwin :check_linux
+
+    # Check on windows
+    #
+    # === Return
+    # true:: Always return true
+    def check_windows
+      true
+    end
+
     # Install Linux Mercurial package
     #
     # === Return
@@ -36,26 +57,24 @@ module RightConf
     def run_linux
       install_path(default_install_path) if install_path.nil?
       abort_on_failure(true) if abort_on_failure.nil?
-      unless cassandra_installed
-        report_check('Installing Cassandra')
-        url = SOURCE_BASE_URL.gsub('VERSION', version)
-        if File.exist?(install_path)
-          FileUtils.rm_rf("#{install_path}_old")
-          FileUtils.mv(install_path, "#{install_path}_old")
-          post_note "Had to move #{install_path} to #{install_path}_old"
-        end
-        FileUtils.mkdir_p(install_path)
-        Dir.chdir(install_path) do
-          Command.execute('curl', '-O', '-f', url, abort_option('Failed to download Cassandra')) unless File.exist?(File.join(install_path, File.basename(url)))
-          Command.execute('tar', 'xvzf', File.basename(url), abort_option('Failed to untar Cassandra'))
-        end
-        bin_path = File.join(install_path, "apache-cassandra-#{version}", 'bin')
-        if EnvironmentUpdater.update("PATH=$PATH:#{bin_path}", ['PATH'])
-          post_note 'Cassandra was installed, please reload your shell to activate it and re-run rconf'
-          aborting(true)
-        end
-        report_success
+      report_check('Installing Cassandra')
+      url = SOURCE_BASE_URL.gsub('VERSION', version)
+      if File.exist?(install_path)
+        FileUtils.rm_rf("#{install_path}_old")
+        FileUtils.mv(install_path, "#{install_path}_old")
+        post_note "Had to move #{install_path} to #{install_path}_old"
+      end
+      FileUtils.mkdir_p(install_path)
+      Dir.chdir(install_path) do
+        Command.execute('curl', '-O', '-f', url, abort_option('Failed to download Cassandra')) unless File.exist?(File.join(install_path, File.basename(url)))
+        Command.execute('tar', 'xvzf', File.basename(url), abort_option('Failed to untar Cassandra'))
       end
+      bin_path = File.join(install_path, "apache-cassandra-#{version}", 'bin')
+      if EnvironmentUpdater.update("PATH=$PATH:#{bin_path}", ['PATH'])
+        post_note 'Cassandra was installed, please reload your shell to activate it and re-run rconf'
+        aborting(true)
+      end
+      report_success
     end
     alias :run_darwin :run_linux
 
@@ -69,18 +88,6 @@ module RightConf
 
     protected
 
-    # Check whether Cassandra is installed
-    #
-    # === Return
-    # true:: If Mercurial is installed
-    # false:: Otherwise
-    def cassandra_installed
-      report_check("Checking for Cassandra")
-      installed = Command.execute('cassandra', '-h').success? 
-      report_result(installed)
-      installed
-    end
-
     # Retrieve default install path
     # Try /opt/cassandra and revert to ~/cassandra if not writable
     #

data/lib/rconf/configurators/execute_configurator.rb

@@ -26,6 +26,16 @@ module RightConf
 
     validate_has_settings :command_line
 
+    # No way to check, return false
+    #
+    # === Return
+    # false:: Always return false
+    def check_linux
+      false
+    end
+    alias :check_darwin :check_linux
+    alias :check_windows :check_linux
+
     # Run command line
     #
     # === Return

data/lib/rconf/configurators/git_repo_configurator.rb

@@ -24,6 +24,17 @@ module RightConf
              :tag  => 'git tag or branch or sha that should be checked out ("master" by default)'
 
     validate_has_settings :repo, :path
+
+    # Check whether repo was already cloned
+    #
+    # === Return
+    # true:: If repo was already cloned
+    # false:: Otherwise
+    def check_linux
+      File.exist?(path) && File.exist?(File.join(path, '.git'))
+    end
+    alias :check_darwin :check_linux
+    alias :check_windows :check_linux
     
     # Clone git repo and run build commands if given
     #
@@ -31,24 +42,20 @@ module RightConf
     # true:: Always return true
     def run_linux
       if File.exist?(path)
-        unless File.exist?(File.join(path, '.git'))
-          FileUtils.mv(path, "#{path}_old") 
-          post_note "Had to move #{path} to #{path}_old"
-        end
+        FileUtils.mv(path, "#{path}_old") 
+        post_note "Had to move #{path} to #{path}_old"
       end
-      unless File.exist?(path)
-        report_check("Cloning #{repo} into #{path}")
-        Command.execute('git', 'clone', repo, path, 
-                        :abort_on_failure => "Failed to clone #{repo} into #{path}")
-        report_success
-        if tag
-          report_check("Checking out #{tag}")
-          Dir.chdir(path) do
-            Command.execute('git', 'checkout', tag,
-                            :abort_on_failure => "Failed to checkout #{tag}")
-          end
-          report_success
+      report_check("Cloning #{repo} into #{path}")
+      Command.execute('git', 'clone', repo, path, 
+                      :abort_on_failure => "Failed to clone #{repo} into #{path}")
+      report_success
+      if tag
+        report_check("Checking out #{tag}")
+        Dir.chdir(path) do
+          Command.execute('git', 'checkout', tag,
+                          :abort_on_failure => "Failed to checkout #{tag}")
         end
+        report_success
       end
       true
     end

data/lib/rconf/configurators/mercurial_configurator.rb

@@ -24,6 +24,20 @@ module RightConf
 
     settings :abort_on_failure => 'Whether to abort if Mercurial failed to install (false by default)'
 
+    # Check whether Mercurial is installed
+    #
+    # === Return
+    # true:: If Mercurial is installed
+    # false:: Otherwise
+    def check_linux
+      report_check("Checking for Mercurial")
+      installed = Command.execute('hg', '--version').success? 
+      report_result(installed)
+      installed
+    end
+    alias :check_darwin :check_linux
+    alias :check_windows :check_linux
+
     # Install Linux Mercurial package
     #
     # === Return
@@ -72,18 +86,6 @@ module RightConf
 
     protected
 
-    # Check whether Mercurial is installed
-    #
-    # === Return
-    # true:: If Mercurial is installed
-    # false:: Otherwise
-    def mercurial_installed
-      report_check("Checking for Mercurial")
-      installed = Command.execute('hg', '--version').success? 
-      report_result(installed)
-      installed
-    end
-
     # Produce abort on failure option
     #
     # === Parameters

data/lib/rconf/configurators/packages_configurator.rb

@@ -25,6 +25,16 @@ module RightConf
              :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)'
 
+    # Let package manager check for idempotency, return false
+    #
+    # === Return
+    # false:: Always return false
+    def check_linux
+      false
+    end
+    alias :check_darwin :check_linux
+    alias :check_windows :check_linux
+
     # Install packages on debian based oses
     #
     # === Return

data/lib/rconf/configurators/passenger_configurator.rb

@@ -15,7 +15,7 @@ module RightConf
 
   class PassengerConfigurator
 
-    PASSENGER_GEM_VERSION = '2.2.15'
+    PASSENGER_GEM_VERSION = '3.0.2'
 
     DEFAULT_NGINX_INSTALL = ['/opt/nginx', File.join(ENV['HOME'], 'nginx')]
 
@@ -33,22 +33,44 @@ module RightConf
              :install_path => 'Path to nginx installation directory, uses /opt/nginx if it ' +
                               'is writable by the current user or ~/nginx otherwise by default'
      
-    # Install passenger gem in given ruby then run nginx install script
+    # Check that passenger gem is installed and that passenger+nginx is installed
     #
     # === Return
-    # true:: Always return true
-    def run_linux
+    # true:: If both are installed
+    # false:: Otherwise
+    def check_linux
       set_defaults
       report_check("Checking for passenger gem #{gem_version}")
       res = Command.execute_in_ruby('gem', 'list', 'passenger')
       success = (res.output =~ /^passenger \(#{gem_version}\)$/)
       report_result(success)
-      install_gem unless success
-      report_check('Checking for passenger+nginx')
-      res = Command.execute('which', 'nginx').success?
-      res = File.exists?(File.join(install_path, 'sbin', 'nginx')) unless res
-      report_result(res)
-      install_passenger unless res
+      if success
+        report_check('Checking for passenger+nginx')
+        res = Command.execute('which', 'nginx').success?
+        res = File.exists?(File.join(install_path, 'sbin', 'nginx')) unless res
+        report_result(res)
+        success = res
+      end
+      success
+    end
+    alias :check_darwin :check_linux
+
+    # Not implemented on Windows
+    #
+    # === Raise
+    # (Exception):: Always raise
+    def check_windows
+      raise "Passenger is not supported on Windows!"
+    end
+
+    # Install passenger gem in given ruby then run nginx install script
+    #
+    # === Return
+    # true:: Always return true
+    def run_linux
+      set_defaults
+      install_gem
+      install_passenger
       true
     end
     alias :run_darwin :run_linux
@@ -175,7 +197,7 @@ module RightConf
     # config(String):: Nginx config
     def nginx_config
       ruby_bin = Command.execute_in_ruby('which', 'ruby').output.chomp
-      res = Command.execute_in_ruby('ruby', '-e', "require 'rubygems';puts Gem.source_index.find_name('passenger').detect { |g| g.version.to_s == '#{PASSENGER_GEM_VERSION}' }.full_gem_path",
+      res = Command.execute_in_ruby('ruby', '-e', "require 'rubygems';puts Gem.source_index.find_name('passenger').detect { |g| g.version.to_s == '#{gem_version}' }.full_gem_path",
                             :abort_on_failure => 'Could not find passenger gem to build passenger_root')
       passenger_root = res.output.chomp
       report_fatal('Could not find passenger gem') if passenger_root.empty?

data/lib/rconf/configurators/ruby_configurator.rb

@@ -32,6 +32,16 @@ module RightConf
 
     validate_has_settings :version, :rubygems
 
+    # Let configurator run, it is idempotent
+    #
+    # === Return
+    # false:: Always return false
+    def check_linux
+      false
+    end
+    alias :check_darwin :check_linux
+    alias :check_windows :check_linux
+
     # Switch to ruby version defined in settings
     # Use rvm and install it if needed
     #

data/lib/rconf/profile.rb

@@ -76,8 +76,8 @@ module RightConf
     #
     # === Return
     # true:: Always return true
-    def force
-      @force = true
+    def force_check
+      @force_check = true
       reset
     end
 
@@ -86,8 +86,26 @@ module RightConf
     # === Return
     # true:: If re-configuration should be forced
     # false:: Otherwise
-    def force?
-      res = @force || false
+    def force_check?
+      res = @force_check || false
+    end
+
+    # Bypass checks and always reconfigure 
+    #
+    # === Return
+    # true:: Always return true
+    def force_reconfigure
+      @force_reconfigure = true
+      reset
+    end
+
+    # Should next configuration bypass checks?
+    #
+    # === Return
+    # true:: If re-configuration should bypass checks
+    # false:: Otherwise
+    def force_reconfigure?
+      res = @force_reconfigure || false
     end
 
     protected

data/lib/rconf/ruby_extensions.rb

@@ -38,15 +38,14 @@ end
 # e.g.: puts "Hello".red
 class String
   def bold; colorize("\e[1m\e[29m"); end
-  def grey; colorize("\e[30m"); end
-  def red; colorize("\e[1m\e[31m"); end
-  def dark_red; colorize("\e[31m"); end
-  def green; colorize("\e[1m\e[32m"); end
-  def dark_green; colorize("\e[32m"); end
-  def yellow; colorize("\e[1m\e[33m"); end
-  def blue; colorize("\e[1m\e[34m"); end
-  def dark_blue; colorize("\e[34m"); end
-  def pur; colorize("\e[1m\e[35m"); end
+  def black; colorize("\e[30m"); end
+  def red; colorize("\e[31m"); end
+  def green; colorize("\e[32m"); end
+  def yellow; colorize("\e[33m"); end
+  def blue; colorize("\e[34m"); end
+  def purple; colorize("\e[35m"); end
+  def cyan; colorize("\e[36m"); end
+  def white; colorize("\e[37m"); end
   def colorize(color_code)  
     # Doesn't work with the Windows prompt...
     (RightConf::Platform.windows? || !$stdout.isatty) ? to_s : "#{color_code}#{to_s}\e[0m" 

data/lib/rconf/version.rb

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

data/spec/configurator_spec.rb

@@ -21,6 +21,9 @@ describe RightConf::Configurator do
     def test_setter(value)
       @custom_setting = value
     end
+    def check_darwin; end
+    alias :check_linux :check_darwin
+    alias :check_windows :check_darwin
     def run_darwin; end
     alias :run_linux :run_darwin
     alias :run_windows :run_darwin
@@ -55,6 +58,12 @@ describe RightConf::Configurator do
     @configurator.custom_setting.should == 43
   end
 
+  it 'should check' do
+    flexmock(@configurator).should_receive(:check).and_return(true).once
+    flexmock(RightConf::Platform.instance).should_receive(:dispatch).never
+    @configurator.run
+  end
+
   it 'should validate' do
     @configurator.validate.should =~ /^Required setting.*missing for configuration/
     @configurator.instance_eval { required 42 }

data/spec/configurators/bundler_configurator_spec.rb

@@ -28,11 +28,11 @@ describe RightConf::BundlerConfigurator do
 
   it 'should succeed when bundler succeeds' do
     should_execute_in_ruby('bundle', '--version').once.and_return(success_result('0'))
-    @configurator.run_linux
+    @configurator.check_linux.should be_true
   end
 
-  it 'should install bunlder if needed' do
-    should_execute_in_ruby('bundle', '--version').twice.and_return(success_result('1'))
+  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', 
                            {: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)

data/spec/configurators/git_repo_configurator_spec.rb

@@ -19,14 +19,15 @@ describe RightConf::GitRepoConfigurator do
   end
 
   it 'should clone' do
-    flexmock(File).should_receive(:exist?).with('./git').and_return(false)
+    flexmock(File).should_receive(:exist?).with('./git').twice.and_return(false)
     should_execute('git', 'clone', 'git', './git', @abf).once
+    @configurator.check
     @configurator.run_linux
   end
 
   it 'should checkout the right tag' do
-    flexmock(File).should_receive(:exist?).with('./git').and_return(false)
     @configurator.instance_eval { tag('tag') }
+    flexmock(File).should_receive(:exist?).with('./git').once.and_return(false)
     should_execute('git', 'clone', 'git', './git', @abf).once
     flexmock(Dir).should_receive(:chdir).with('./git', Proc).and_yield
     should_execute('git', 'checkout', 'tag', {:abort_on_failure=>"Failed to checkout tag"}).once
@@ -34,18 +35,18 @@ describe RightConf::GitRepoConfigurator do
   end
 
   it 'should skip checkout if directory already exists and contains a .git subdirectory' do
-    flexmock(File).should_receive(:exist?).with('./git').twice.and_return(true)
+    flexmock(File).should_receive(:exist?).with('./git').once.and_return(true)
     flexmock(File).should_receive(:exist?).with('./git/.git').once.and_return(true)
-    should_execute.and_return { raise 'Command.execute should not be called' }
-    @configurator.run_linux
+    @configurator.check.should be_true
   end
 
   it 'should move directory if already exists but not a git repo' do
     flexmock(File).should_receive(:exist?).with('./git').once.ordered.and_return(true)
     flexmock(File).should_receive(:exist?).with('./git/.git').once.ordered.and_return(false)
-    flexmock(File).should_receive(:exist?).with('./git').once.ordered.and_return(false)
+    flexmock(File).should_receive(:exist?).with('./git').once.ordered.and_return(true)
     flexmock(FileUtils).should_receive(:mv).once
     should_execute('git', 'clone', 'git', './git', @abf).once
+    @configurator.check
     @configurator.run_linux
   end
 

data/spec/profile_spec.rb

@@ -18,10 +18,16 @@ describe RightConf::Profile do
     RightConf::Profile.set_configurator_signature(:test, '42')
   end
 
+  it 'should reset when forcing checks' do
+    flexmock(RightConf::Profile.instance).should_receive(:reset).once
+    RightConf::Profile.force_check
+    RightConf::Profile.force_check?.should be_true
+  end
+
   it 'should reset when forcing re-configuration' do
     flexmock(RightConf::Profile.instance).should_receive(:reset).once
-    RightConf::Profile.force
-    RightConf::Profile.force?.should be_true
+    RightConf::Profile.force_reconfigure
+    RightConf::Profile.force_reconfigure?.should be_true
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Raphael Simon