Merge pull request #158 from dylanratcliffe/create_force_param

Added new force param

features/run.feature

@@ -1,3 +1,4 @@
+@run
 Feature: Run rspec and acceptance test suits
   Onceover should allow to run rspec and acceptance test for all profvile and role classes
   or for any part of them. Use should set if he wants to see only summary of tests or full
@@ -26,3 +27,17 @@ Feature: Run rspec and acceptance test suits
     Given initialized control repo "control_branch"
     When I run onceover command "run spec"
     Then the temporary Puppetfile should contain the git branch
+
+  Scenario: Run with local modifications
+    Given initialized control repo "basic"
+    When I run onceover command "run spec"
+    And I make local modifications
+    And I run onceover command "run spec"
+    Then I should see message pattern "local modifications"
+
+  Scenario: Force overwrite local modifications
+    Given initialized control repo "basic"
+    When I run onceover command "run spec"
+    And I make local modifications
+    And I run onceover command "run spec --force"
+    Then I should see message pattern "Overwriting local modifications"

features/step_definitions/common.rb

@@ -53,7 +53,7 @@
 
 Then(/^I should see message pattern "([^"]*)"$/) do |err_msg_regexp|
   expect(@cmd.success?).to be true
-  puts @cmd.output unless @cmd.success?
+  puts @cmd.output unless @cmd.output =~ Regexp.new(err_msg_regexp)
   expect(@cmd.output).to match(err_msg_regexp)
   puts @cmd.output.match(err_msg_regexp).to_s
 end

features/step_definitions/run.rb

@@ -7,3 +7,7 @@
   git_branch = `git rev-parse --abbrev-ref HEAD`.chomp
   step %Q(the temporary Puppetfile should contain /#{git_branch}/)
 end
+
+When(/^I make local modifications$/) do
+  FileUtils.rm_rf("#{@repo.onceover_temp_root_folder}/modules/apache/manifests")
+end

lib/onceover/cli/run.rb

@@ -22,6 +22,7 @@ def self.command
           optional :c,  :classes,          'A list of classes. Only tests with these classes will be run'
           optional :n,  :nodes,            'A list of nodes. Only tests with these nodes will be run'
           optional :s,  :skip_r10k,        'Skip the r10k step'
+          optional :f,  :force,            'Passes --force to r10k, overwriting modules'
           optional :sv, :strict_variables, 'Run with strict_variables set to yes'
 
           run do |opts, args, cmd|

lib/onceover/testconfig.rb

@@ -26,6 +26,7 @@ class TestConfig
     attr_accessor :before_conditions
     attr_accessor :after_conditions
     attr_accessor :skip_r10k
+    attr_accessor :force
     attr_accessor :strict_variables
 
     def initialize(file, opts = {})
@@ -68,6 +69,7 @@ def initialize(file, opts = {})
       @filter_classes = opts[:classes]   ? [opts[:classes].split(',')].flatten.map {|x| Onceover::Class.find(x)} : nil
       @filter_nodes   = opts[:nodes]     ? [opts[:nodes].split(',')].flatten.map {|x| Onceover::Node.find(x)} : nil
       @skip_r10k      = opts[:skip_r10k] ? true : false
+      @force          = opts[:force] || false
 
       # Loop over all of the items in the test matrix and add those as test
       # objects to the list of tests
@@ -265,7 +267,10 @@ def deploy_local(repo = Onceover::Controlrepo.new, opts = {})
           # R10K::Action::Deploy::Environment
           prod_dir = "#{repo.tempdir}/#{repo.environmentpath}/production"
           Dir.chdir(prod_dir) do
-            install_cmd = "r10k puppetfile install --verbose --color --puppetfile #{repo.puppetfile}"
+            install_cmd = []
+            install_cmd << "r10k puppetfile install --verbose --color --puppetfile #{repo.puppetfile}"
+            install_cmd << "--force" if @force
+            install_cmd = install_cmd.join(' ')
             logger.debug "Running #{install_cmd} from #{prod_dir}"
             system(install_cmd)
             raise 'r10k could not install all required modules' unless $?.success?