onceover 3.0.10 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cc4b6a12f15647aaa3d9c8e6fd3b9c861755a33
-  data.tar.gz: e849504c04131575ac616c3bb8a12b589784160f
+  metadata.gz: 27ba24b25b165dc0b98daceafdc049b1e5267584
+  data.tar.gz: b6cb2838c8b4e6f835e87707bae6c19565b6bec3
 SHA512:
-  metadata.gz: 51a531b68836433a1d1adcf95301c84c5c19e02af589ea8cf88a49d76f3618cef142fa6ccd1e7347e98cdc6d70873b73f2afa7903dbf6522acddfc395fab54a2
-  data.tar.gz: d096c470967ad83e6e8158e72f6cfa17b4b070917d81287f5f9ff31cca2355edb63a8c50f8f96d1e4bc9c02b25684ac4bdfa6ef453b32ba107e4044e55373728
+  metadata.gz: 7409c2c959c90477265cbc45f5c26cf437a022f2e82ccefb4fb365977892a9dad48b8d856241a347e51fc72f715550fb22646d62d876dbaaf3d505a55a82f3c1
+  data.tar.gz: d52e076c44f1c4a4e10d4c550ecf15fc65396613fc24c75b45ad1b73f836e51a978fa5c38eab5b34952b122c360ca31c0e3d1661db0772e15d5d2c8bce9377dc

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    git (1.2.9.1)
-    rake (10.5.0)
+    git (1.3.0)
+    rake (12.0.0)
     rubygems-tasks (0.2.4)
 
 PLATFORMS
@@ -14,4 +14,4 @@ DEPENDENCIES
   rubygems-tasks
 
 BUNDLED WITH
-   1.10.6
+   1.13.7

data/README.md

@@ -436,7 +436,7 @@ The same can also be done with profiles just by using the profiles method instea
 
 ```ruby
 require 'spec_helper'
-require 'controlrepo'
+require 'onceover'
 Onceover::Controlrepo.profiles.each do |profile|
   describe profile do
     Onceover::Controlrepo.facts.each do |facts|
@@ -461,7 +461,7 @@ Just pass a hash to the `facts` method and it will return only the fact sets wit
 
 ```ruby
 require 'spec_helper'
-require 'controlrepo'
+require 'onceover'
 
 describe 'profile::windows_appserver' do
   Onceover::Controlrepo.facts({
@@ -492,7 +492,7 @@ Note that you will need to call the `roles` and `profiles` methods on the object
 I have included a couple of little rake tasks to help get you started with testing your control repos. Set them up by adding this to your `Rakefile`
 
 ```ruby
-require 'controlrepo/rake_tasks'
+require 'onceover/rake_tasks'
 ```
 
 The tasks are as follows:

data/lib/onceover/controlrepo.rb

@@ -246,7 +246,8 @@ class Onceover
     def fixtures
       # Load up the Puppetfile using R10k
       puppetfile = R10K::Puppetfile.new(@root)
-      modules = puppetfile.load
+      fail 'Could not load Puppetfile' unless puppetfile.load
+      modules = puppetfile.modules
 
       # Iterate over everything and seperate it out for the sake of readability
       symlinks = []
@@ -383,6 +384,8 @@ class Onceover
       Onceover::Controlrepo.init_write_file(generate_nodesets(repo),repo.nodeset_file)
       Onceover::Controlrepo.init_write_file(Onceover::Controlrepo.evaluate_template('pre_conditions_README.md.erb',binding),File.expand_path('./pre_conditions/README.md',repo.spec_dir))
       Onceover::Controlrepo.init_write_file(Onceover::Controlrepo.evaluate_template('factsets_README.md.erb',binding),File.expand_path('./factsets/README.md',repo.spec_dir))
+      Onceover::Controlrepo.init_write_file(Onceover::Controlrepo.evaluate_template('Rakefile.erb',binding),File.expand_path('./Rakefile',repo.root))
+      Onceover::Controlrepo.init_write_file(Onceover::Controlrepo.evaluate_template('Gemfile.erb',binding),File.expand_path('./Gemfile',repo.root))
 
       # Add .onceover to Gitignore
       gitignore_path = File.expand_path('.gitignore',repo.root)

data/lib/onceover/rake_tasks.rb

@@ -4,12 +4,16 @@ require 'pathname'
 @repo = nil
 @config = nil
 
+
+desc 'Writes a `fixtures.yml` file based on the Puppetfile'
 task :generate_fixtures do
   repo = Onceover::Controlrepo.new
   raise ".fixtures.yml already exits, we won't overwrite because we are scared" if File.exists?(File.expand_path('./.fixtures.yml',repo.root))
   File.write(File.expand_path('./.fixtures.yml',repo.root),repo.fixtures)
 end
 
+
+desc "Modifies your `hiera.yaml` to point at the hieradata relative to its position."
 task :hiera_setup do
   repo = Onceover::Controlrepo.new
   current_config = repo.hiera_config

data/lib/onceover/testconfig.rb

@@ -209,7 +209,7 @@ class Onceover
     end
 
     def write_rakefile(location, pattern)
-      File.write("#{location}/Rakefile",Onceover::Controlrepo.evaluate_template('Rakefile.erb',binding))
+      File.write("#{location}/Rakefile",Onceover::Controlrepo.evaluate_template('testconfig_Rakefile.erb',binding))
     end
 
     def write_spec_helper(location, repo)

data/{controlrepo.gemspec → 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.0.10"
+  s.version     = "3.0.11"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

data/templates/Gemfile.erb

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'onceover'
+gem 'beaker', '~> 2.0'
+

data/templates/Rakefile.erb

@@ -1,6 +1 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-
-desc "Run acceptance tests"
-RSpec::Core::RakeTask.new(:acceptance) do |t|
-  t.pattern = 'spec/acceptance'
-end
+require 'onceover/rake_tasks'

data/templates/testconfig_Rakefile.erb

@@ -0,0 +1,6 @@
+require 'puppetlabs_spec_helper/rake_tasks'
+
+desc "Run acceptance tests"
+RSpec::Core::RakeTask.new(:acceptance) do |t|
+  t.pattern = 'spec/acceptance'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -276,7 +276,6 @@ files:
 - README.md
 - Rakefile
 - bin/onceover
-- controlrepo.gemspec
 - factsets/CentOS-5.11-32.json
 - factsets/CentOS-5.11-64.json
 - factsets/CentOS-6.6-32.json
@@ -310,7 +309,9 @@ files:
 - lib/onceover/runner.rb
 - lib/onceover/test.rb
 - lib/onceover/testconfig.rb
+- onceover.gemspec
 - templates/.fixtures.yml.erb
+- templates/Gemfile.erb
 - templates/Rakefile.erb
 - templates/acceptance_test_spec.rb.erb
 - templates/controlrepo.yaml.erb
@@ -320,6 +321,7 @@ files:
 - templates/spec_helper.rb.erb
 - templates/spec_helper_acceptance.rb.erb
 - templates/test_spec.rb.erb
+- templates/testconfig_Rakefile.erb
 homepage: https://github.com/dylanratcliffe/onceover
 licenses:
 - Apache-2.0