onceover 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd681c6ca1d609e55aee2198acff4fa441202f0
-  data.tar.gz: 29cdca53f97cfa82509f52352b0290b36f00b513
+  metadata.gz: 6b48ef84c14842fdf39cc9decc7322e6f966a3aa
+  data.tar.gz: 6717a0dec46178c50c88c13e3aed1ec89a9123b0
 SHA512:
-  metadata.gz: 57c18aa22e76170b33ebb9d69d18b719cbd19632947dc0d7a76b299db15e11673ce8349c548c385588ba3a5a335b3ad95532fd833aebb51319dc0481cd58d506
-  data.tar.gz: f804fd467e69d54b70f1109bb6492b17d583cd8aca62fd6f16fb4ad3a6edb7d9ea8985771822bc58cf612cad42573d4e9a6f5900a588b867045547cd681d5fed
+  metadata.gz: a5fce0ccde2a96a228025549a434729d0cb6bc05032ed71d120b9873f626e7c9507f5291b141934da922e4dbefe58160f5cb3cbd844ce79293b22aca6922a178
+  data.tar.gz: 6b2f3fd0a312a4159605e509e4805e066322eaa4c5a58ec6dd13ae9527b00cf0dcd4a2c30ff15ed71dfd38b7bb56c4663341b9481fe4dd7b18aa9827e6131d0c

data/README.md

@@ -20,6 +20,7 @@ Onceover is a tool to automatically run basic tests on an entire Puppet controlr
   - [Using Workarounds](#using-workarounds)
   - [Extra tooling](#extra-tooling)
     - [Plugins](#plugins)
+    - [Overriding Onceover's Templates](#overriding-onceovers-templates)
     - [Accessing Onceover in a traditional RSpec test](#accessing-onceover-in-a-traditional-rspec-test)
     - [Accessing fact sets in a traditional RSpec test](#accessing-fact-sets-in-a-traditional-rspec-test)
     - [Accessing Roles in a traditional RSpec test](#accessing-roles-in-a-traditional-rspec-test)
@@ -122,7 +123,7 @@ before:
 
 after:
   - "puts 'Test finished running'"
-``` 
+```
 
 **opts** The `opts` section overrides defaults for the `Onceover::Controlrepo` class' `opts` hash.
 
@@ -488,6 +489,10 @@ This takes your Puppetfile and actually modifies all of the module versions in t
   4. Run Onceover agan
   5. Create a pull request if all tests pass
 
+### Overriding Onceover's Templates
+
+Onceover uses templates to create a bunch of files in the `.onceover` directory, these templates can be modified if required. To do this create your own custom template with the same name os the original in the `spec/templates/` directory and it will be used in preference to the default template. e.g. `spec/templates/spec_helper.rb.erb`
+
 ### Accessing Onceover in a traditional RSpec test
 
 If you would like to use `onceover.yaml` to manage which tests you want to run, but want more than just `it { should_compile }` tests to be run you can write you own as follows:
@@ -680,3 +685,4 @@ Cheers to all of those who helped out:
   - aardvark
   - Mandos
   - Nekototori
+  - LMacchi

data/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"

data/features/step_definitions/common.rb

@@ -53,7 +53,7 @@ end
 
 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

data/features/step_definitions/run.rb

@@ -7,3 +7,7 @@ Then(/^the temporary Puppetfile should contain the git branch/) do
   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

data/lib/onceover/cli/run.rb

@@ -22,6 +22,7 @@ This includes deploying using r10k and running all custom tests.
           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|

data/lib/onceover/controlrepo.rb

@@ -537,7 +537,12 @@ class Onceover
     def self.evaluate_template(template_name, bind)
       logger.debug "Evaluating template #{template_name}"
       template_dir = File.expand_path('../../templates', File.dirname(__FILE__))
-      template = File.read(File.expand_path("./#{template_name}", template_dir))
+      if File.file?(File.expand_path("./spec/templates/#{template_name}", @root))
+        puts "Using Custom #{template_name}"
+        template = File.read(File.expand_path("./spec/templates/#{template_name}", @root))
+      else
+        template = File.read(File.expand_path("./#{template_name}", template_dir))
+      end
       ERB.new(template, nil, '-').result(bind)
     end
 

data/lib/onceover/testconfig.rb

@@ -26,6 +26,7 @@ class Onceover
     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 @@ class Onceover
       @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 @@ class Onceover
           # 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?

data/onceover.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.4.0"
+  s.version     = "3.5.0"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake