onceover 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b526c91a6430b4a442c6c7d905325c0c8e66b980
-  data.tar.gz: 69bb0524345dcd1b155cc845e9fa5d2d206f3de3
+  metadata.gz: 72849f6db8421ffb02b6f6cab2c2b504d6ce8d76
+  data.tar.gz: 1b346dbcc0e3d8100fb202520524918b5dd90d9e
 SHA512:
-  metadata.gz: 06ba5f38361ec3eafed75cf81b9d902b8bc9e646c3c4f3da9a9bd66024738af70c1692fb1e7493a2c1321b10bdf9178457c156cadf38503aa529f2ce9da1eed8
-  data.tar.gz: 0cea3f35c36f7b99a345bfc8b17b15108adb3bd3e3ddc5e6a9ca9af08a458273191be6b8a22ffe217ad51e3f9c7873d3e41ffb718613e7d233c343dfe2714d88
+  metadata.gz: 1d72703e6f6012edce69f3a5521764a0a6536496a0ca2dbb4de29e204715b600df34c3a70e98bba5264563a5fac2b9507a6652393ca516b4eb699318501d86ac
+  data.tar.gz: 50ed94b9ff2619c7434570ffdc1d1d0652d498936e03e849c3457ca98aa111eec5b1c55d55578bdec5cb26c94557b6180fa39ba967cbb19b1bd1414cc43c9e32

data/README.md

@@ -353,6 +353,27 @@ If your `hiera.yaml` is version 4 or 5 and lives in the root of the controlrepo
 | 5 | Root of repo | relative to the root of the repo e.g. `data` |
 | 5 | `spec` folder | relative to the spec folder e.g. `../data` |
 
+#### `hiera-eyaml`
+
+If you are using the `hiera-eyaml` backend there are some modifications that you will need to make in order to ensure that things actually work. Remember that when onceover compiles catalogs it is actually using hiera with your config file to do the lookups on the host that is running the tests, meaning that the `hiera-eyaml` gem will need to be present (put it in your Gemfile), as will the keys in the correct location, otherwise hiera will fail to load them. *This is really not a great situation as you don't want to be distributing your private keys*
+
+**Recommended Solution:** I recommend that if you are using `hiera-eyaml` (which you probably should be) that you do the following:
+
+  1. Duplicate your `hiera.yaml` file so that there is a copy in the `spec/` directory
+  1. Change the `datadir` setting as described above
+  1. Remove the eyaml backend entirely and just use the base yaml backend. For hiera 5 this will look like:
+
+  ```yaml
+  ---
+  version: 5
+  defaults:
+    datadir: "../data"
+    data_hash: yaml_data
+  ```
+
+This means that for testing, hiera will just return the encrypted string for anything that is encrypted using eyaml. This usually isn't a problem for catalog compilation and will allow tests to pass.
+
+
 ## Spec testing
 
 Once you have your `onceover.yaml` and factsets set up you are ready to go with spec testing.
@@ -696,13 +717,15 @@ Execute tests
 
 Cheers to all of those who helped out:
 
-  - jessereynolds
-  - op-ct
-  - GeoffWilliams
-  - beergeek
-  - jairojunior
-  - natemccurdy
-  - aardvark
-  - Mandos
-  - Nekototori
-  - LMacchi
+  - @jessereynolds
+  - @op-ct
+  - @GeoffWilliams
+  - @beergeek
+  - @jairojunior
+  - @natemccurdy
+  - @aardvark
+  - @Mandos
+  - @Nekototori
+  - @LMacchi
+  - @tabakhase
+  - @binford2k

data/features/run.feature

@@ -18,16 +18,6 @@ Feature: Run rspec and acceptance test suites
     When I run onceover command "run spec"
     Then I should see error with message pattern "The module acme-not_exists does not exist"
 
-  Scenario: Run advanced spec tests
-    Given control repo "puppet_controlrepo"
-    When I run onceover command "run spec"
-    Then I should not see any errors
-
-  Scenario: Check that control_branch functionality works
-    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"
@@ -42,6 +32,16 @@ Feature: Run rspec and acceptance test suites
     And I run onceover command "run spec --force"
     Then I should see message pattern "Overwriting local modifications"
 
+  Scenario: Run advanced spec tests
+    Given control repo "puppet_controlrepo"
+    When I run onceover command "run spec"
+    Then I should not see any errors
+
+  Scenario: Check that control_branch functionality works
+    Given initialized control repo "control_branch"
+    When I run onceover command "run spec"
+    Then the temporary Puppetfile should contain the git branch
+
   Scenario: Mocking functions should work and return the correct data types
     Given control repo "function_mocking"
     When I run onceover command "run spec"

data/lib/onceover/testconfig.rb

@@ -31,7 +31,7 @@ class Onceover
 
     def initialize(file, opts = {})
       begin
-        config = YAML.safe_load(File.read(file))
+        config = YAML.safe_load(File.read(file), [Symbol])
       rescue Errno::ENOENT
         raise "Could not find #{file}"
       rescue Psych::SyntaxError
@@ -347,8 +347,22 @@ class Onceover
       repo.temp_modulepath.split(':').each do |path|
         Dir["#{path}/*"].each do |mod|
           modulename = File.basename(mod)
-          logger.debug "Symlinking #{mod} to #{repo.tempdir}/spec/fixtures/modules/#{modulename}"
-          FileUtils.ln_s(mod, "#{repo.tempdir}/spec/fixtures/modules/#{modulename}")
+          link = "#{repo.tempdir}/spec/fixtures/modules/#{modulename}"
+          logger.debug "Symlinking #{mod} to #{link}"
+          unless File.symlink?(link)
+            # Ruby only sets File::ALT_SEPARATOR on Windows and Rubys standard library
+            # uses this to check for Windows
+            if !!File::ALT_SEPARATOR
+              mod = File.join(File.dirname(link), mod) unless Pathname.new(mod).absolute?
+              if Dir.respond_to?(:create_junction)
+                Dir.create_junction(link, mod)
+              else
+                system("call mklink /J \"#{link.gsub('/', '\\')}\" \"#{mod.gsub('/', '\\')}\"")
+              end
+            else
+              FileUtils.ln_s(mod, link)
+            end
+          end
         end
       end
     end

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.6.0"
+  s.version     = "3.6.1"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

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

@@ -41,3 +41,6 @@ functions:
     type: rvalue
     returns:
       foo: bar
+
+opts:
+  :debug: true

metadata

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