onceover 3.15.0 → 3.17.1

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.15.0"
+  s.version     = "3.17.1"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -18,27 +18,23 @@ Gem::Specification.new do |s|
   s.executables  = 'onceover'
 
   # Runtime dependencies, but also probably dependencies of requiring projects
-  s.add_runtime_dependency 'rake', '>= 10.0.0'
-  s.add_runtime_dependency 'multi_json', '~> 1.10'
   s.add_runtime_dependency 'backticks', '>= 1.0.2'
-  s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0"
+  s.add_runtime_dependency 'colored', '~> 1.2'
+  s.add_runtime_dependency 'cri', '>= 2.6'
+  s.add_runtime_dependency 'deep_merge', '>= 1.0.0'
+  s.add_runtime_dependency 'facter', '< 4.0.0'
+  s.add_runtime_dependency 'git'
+  s.add_runtime_dependency 'logging', '>= 2.0.0'
+  s.add_runtime_dependency 'multi_json', '~> 1.10'
   s.add_runtime_dependency 'parallel_tests', ">= 2.0.0"
+  s.add_runtime_dependency 'puppet', '>=4.0'
   s.add_runtime_dependency 'puppetlabs_spec_helper', ">= 0.4.0"
-  s.add_runtime_dependency 'rspec', '>= 3.0.0'
   s.add_runtime_dependency 'r10k', '>=2.1.0'
-  s.add_runtime_dependency 'puppet', '>=3.4.0'
-  s.add_runtime_dependency 'git'
-  s.add_runtime_dependency 'cri', '>= 2.6'
-  s.add_runtime_dependency 'colored', '~> 1.2'
-  s.add_runtime_dependency 'logging', '>= 2.0.0'
-  s.add_runtime_dependency 'deep_merge', '>= 1.0.0'
+  s.add_runtime_dependency 'rake', '>= 10.0.0'
+  s.add_runtime_dependency 'rspec', '>= 3.0.0'
+  s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0"
+  s.add_runtime_dependency 'rspec_junit_formatter', '>= 0.2.0'
   s.add_runtime_dependency 'table_print', '>= 1.0.0'
   s.add_runtime_dependency 'versionomy', '>= 0.5.0'
-  s.add_runtime_dependency 'rspec_junit_formatter', '>= 0.2.0'
 
-  # Development
-  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'
 end

data/spec/fixtures/controlrepos/caching/spec/r10k.yaml

@@ -0,0 +1,3 @@
+---
+# Just for testing
+pool_size: 10

data/spec/fixtures/controlrepos/windows/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'onceover'

data/spec/fixtures/controlrepos/windows/Puppetfile

@@ -0,0 +1,3 @@
+forge "http://forge.puppetlabs.com"
+
+mod 'puppetlabs-acl', '3.1.1'

data/spec/fixtures/controlrepos/windows/environment.conf

@@ -0,0 +1 @@
+modulepath = site-modules:modules:$basemodulepath

data/spec/fixtures/controlrepos/windows/site-modules/role/manifests/acl.pp

@@ -0,0 +1,12 @@
+class role::acl {
+  # ACL often causes failures such as this:
+  # https://github.com/rodjek/rspec-puppet/issues/665
+  #
+  # Onceover should handle this out of the box
+  acl { 'L:\\SQLBackup':
+    inherit_parent_permissions => false,
+    permissions                => [
+      { 'identity' => 'foo', 'rights' => ['read'] }
+    ],
+  }
+}

data/spec/fixtures/controlrepos/windows/site-modules/role/manifests/groups.pp

@@ -0,0 +1,8 @@
+# Class: role::groups
+#
+#
+class role::groups {
+  group {'Administrators':
+    members => ['foo'],
+  }
+}

data/spec/fixtures/controlrepos/windows/site-modules/role/manifests/users.pp

@@ -0,0 +1,9 @@
+# Class: role::users
+#
+#
+class role::users {
+  user { 'dylan':
+    ensure => 'present',
+    groups => ['Administrators'],
+  }
+}

data/spec/fixtures/controlrepos/windows/site/role/manifests/groups.pp

@@ -0,0 +1,8 @@
+# Class: role::groups
+#
+#
+class role::groups {
+  group {'Administrators':
+    members => ['foo'],
+  }
+}

data/spec/fixtures/controlrepos/windows/site/role/manifests/users.pp

@@ -0,0 +1,9 @@
+# Class: role::users
+#
+#
+class role::users {
+  user { 'dylan':
+    ensure => 'present',
+    groups => ['Administrators'],
+  }
+}

data/spec/fixtures/controlrepos/windows/spec/onceover.yaml

@@ -0,0 +1,24 @@
+# Classes to be tested
+classes:
+  - /role::/
+
+# Nodes to tests classes on, this refers to a 'factset' or 'nodeset'
+# depending on whether you are running 'spec' or 'acceptance' tests
+nodes:
+  - Windows_Server-2012r2-64
+  - windows-10-64
+  - Windows_Server-2008r2-64
+
+# You can group classes here to save typing
+class_groups:
+
+# You can group nodes here to save typing
+# We have created a 'non_windows_nodes' group because we can't
+# give you Windows vagrant boxes to test with because licensing,
+# we can give you fact sets though so go crazy with spec testing!
+node_groups:
+
+test_matrix:
+  - all_nodes:
+      classes: "all_classes"
+      tests: "spec"

data/templates/test_spec.rb.erb

@@ -29,6 +29,7 @@ describe "<%= cls.name %>" do
     end
 <% end -%>
 
+<% unless opts[:no_workarounds] -%>
     before :each do
       # Curtrently there is some code within Puppet that will try to execute
       # commands when compiling a catalog even though it shouldn't. One example is
@@ -41,7 +42,66 @@ describe "<%= cls.name %>" do
       unless File.exist? expected_null_file
         allow(Puppet::Util::Execution).to receive(:execute).and_raise(Puppet::ExecutionFailure.new("Onceover caused this"))
       end
+
+      # The windows ACL module causes issues when compiled on other platforms
+      # These are detailed in the following ticket:
+      #   https://github.com/rodjek/rspec-puppet/issues/665
+      #
+      # The below should work around this common issue
+      if Puppet::Type.type(:acl)
+        allow_any_instance_of(Puppet::Type.type(:acl).provider(:windows)).to receive(:validate)
+        allow_any_instance_of(Puppet::Type.type(:acl).provider(:windows)).to receive(:respond_to?).with(:get_account_name).and_return(false)
+        allow_any_instance_of(Puppet::Type.type(:acl).provider(:windows)).to receive(:respond_to?).with(:get_group_name).and_return(false)
+        allow_any_instance_of(Puppet::Type.type(:acl).provider(:windows)).to receive(:respond_to?).with(:validate).and_return(true)
+      end
+
+      # The windows_adsi provider also has an issue where the contructor takes
+      # a different number of arguments depending on whether the ADSI
+      # underlying connectivity exists. This causes the following error:
+      #
+      #      wrong number of arguments (given 1, expected 0)
+      #
+      # This fixes that if we aren't using Windows
+      begin
+        # Test to see if this works without modification
+        require 'puppet/util/windows'
+        require 'puppet/util/windows/adsi'
+        Puppet::Util::Windows::ADSI.computer_name
+      rescue LoadError, StandardError
+        # Declare an entire mocked module because for some reason we can't load it unless we are on Windows
+        module Puppet::Util::Windows
+          module ADSI
+            class ADSIObject; end
+            class User < ADSIObject; end
+            class UserProfile; end
+            class Group < ADSIObject; end
+          end
+          module File; end
+          module Registry
+          end
+          module SID
+            class Principal; end
+          end
+          class EventLog; end
+        end
+
+        # Mock commonly used things
+        allow(Puppet::Util::Windows::SID).to receive(:name_to_sid).and_return('S-1-5-32-544')
+        allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(nil)
+        
+        allow_any_instance_of(Puppet::Util::Windows::ADSI::User).to receive(:initialize)
+        allow_any_instance_of(Puppet::Util::Windows::ADSI::User).to receive(:groups).and_return([])
+        allow_any_instance_of(Puppet::Util::Windows::ADSI::User).to receive(:name_sid_hash).and_return({})
+
+        # Group instance methods
+        allow_any_instance_of(Puppet::Util::Windows::ADSI::Group).to receive(:members).and_return([])
+        allow_any_instance_of(Puppet::Util::Windows::ADSI::Group).to receive(:members_sids).and_return([])
+        
+        # Class methods
+        allow(Puppet::Util::Windows::ADSI::Group).to receive(:name_sid_hash).and_return({})
+      end
     end
+<% end -%>
 
 <% if @after_conditions -%>
     after :each do

metadata

@@ -1,239 +1,225 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.17.1
 platform: ruby
 authors:
 - Dylan Ratcliffe
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-19 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: backticks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: backticks
+  name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: rspec-puppet
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: parallel_tests
+  name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: puppetlabs_spec_helper
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: r10k
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: puppet
+  name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: git
+  name: puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: cri
+  name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: logging
+  name: r10k
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
-  name: table_print
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: versionomy
+  name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -249,61 +235,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.49.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.49.0
-- !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: pry
+  name: table_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :development
+        version: 1.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: versionomy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: 0.5.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.5.0
 description: Automatically generates tests for your Puppet code
 email:
 - dylan.ratcliffe@puppet.com
@@ -341,6 +299,7 @@ files:
 - factsets/Ubuntu-12.04-64.json
 - factsets/Ubuntu-14.04-32.json
 - factsets/Ubuntu-14.04-64.json
+- factsets/Ubuntu-18.04-64.json
 - factsets/Windows_Server-2008r2-64.json
 - factsets/Windows_Server-2012r2-64.json
 - factsets/solaris-10_u9-sparc-64.json
@@ -351,7 +310,6 @@ files:
 - features/formatting.feature
 - features/help.feature
 - features/init.feature
-- features/run.feature
 - features/show.feature
 - features/step_definitions/cache.rb
 - features/step_definitions/common.rb
@@ -362,6 +320,8 @@ files:
 - features/support/command_helper.rb
 - features/support/controlrepo_helper.rb
 - features/support/env.rb
+- features/windows.feature
+- features/zzz_run.feature
 - lib/onceover/beaker.rb
 - lib/onceover/beaker/spec_helper.rb
 - lib/onceover/class.rb
@@ -411,6 +371,7 @@ files:
 - spec/fixtures/controlrepos/caching/spec/onceover.yaml
 - spec/fixtures/controlrepos/caching/spec/pre_conditions/README.md
 - spec/fixtures/controlrepos/caching/spec/pre_conditions/escaping.pp
+- spec/fixtures/controlrepos/caching/spec/r10k.yaml
 - spec/fixtures/controlrepos/control_branch/Puppetfile
 - spec/fixtures/controlrepos/control_branch/environment.conf
 - spec/fixtures/controlrepos/factsets/environment.conf
@@ -429,6 +390,15 @@ files:
 - spec/fixtures/controlrepos/function_mocking/site/role/manifests/test_new_functions.pp
 - spec/fixtures/controlrepos/function_mocking/spec/onceover.yaml
 - spec/fixtures/controlrepos/minimal/environment.conf
+- spec/fixtures/controlrepos/windows/Gemfile
+- spec/fixtures/controlrepos/windows/Puppetfile
+- spec/fixtures/controlrepos/windows/environment.conf
+- spec/fixtures/controlrepos/windows/site-modules/role/manifests/acl.pp
+- spec/fixtures/controlrepos/windows/site-modules/role/manifests/groups.pp
+- spec/fixtures/controlrepos/windows/site-modules/role/manifests/users.pp
+- spec/fixtures/controlrepos/windows/site/role/manifests/groups.pp
+- spec/fixtures/controlrepos/windows/site/role/manifests/users.pp
+- spec/fixtures/controlrepos/windows/spec/onceover.yaml
 - spec/onceover/controlrepo_spec.rb
 - spec/spec_helper.rb
 - templates/.fixtures.yml.erb
@@ -448,7 +418,7 @@ homepage: https://github.com/dylanratcliffe/onceover
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -463,8 +433,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Testing tools for Puppet controlrepos
 test_files: []