onceover 3.2.7 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6258620982ccd165a8b28db772919db88228298f
-  data.tar.gz: a605dc65458a48fe892558a350d08f69c1478ac3
+  metadata.gz: b2c62563cf5b896213394193150a990cceaa671c
+  data.tar.gz: 6872e6d67a0f3863745e5713ca33611f03978afa
 SHA512:
-  metadata.gz: 6de5b5c139e1b6a931dfa34f748967c69d54866d3ddce13b2a7e77f6ccc203cde527f8d6ed6bef4002eb83b9c458cda3b61f38e5f569ca5c319f1a7e0d9856ec
-  data.tar.gz: c4671a56297178b4d61c9f49984b86cc3a7ab3c2302e77528685d62fc9b19c482885c781e60f2e2e3cba01db5115f5e610e8c5090ee35da4440bdaeb1471875b
+  metadata.gz: 4816f05bf7055452336ff743b177feffdb8b3d75bda749b148b85edd63655c82a9d3348e1f3c36469538dbc33f581f8d8e45910bb74ceb5a085e6a799c34f745
+  data.tar.gz: '0883183e90d99f4ae800bbc8b843edb2202b9e744f88a053fdbabffe92ecb27a3c9ec65bcaee273c026230d5d252b175828f3a33a4a22353bb71115adae4f6f7'

data/README.md

@@ -439,11 +439,14 @@ Here we are specifying custom commands to run for starting, stopping and checkin
 
 ### Plugins
 
-Onceover now allows for plugins. The framework is extremely simple and basically relies on the plugins to monkey-patch themselves in. It will likely be improved in future. To create a plugin simply install a gem with a name that starts with `onceover-` and onceover will `require` it. Once it has been required it is up to the plugin to insert itself wherever it is required.
+Onceover now allows for plugins. To use a plugin simply install a gem with a name that starts with `onceover-` and onceover will activate it.
 
-Examples:
+Useful plugins:
 
-  - [onceover-octocatalog-diff](https://github.com/dylanratcliffe/onceover-octocatalog-diff)
+  - [onceover-codequality](https://github.com/declarativesystems/onceover-codequality) _Check lint and syntax_
+  - [onceover-octocatalog-diff](https://github.com/dylanratcliffe/onceover-octocatalog-diff) _See the differences between two versions of a catalog_
+
+If you want to write your own plugin, take a look at [onceover-helloworld](https://github.com/declarativesystems/onceover-helloworld) to help you get started.
 
 ### Inspecting and updating the Puppetfile
 
@@ -576,7 +579,7 @@ repo.role_regex = /.*/ # Tells the class how to find roles, will be applied to r
 repo.profile_regex = /.*/ # Tells the class how to find profiles, will be applied to repo.classes
 ```
 
-Note that you will need to call the `roles` and `profiles` methods on the object you just instantiated, not the main class e.g. `repo.roles` not Onceover::Controlrepo.roles`
+Note that you will need to call the `roles` and `profiles` methods on the object you just instantiated, not the main class e.g. `repo.roles` not Onceover::Controlrepo.roles
 
 ### Rake tasks
 
@@ -654,4 +657,3 @@ Cheers to all of those who helped out:
   - natemccurdy
   - aardvark
   - Mandos
-

data/features/{basic.feature → help.feature}

@@ -1,4 +1,4 @@
-Feature: Run basic function of Onceover
+Feature: Get help about Onceover's features, commands and commands' parameters
   I would like to use executable file to run Onceover and read help
 
   Background:

data/features/run.feature

@@ -0,0 +1,19 @@
+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
+  log info.
+
+  Background:
+    Given onceover executable
+
+ Scenario: Run correct spec tests
+    Given initialized control repo "controlrepo_basic"
+    When I run onceover command "run spec"
+    Then I should not see any errors
+
+ Scenario: Run spec tests with misspelled module in Puppetfile
+    Given initialized control repo "controlrepo_basic"
+    And in Puppetfile is misspelled module's name
+    When I run onceover command "run spec"
+    Then I should see error with message pattern "The module acme-not_exists does not exist"
+

data/features/step_definitions/common.rb

@@ -1,22 +1,23 @@
 Given /^onceover executable$/ do
-  @cmd = Command.new
+  @cmd = Command_Helper.new
 end
 
 Given(/^control repo "([^"]*)"$/) do |controlrepo_name|
-  @cmd.controlrepo = controlrepo_name
-  FileUtils.rm_rf "tmp/tests/#{controlrepo_name}"
-  FileUtils.mkdir_p 'tmp/tests'
-  FileUtils.cp_r "spec/fixtures/#{controlrepo_name}", 'tmp/tests'
+  @repo = ControlRepo_Helper.new( controlrepo_name )
+  @cmd.controlrepo = @repo
+  FileUtils.rm_rf @repo.root_folder
+  FileUtils.mkdir_p 'tmp'
+  FileUtils.cp_r "spec/fixtures/#{controlrepo_name}", 'tmp'
 end
 
-Given(/^control repo "([^"]*)" without "([^"]*)"$/) do |controlrepo_name, filename|
+Given(/^initialized control repo "([^"]*)"$/) do |controlrepo_name|
   step %Q(control repo "#{controlrepo_name}")
-  controlrepo_path = "tmp/tests/#{controlrepo_name}"
-  FileUtils.rm_rf( controlrepo_path + "/#{filename}" )
+  step %Q(I run onceover command "init")
 end
 
-Then(/^I should see all tests pass$/) do
-  pending # Write code here that turns the phrase above into concrete actions
+Given(/^control repo "([^"]*)" without "([^"]*)"$/) do |controlrepo_name, filename|
+  step %Q(control repo "#{controlrepo_name}")
+  FileUtils.rm_rf "#{@repo.root_folder}/#{filename}"
 end
 
 When /^I run onceover command "([^"]*)"$/  do |command|
@@ -44,17 +45,6 @@ Then(/^I should see error with message pattern "([^"]*)"$/) do |err_msg_regexp|
   expect(@cmd.output.match err_msg_regexp).to_not be nil
 end
 
-Then(/^I should see generated all necessary files and folders$/) do
-  controlrepo_path = "tmp/tests/controlrepo_basic/"
-  files = [ 'spec/onceover.yaml', 'Rakefile', 'Gemfile' ].map { |x| controlrepo_path + x }
-  folders = [ 'spec/factsets', 'spec/pre_conditions'].map! { |x| controlrepo_path + x}
-
-  files.each do |file|
-    puts file
-    expect( File.exist? file ).to be true
-  end
-  folders.each do |folder|
-    puts folder
-    expect( Dir.exist? folder ).to be true
-  end
+Given(/^in Puppetfile is misspelled module's name$/) do
+  @repo.add_line_to_puppetfile %Q(mod "acme/not_exists", "7.7.7")
 end

data/features/step_definitions/init.rb

@@ -0,0 +1,13 @@
+Then(/^I should see generated all necessary files and folders$/) do
+  files = [ 'spec/onceover.yaml', 'Rakefile', 'Gemfile' ].map { |x| @repo.root_folder + x }
+  folders = [ 'spec/factsets', 'spec/pre_conditions'].map! { |x| @repo.root_folder + x}
+
+  files.each do |file|
+    puts file
+    expect( File.exist? file ).to be true
+  end
+  folders.each do |folder|
+    puts folder
+    expect( Dir.exist? folder ).to be true
+  end
+end

data/features/{step_definitions/command.rb → support/command_helper.rb}

@@ -1,6 +1,6 @@
 require "open3"
 
-class Command
+class Command_Helper
 
   attr_reader(:output, :result)
 
@@ -11,18 +11,20 @@ class Command
   end
 
   def run
-    controlrepo_param = @controlrepo ? "--path tmp/tests/#{@controlrepo}" : ''
-    full_cmd = "#{@executable} #{@command} #{controlrepo_param}"
-    @output, @result = Open3.capture2e full_cmd
+    @output, @result = Open3.capture2e generate_command
   end
 
   def success?
     return @result.success?
   end
 
-  def to_s
-    controlrepo_param = @controlrepo ? "--path tmp/tests/#{@controlrepo}" : ''
+  def generate_command
+    controlrepo_param = @controlrepo ? "--path #{@controlrepo.root_folder}" : ''
     return "#{@executable} #{@command} #{controlrepo_param}"
   end
 
+  def to_s
+    return generate_command
+  end
+
 end

data/features/support/controlrepo_helper.rb

@@ -0,0 +1,16 @@
+class ControlRepo_Helper
+
+  def initialize( name )
+    @name = name
+    @tmp_folder = 'tmp/'
+  end
+
+  def root_folder
+    return @tmp_folder + @name + '/'
+  end
+
+  def add_line_to_puppetfile( line )
+    open(root_folder + 'Puppetfile', 'a') { |f| f.puts line }
+  end
+
+end

data/lib/onceover/testconfig.rb

@@ -147,7 +147,7 @@ class Onceover
 
     def pre_condition
       # Read all the pre_conditions and return the string
-      spec_dir = Onceover::Controlrepo.new.spec_dir
+      spec_dir = Onceover::Controlrepo.new(@opts).spec_dir
       puppetcode = []
       Dir["#{spec_dir}/pre_conditions/*.pp"].each do |condition_file|
         logger.debug "Reading pre_conditions from #{condition_file}"
@@ -221,6 +221,7 @@ class Onceover
             install_cmd = "r10k puppetfile install --verbose --color --puppetfile #{repo.puppetfile}"
             logger.debug "Running #{install_cmd} from #{prod_dir}"
             system(install_cmd)
+            raise 'r10k could not install all required modules' unless $?.success?
           end
         else
           raise "#{repo.tempdir} is not a directory"

data/onceover.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.2.7"
+  s.version     = "3.2.8"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rspec_junit_formatter', '>= 0.2.0'
 
   # Development
-  s.add_development_dependency 'rubocop', '~> 0.39.0'
+  s.add_development_dependency 'rubocop', '~> 0.49.0'
   s.add_development_dependency 'rubygems-tasks', '~> 0.2.0'
   s.add_development_dependency 'pry', '~> 0.10.0'
   s.add_development_dependency 'cucumber', '~> 2.0'

data/spec/fixtures/controlrepo_basic/Puppetfile

@@ -1,10 +1,10 @@
 forge "http://forge.puppetlabs.com"
+#
+# I want to download some modules to check if r10k feature in Onceover works correctly.
+#
 
-# Modules from the Puppet Forge
 # Versions should be updated to be the latest at the time you start
-#mod "puppetlabs/inifile",     '1.5.0'
-#mod "puppetlabs/stdlib",      '4.11.0'
-#mod "puppetlabs/concat",      '2.1.0'
+mod "puppetlabs/stdlib",      '4.11.0'
 
 # Modules from Git
 # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -341,10 +341,13 @@ files:
 - factsets/Windows_Server-2012r2-64.json
 - factsets/solaris-10_u9-sparc-64.json
 - factsets/solaris-11.2-sparc-64.json
-- features/basic.feature
+- features/help.feature
 - features/init.feature
-- features/step_definitions/command.rb
+- features/run.feature
 - features/step_definitions/common.rb
+- features/step_definitions/init.rb
+- features/support/command_helper.rb
+- features/support/controlrepo_helper.rb
 - features/support/env.rb
 - lib/onceover/beaker.rb
 - lib/onceover/beaker/spec_helper.rb