rconf 0.7.8 → 0.7.9

data/bin/rconf

@@ -158,6 +158,7 @@ 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?
+        report_error(lang.warnings.join(', ').green) unless lang.warnings.empty?
         aborted = false
         Dir.chdir(File.dirname(options[:config])) do
           lang.configurators.each do |c|

data/lib/rconf/configurators/build_configurator.rb

@@ -32,7 +32,7 @@ module RightConf
     #
     # === Return
     # true:: Always return true
-    def run
+    def run_linux
       if only_if.nil? || instance_eval(only_if)
         message("Building #{path}") if message.nil?
         report_check message
@@ -51,6 +51,15 @@ module RightConf
       end
       true
     end
+    alias :run_darwin :run_linux
+
+    # Run command line on Windows
+    #
+    # === Return
+    # true:: Always return true
+    def run_windows
+      true # TBD
+    end
 
     protected
 

data/lib/rconf/configurators/cassandra_configurator.rb

@@ -33,7 +33,7 @@ module RightConf
     #
     # === Return
     # true:: Always return true
-    def run
+    def run_linux
       install_path(default_install_path) if install_path.nil?
       abort_on_failure(false) if abort_on_failure.nil?
       unless cassandra_installed
@@ -53,6 +53,7 @@ module RightConf
         report_success
       end
     end
+    alias :run_darwin :run_linux
 
     # Install Windows software
     #

data/lib/rconf/configurators/execute_configurator.rb

@@ -30,7 +30,7 @@ module RightConf
     #
     # === Return
     # true:: Always return true
-    def run
+    def run_linux
       report_check message if message
       args = command_line.split(' ')
       args += [ { :abort_on_failure => abort_on_failure } ] if abort_on_failure
@@ -38,6 +38,15 @@ module RightConf
       report_success if message
       true
     end
+    alias :run_darwin :run_linux
+
+    # Run command line on Windows
+    #
+    # === Return
+    # true:: Always return true
+    def run_windows
+      true # TBD
+    end
 
   end
 end

data/lib/rconf/configurators/git_repo_configurator.rb

@@ -29,7 +29,7 @@ module RightConf
     #
     # === Return
     # true:: Always return true
-    def run
+    def run_linux
       if File.exist?(path)
         unless File.exist?(File.join(path, '.git'))
           FileUtils.mv(path, "#{path}_old") 
@@ -52,6 +52,16 @@ module RightConf
       end
       true
     end
+    alias :run_darwin :run_linux
+
+    # Clone git repo and run build commands if given on Windows
+    #
+    # === Return
+    # true:: Always return true
+    def run_windows
+      true # TBD
+    end
+
 
   end
 end

data/lib/rconf/language.rb

@@ -20,6 +20,9 @@ module RightConf
     # Errors generated by configurators validations if any
     attr_reader :validation_errors
 
+    # Warnings
+    attr_reader :warnings
+
     # Load given file and run content to retrieve configurators
     #
     # === Parameters
@@ -56,6 +59,7 @@ module RightConf
     def initialize
       @configurators = Array.new
       @validation_errors = Array.new
+      @warnings = Array.new
     end
 
     # Each missing method should correspond to a configurator section.
@@ -79,7 +83,7 @@ module RightConf
           @validation_errors << error if error
           @configurators << configurator
         else
-          @validation_errors << "Unknown configurator '#{meth}'"
+          @warnings << "Unknown configurator '#{meth}'"
         end
       else
         @validation_errors << "Invalid syntax, expecting block after '#{meth}'"

data/lib/rconf/progress_reporter.rb

@@ -22,7 +22,7 @@ module RightConf
     def self.included(base)
       @@reporters ||= []
       [ :report_section, :report, :report_check, :report_success, 
-        :report_failure, :report_fatal, :report_result ].each do |meth|
+        :report_failure, :report_error, :report_fatal, :report_result ].each do |meth|
         meta_def(meth) { |*args| @@reporters.each { |r| r.__send__(meth, *args) } }
       end
     end

data/lib/rconf/version.rb

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

data/spec/configurators/build_configurator_spec.rb

@@ -14,12 +14,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe RightConf::BuildConfigurator do
 
   before(:each) do
-    lang = RightConf::Language.parse('build { path "../source" }')
-    @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_success].each do |meth|
-      flexmock(@configurator).should_receive(meth)
-    end
-    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
+    @configurator = create_configurator('build { path "../source" }')
   end
 
   it 'should build' do

data/spec/configurators/bundler_configurator_spec.rb

@@ -18,12 +18,7 @@ describe RightConf::BundlerConfigurator do
   end
 
   before(:each) do
-    lang = RightConf::Language.parse('bundler { version "0" }')
-    @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_success].each do |meth|
-      flexmock(@configurator).should_receive(meth)
-    end
-    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
+    @configurator = create_configurator('bundler { version "0" }')
     RightConf::Command.instance.instance_variable_set(:@rvm_prefix, 'r@g')
   end
 

data/spec/configurators/git_repo_configurator_spec.rb

@@ -14,33 +14,30 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe RightConf::GitRepoConfigurator do
 
   before(:each) do
-    lang = RightConf::Language.parse('git_repo { repo "git"; path "./git" }')
-    @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_success].each do |meth|
-      flexmock(@configurator).should_receive(meth)
-    end
-    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
+    @configurator = create_configurator('git_repo { repo "git"; path "./git" }')
     @abf = { :abort_on_failure => 'Failed to clone git into ./git' }
   end
 
   it 'should clone' do
+    flexmock(File).should_receive(:exist?).with('./git').and_return(false)
     should_execute('git', 'clone', 'git', './git', @abf).once
-    @configurator.run
+    @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') }
     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
-    @configurator.run
+    @configurator.run_linux
   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/.git').once.and_return(true)
     should_execute.and_return { raise 'Command.execute should not be called' }
-    @configurator.run
+    @configurator.run_linux
   end
 
   it 'should move directory if already exists but not a git repo' do
@@ -49,7 +46,7 @@ describe RightConf::GitRepoConfigurator do
     flexmock(File).should_receive(:exist?).with('./git').once.ordered.and_return(false)
     flexmock(FileUtils).should_receive(:mv).once
     should_execute('git', 'clone', 'git', './git', @abf).once
-    @configurator.run
+    @configurator.run_linux
   end
 
 end

data/spec/configurators/packages_configurator_spec.rb

@@ -18,12 +18,7 @@ describe RightConf::PackagesConfigurator do
   end
 
   before(:each) do
-    lang = RightConf::Language.parse('packages { debian %w(deb1 deb2); centos %w(cent1 cent2); darwin %w(mac1 mac2) }')
-    @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_success].each do |meth|
-      flexmock(@configurator).should_receive(meth)
-    end
-    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
+    @configurator = create_configurator('packages { debian %w(deb1 deb2); centos %w(cent1 cent2); darwin %w(mac1 mac2) }')
   end
 
   it 'should install packages on Ubuntu' do

data/spec/configurators/passenger_configurator_spec.rb

@@ -14,15 +14,20 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe RightConf::PassengerConfigurator do
 
   before(:each) do
-    lang = RightConf::Language.parse('passenger {}')
-    @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_success].each do |meth|
-      flexmock(@configurator).should_receive(meth)
-    end
-    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
+    @configurator = create_configurator('passenger {}')
+  end
+
+  it 'should default to /opt/nginx when possible' do
+    flexmock(File).should_receive(:exist?).with('/opt/nginx').once.and_return(true)
+    flexmock(File).should_receive(:exist?).with('/opt').once.and_return(true)
+    flexmock(File).should_receive(:writable?).with('/opt/nginx').once.and_return(true)
+    @configurator.__send__(:default_install_path).should == '/opt/nginx'
   end
 
   it 'should set defaults' do
+    flexmock(File).should_receive(:exist?).with('/opt/nginx').twice.and_return(true)
+    flexmock(File).should_receive(:exist?).with('/opt').twice.and_return(true)
+    flexmock(File).should_receive(:writable?).with('/opt/nginx').twice.and_return(true)
     @configurator.__send__(:set_defaults)
     @configurator.right_site_src_path.should == Dir.getwd
     @configurator.library_src_path.should == File.expand_path(File.join(Dir.getwd, '..', 'library'))
@@ -31,15 +36,5 @@ describe RightConf::PassengerConfigurator do
     @configurator.user.should == ENV['USER']
   end
 
-  it 'should default to /opt/nginx when possible' do
-    to_check = File.exist?('/opt/nginx') ? '/opt/nginx' :
-      (File.exist?('/opt') ? '/opt' : '/')
-    if File.writable?(to_check)
-      @configurator.__send__(:default_install_path).should == '/opt/nginx'
-    else
-      pending '/opt/nginx not writable'
-    end
-  end
-
 end
 

data/spec/configurators/ruby_configurator_spec.rb

@@ -20,12 +20,8 @@ describe RightConf::RubyConfigurator do
   end
 
   before(:each) do
-    lang = RightConf::Language.parse('ruby { version "0"; rubygems "1" }')
-    @configurator = lang.configurators.first
-    [:report_check, :report_result, :report_success, :report].each do |meth|
-      flexmock(@configurator).should_receive(meth)
-    end
-    flexmock(@configurator).should_receive(:report_fatal).and_return { |*args| raise args.join(' ') }
+    @configurator = create_configurator('ruby { version "0"; rubygems "1" }')
+    flexmock(File).should_receive(:exist?).with('.rvmrc').and_return(true)
   end
 
   it 'should succeed on linux when rvm succeeds' do
@@ -61,32 +57,35 @@ describe RightConf::RubyConfigurator do
       {:abort_on_failure=>'Failed to install rubygems'}).once.and_return(success_result)
     @configurator.run_linux
   end
+end
 
-  describe 'bashrc update' do
+describe 'bashrc update' do
 
-    before(:each) do
-      flexmock(File).should_receive(:exist?).once.with(File.join(ENV['HOME'], '.bashrc')).once.and_return(true)
-      flexmock(FileUtils).should_receive(:mv).and_return(true)
-      f = flexmock('f')
-      f.should_receive(:puts).and_return { |c| @bashrc_content = c }
-      flexmock(File).should_receive(:open).and_yield(f)
-      @rvm_bash_activation = @configurator.__send__(:rvm_bash_activation)
-    end
+  before(:each) do
+    flexmock(File).should_receive(:exist?).with(File.join(ENV['HOME'], '.bashrc')).once.and_return(true)
+    flexmock(File).should_receive(:exist?).with('.rvmrc').and_return(true)
+    flexmock(FileUtils).should_receive(:mv).and_return(true)
+    f = flexmock('f')
+    f.should_receive(:puts).and_return { |c| @bashrc_content = c }
+    flexmock(File).should_receive(:open).and_yield(f)
+    @configurator = create_configurator('ruby { version "0"; rubygems "1" }', :enable_updater => true)
+    @rvm_bash_activation = @configurator.__send__(:rvm_bash_activation)
+  end
 
-    it 'should install rvm hook in bashrc when not present' do
-      flexmock(IO).should_receive(:read).and_return('test')
-      @configurator.__send__(:setup_bashrc)
-      @bashrc_content.should == "#{@rvm_bash_activation}\ntest"
-    end
+  it 'should install rvm hook in bashrc when not present' do
+    flexmock(IO).should_receive(:read).and_return('test')
+    @configurator.__send__(:setup_bashrc)
+    @bashrc_content.should == "#{@rvm_bash_activation}\ntest"
+  end
 
-    it 'should not install rvm hook in bashrc when present' do
-      flexmock(IO).should_receive(:read).and_return('test' + @rvm_bash_activation)
-      @configurator.__send__(:setup_bashrc)
-      @bashrc_content.should be_nil
-    end
+  it 'should not install rvm hook in bashrc when present' do
+    flexmock(IO).should_receive(:read).and_return('test' + @rvm_bash_activation)
+    @configurator.__send__(:setup_bashrc)
+    @bashrc_content.should be_nil
+  end
 
-    it 'should install rvm hook after path is set' do
-      flexmock(IO).should_receive(:read).and_return(<<-EOS
+  it 'should install rvm hook after path is set' do
+    flexmock(IO).should_receive(:read).and_return(<<-EOS
 echo 'zobi la mouche'
 radio killed the radio star
 #PATH=something:should be fine
@@ -94,9 +93,9 @@ this should not:
 PATH=something
 AFTER
       EOS
-      )
-      @configurator.__send__(:setup_bashrc)
-      @bashrc_content.should == <<-EOS
+    )
+    @configurator.__send__(:setup_bashrc)
+    @bashrc_content.should == <<-EOS
 echo 'zobi la mouche'
 radio killed the radio star
 #PATH=something:should be fine
@@ -104,9 +103,7 @@ this should not:
 PATH=something
 #{@rvm_bash_activation}
 AFTER
-      EOS
-    end
-
+    EOS
   end
 
 end

data/spec/language_spec.rb

@@ -19,10 +19,10 @@ describe RightConf::Language do
     lang.validation_errors.first.should == "Invalid syntax, expecting block after 'toto'"
   end
 
-  it 'should invalidate non-existent configurator' do
+  it 'should warn about non-existent configurator' do
     lang = RightConf::Language.parse('toto { 42 }')
-    lang.validation_errors.size.should == 1
-    lang.validation_errors.first.should == "Unknown configurator 'toto'"
+    lang.warnings.size.should == 1
+    lang.warnings.first.should == "Unknown configurator 'toto'"
   end
 
   it 'should parse correctly' do

data/spec/spec_helper.rb

@@ -19,6 +19,26 @@ RSpec.configure do |c|
   c.mock_with(:flexmock)
 end
 
+# Create configurator for testing and setup common mocks
+#
+# === Parameters
+# code(String):: Code using rconf language syntax used to initialize configurator
+# opts[:enable_updater](TrueClass|FalseClass):: Don't mock out environment updater if set
+#
+# === Return
+# configurator(RightConf::Configurator):: Created configurator
+def create_configurator(code, opts={})
+  lang = RightConf::Language.parse(code)
+  configurator = lang.configurators.first
+  [:report_check, :report_error, :report_result, :report_success].each do |meth|
+    flexmock(configurator).should_receive(meth)
+  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] 
+  configurator
+end
+
 # Helper method to mock Command.execute
 #
 # === Parameters

metadata

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