puppet-retrospec 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3132a94b4025368f76a74202f2ffacfe5906b941
-  data.tar.gz: d0adc560eb50a6a89dc3ad9810f53516cc6f2c07
+  metadata.gz: 1b8a2d188fa0d01a182d58443a8ff7c109e67228
+  data.tar.gz: 2e63276ab8d5b814a386615df85233191d9af9f4
 SHA512:
-  metadata.gz: e4fdd60ac3de7650f4ca6a0054fb292a9a55f25f68337d8b01b6f10e1db46915b8c6db0826f02d8ffb5447250cd4d223654a16a747653abc8c4f7303bf78fcc4
-  data.tar.gz: cce4b3c789ab9b41d16839d557ed2a83c6b2a25f062e3e4cd534ddf785e20591f157d93b59b22617b07bb556cfd553a1b85fe841a9154185483cd10f8c0f88c6
+  metadata.gz: d4bab8bfad24ac10fc8b362e4ca7445075912d876d2bb9e2b2147f1f1e91ae44a65ac8cf50c3324766f30c5e9c39cebf7a4de1c5a2e4570c8d6a2daf03d77922
+  data.tar.gz: 34a74fce6aa0cdb20acf9088e6c843076d209c813413eee0813566a4fa89ffa2458f8dcb11f477c984ae5651d1902699bc97e80d8ceea1f616c3caedc8f7660b

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+## 0.6.1
+ * gh-12 - allow new templates to be easily added without changing code
+ * gh-8 - tests are not created when manifest is invalid 
+ * updated README based on apache example
+ * updated templates to fix minor errors
+
+## 0.6.0
+Initial release that was deemed worthy.
+
+

data/README.md

@@ -3,12 +3,32 @@ Puppet-Retrospec
 
 Generates puppet rspec test code based on the classes and defines inside the manifests directory.  Aims to reduce some of the boilerplate coding with default test patterns.
 
-Retrospec makes it dead simple to get started with puppet unit testing.  When you run retrospec will scan you puppet manifests
+Retrospec makes it dead simple to get started with puppet unit testing.  When you run retrospec, retrospec will scan you puppet manifests
 and actually write some very basic rspec-puppet test code.  Thus this gem will retrofit your existing puppet module
 with everything needed to get going with puppet unit testing.
 
 The project was named retrospec because there are many times when you need to retrofit your module with spec tests.
 
+Table of Contents
+=================
+
+  * [Build Status](#build-status)
+  * [Install](#install)
+  * [How to use](#how-to-use)
+  * [Example](#example)
+  * [About the test suite](#about-the-test-suite)
+  * [How Does it do this](#how-does-it-do-this)
+  * [Overriding the templates](#overriding-the-templates)
+  * [Adding New Templates](#adding-new-templates)
+  * [Beaker Testing](#beaker-testing)
+  * [Troubleshooting](#troubleshooting)
+  * [Running Tests](#running-tests)
+  * [Understanding Variable Resolution](#understanding-variable-resolution)
+  * [Todo](#todo)
+  * [Support](#support)
+
+Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
+
 Build Status
 ============
 [![Build Status](https://travis-ci.org/logicminds/puppet-retrospec.png)](https://travis-ci.org/logicminds/puppet-retrospec)
@@ -37,51 +57,101 @@ Example
 ======================
 
 Below you can see that it creates files for every resource in the tomcat module in addition to other files
-that you need for unit testing puppet code.
+that you need for unit testing puppet code. Rspec-puppet best practices says to put definitions in a defines folder
+and classes in a classes folder since it infers what kind of resource it is based on this convention.  Retrospec sets up
+this scaffolding for you.
 
 ```shell
-$ ls
-CHANGELOG.md	CONTRIBUTING.md	LICENSE		README.md	Rakefile	checksums.json	examples	manifests	metadata.json
 $ pwd
-/Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat
+/Users/cosman/github/puppetlabs-apache
 $ retrospec
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/spec_helper.rb
-!! /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/.fixtures.yml already exists and differs from template
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/Gemfile
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/shared_contexts.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/classes/
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/classes/tomcat_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/classes/params_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/config/server/
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/config/server/connector_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/config/server/engine_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/config/server/host_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/config/server/service_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/config/server/valve_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/config/server_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/instance/
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/instance/package_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/instance/source_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/instance_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/service_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/setenv/
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/setenv/entry_spec.rb
- + /Users/cosman/bodeco/puppet-retrospec/spec/fixtures/modules/tomcat/spec/defines/war_spec.rb
+ + /Users/cosman/github/puppetlabs-apache/Gemfile
+  + /Users/cosman/github/puppetlabs-apache/Rakefile
+  + /Users/cosman/github/puppetlabs-apache/spec/
+  + /Users/cosman/github/puppetlabs-apache/spec/shared_contexts.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/spec_helper.rb
+  + /Users/cosman/github/puppetlabs-apache/.fixtures.yml
+  + /Users/cosman/github/puppetlabs-apache/.gitignore
+  + /Users/cosman/github/puppetlabs-apache/.travis.yml
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/default_mods_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/dev_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/apache_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/alias_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/auth_basic_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/auth_kerb_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/autoindex_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/cache_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/cgi_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/cgid_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/dav_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/dav_fs_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/dav_svn_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/deflate_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/dev_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/dir_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/disk_cache_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/fcgid_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/headers_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/info_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/itk_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/ldap_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/mime_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/mime_magic_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/mpm_event_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/negotiation_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/passenger_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/perl_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/php_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/prefork_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/proxy_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/proxy_balancer_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/proxy_html_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/proxy_http_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/python_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/reqtimeout_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/rewrite_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/setenvif_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/ssl_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/status_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/suphp_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/userdir_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/vhost_alias_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/worker_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/wsgi_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/mod/xsendfile_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/params_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/php_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/proxy_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/python_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/service_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/classes/ssl_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/balancer_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/balancermember_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/default_mods/
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/default_mods/load_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/listen_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/mod_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/namevirtualhost_spec.rb
+  + /Users/cosman/github/puppetlabs-apache/spec/defines/vhost_spec.rb
  
 ```
 
-Looking at the file we can see that it did a lot of work for us.  Retrospec generate three tests automatically.
+Looking at the file we can see that it did a lot of work for us.  Retrospec generate many tests automatically.
 However the variable resolution isn't perfect so you will need to manually resolve some variables.  This doesn't produce
-100% coverage but all you did was press enter to produce all this anyways.
-Below is the defines/instance_spec.rb file
+100% coverage but all you did was pressed enter to produce all this anyways.
+Below is the classes/apache_spec.rb file.  Notice that while Retrospec created all these files, you still need to do more work.
+Retrospec is only here to setup your module for testing, which might save you several hours each time you create a module.
+
    
 ```ruby
 require 'spec_helper'
 require 'shared_contexts'
 
-describe 'tomcat' do
-  # by default the hiera integration uses hirea data from the shared_contexts.rb file
+describe 'apache' do
+  # by default the hiera integration uses hiera data from the shared_contexts.rb file
   # but basically to mock hiera you first need to add a key/value pair
   # to the specific context in the spec/shared_contexts.rb file
   # Note: you can only use a single hiera context per describe/context block
@@ -100,32 +170,148 @@ describe 'tomcat' do
   # while all required parameters will require you to add a value
   let(:params) do
     {
-      #:catalina_home => "$::tomcat::params::catalina_home",
-      #:user => $::tomcat::params::user,
-      #:group => $::tomcat::params::group,
-      #:install_from_source => true,
-      #:purge_connectors => false,
-      #:manage_user => true,
-      #:manage_group => true,
+      #:default_mods => true,
+      #:default_vhost => true,
+      #:default_ssl_vhost => false,
+      #:default_ssl_cert => $apache::params::default_ssl_cert,
+      #:default_ssl_key => $apache::params::default_ssl_key,
+      #:default_ssl_chain => undef,
+      #:default_ssl_ca => undef,
+      #:default_ssl_crl_path => undef,
+      #:default_ssl_crl => undef,
+      #:service_enable => true,
+      #:purge_configs => true,
+      #:purge_vdir => false,
+      #:serveradmin => "root@localhost",
+      #:sendfile => false,
+      #:error_documents => false,
+      #:httpd_dir => $apache::params::httpd_dir,
+      #:confd_dir => $apache::params::confd_dir,
+      #:vhost_dir => $apache::params::vhost_dir,
+      #:vhost_enable_dir => $apache::params::vhost_enable_dir,
+      #:mod_dir => $apache::params::mod_dir,
+      #:mod_enable_dir => $apache::params::mod_enable_dir,
+      #:mpm_module => $apache::params::mpm_module,
+      #:conf_template => $apache::params::conf_template,
+      #:servername => $apache::params::servername,
+      #:user => $apache::params::user,
+      #:group => $apache::params::group,
+      #:keepalive => $apache::params::keepalive,
+      #:keepalive_timeout => $apache::params::keepalive_timeout,
+      #:logroot => $apache::params::logroot,
+      #:ports_file => $apache::params::ports_file,
+      #:server_tokens => "OS",
+      #:server_signature => "On",
     }
   end
   # add these two lines in a single test block to enable puppet and hiera debug mode
   # Puppet::Util::Log.level = :debug
   # Puppet::Util::Log.newdestination(:console)
   it do
-    should contain_file('$::tomcat::params::catalina_home').
-             with({"ensure"=>"directory",
-                   "owner"=>"$::tomcat::params::user",
-                   "group"=>"$::tomcat::params::group"})
+    is_expected.to contain_package('httpd').
+             with({"ensure"=>"installed",
+                   "name"=>"$apache::params::apache_name",
+                   "notify"=>"Class[Apache::Service]"})
   end
   it do
-    should contain_user('$::tomcat::params::user').
+    is_expected.to contain_group('$apache::params::group').
              with({"ensure"=>"present",
-                   "gid"=>"$::tomcat::params::group"})
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_user('$apache::params::user').
+             with({"ensure"=>"present",
+                   "gid"=>"$apache::params::group",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_class('apache::service').
+             with({"service_enable"=>"true"})
+  end
+  it do
+    is_expected.to contain_exec('mkdir $apache::params::confd_dir').
+             with({"creates"=>"$apache::params::confd_dir",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_file('$apache::params::confd_dir').
+             with({"ensure"=>"directory",
+                   "recurse"=>"true",
+                   "purge"=>"$purge_confd",
+                   "notify"=>"Class[Apache::Service]",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_concat('$apache::params::ports_file').
+             with({"owner"=>"root",
+                   "group"=>"root",
+                   "mode"=>"0644",
+                   "notify"=>"Class[Apache::Service]",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_concat__fragment('Apache ports header').
+             with({"target"=>"$apache::params::ports_file",
+                   "content"=>"template(apache/ports_header.erb)"})
+  end
+  it do
+    is_expected.to contain_exec('mkdir $apache::params::mod_dir').
+             with({"creates"=>"$apache::params::mod_dir",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_file('$apache::params::mod_dir').
+             with({"ensure"=>"directory",
+                   "recurse"=>"true",
+                   "purge"=>"true",
+                   "notify"=>"Class[Apache::Service]",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_exec('mkdir $apache::params::mod_enable_dir').
+             with({"creates"=>"$apache::params::mod_enable_dir",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_file('$apache::params::mod_enable_dir').
+             with({"ensure"=>"directory",
+                   "recurse"=>"true",
+                   "purge"=>"true",
+                   "notify"=>"Class[Apache::Service]",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_exec('mkdir $apache::params::vhost_dir').
+             with({"creates"=>"$apache::params::vhost_dir",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_file('$apache::params::vhost_dir').
+             with({"ensure"=>"directory",
+                   "recurse"=>"true",
+                   "purge"=>"true",
+                   "notify"=>"Class[Apache::Service]",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_exec('mkdir $vhost_load_dir').
+             with({"creates"=>"$vhost_load_dir",
+                   "require"=>"Package[httpd]"})
+  end
+  it do
+    is_expected.to contain_file('$apache::params::vhost_enable_dir').
+             with({"ensure"=>"directory",
+                   "recurse"=>"true",
+                   "purge"=>"true",
+                   "notify"=>"Class[Apache::Service]",
+                   "require"=>"Package[httpd]"})
   end
   it do
-    should contain_group('$::tomcat::params::group').
-             with({"ensure"=>"present"})
+    is_expected.to contain_file('$apache::params::conf_dir/$apache::params::conf_file').
+             with({"ensure"=>"file",
+                   "content"=>"template($conf_template)",
+                   "notify"=>"Class[Apache::Service]",
+                   "require"=>"Package[httpd]"})
   end
 end
 
@@ -182,7 +368,7 @@ template option when running retrospec.
 
 Setting the `--enable-user-templates` option will tell retrospec to use the default user template location.
 
-The default location for the templates when using this variable is ~/.puppet_retrospec_templates
+The default user location for the templates when using this variable is ~/.puppet_retrospec_templates
 
 If you wish to override ~/.puppet_retrospec_templates location you can use the following option
 `--template-dir`
@@ -192,6 +378,37 @@ If you set the `--template-dir` option you are not required to set the set `--en
 Example:
 `--template-dir=~/my_templates`
 
+Adding New Templates
+======================
+Should you ever need to add new templates or normal files of any kind retrospec will automatically render and copy the template file
+to the module path if you place a file inside the templates/module_files directory.  The cool thing about this feature
+is that retrospec will recursively create the same directory structure you make inside the module_files directory inside your
+module.  Files do not need to end in .erb will still be rendered as a erb template.
+
+This follows the convention over configuration pattern so no directory name or filename is required when running retrospec.
+Just put the template file in the directory where you want it (under module_files) and name it exactly how you want it to appear in the module and retrospec
+will take care of the rest.  Please note that any file ending in .erb will have this extension automatically removed.
+
+Example:
+
+```shell
+templates/
+├── acceptance_spec_test.erb
+├── module_files
+│   ├── Gemfile
+│   ├── Rakefile
+│   └── spec
+│       ├── acceptance
+│       │   └── nodesets
+│       │       ├── centos-59-x64.yml
+│       │       ├── centos-64-x64-pe.yml
+│       │       └── ubuntu-server-1404-x64.yml
+│       ├── shared_contexts.rb
+│       ├── spec_helper.rb
+│       └── spec_helper_acceptance.rb
+└── resource_spec_file.erb
+```
+
 Beaker Testing
 =================
 Beaker is Puppetlabs acceptance testing framework that you use to test puppet code on real machines.  Beaker is fairly new
@@ -203,6 +420,9 @@ acceptance tests are not created.  However at a later time they will be enabled
 
 `--enable-beaker-tests`
 
+I am no expert in Beaker so if you see an issue with the templates, acceptance_spec_helper or other workflow, please issue
+a PR.
+
 Troubleshooting
 ===============
 If you see the following, this error means that you need to add a fixture to the fixtures file.
@@ -219,6 +439,18 @@ See [fixtures doc](https://github.com/puppetlabs/puppetlabs_spec_helper#using-fi
      # ./spec/defines/instance/source_spec.rb:34:in `block (2 levels) in <top (required)>'
 ```
 
+If you see something like the following, this means your current module is using a much older version of Rspec.  Retrospec
+using Rspec 3 syntax so you need to update your rspec version.  If you have tests that using older rspec syntax, take a look
+at [transpec](https://github.com/yujinakayama/transpec)
+
+```shell
+   103) apache::vhost
+        Failure/Error: is_expected.to contain_file('').
+        NameError:
+          undefined local variable or method `is_expected' for #<RSpec::Core::ExampleGroup::Nested_59:0x007ff9eaab75e8>
+        # ./spec/defines/vhost_spec.rb:103:in `block (2 levels) in <top (required)>'
+
+```
 Running Tests
 =============
 Puppet-retrospec tests its code against real modules downloaded directly from puppet forge. 

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/retrospec/helpers.rb

@@ -80,10 +80,6 @@ class Helpers
     File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
   end
 
-
-
-
-
   def self.safe_copy_file(src, dest)
     if File.exists?(dest) and not File.zero?(dest)
       $stderr.puts "!! #{dest} already exists"
@@ -109,18 +105,19 @@ class Helpers
     end
   end
 
-  def self.safe_create_file(filename, content)
-    if File.exists? filename
-      old_content = File.read(filename)
+  def self.safe_create_file(filepath, content)
+    if File.exists? filepath
+      old_content = File.read(filepath)
       # if we did a better comparison of content we could be smarter about when we create files
-      if old_content != content or not File.zero?(filename)
-        $stderr.puts "!! #{filename} already exists and differs from template"
+      if old_content != content or not File.zero?(filepath)
+        $stderr.puts "!! #{filepath} already exists and differs from template"
       end
     else
-      File.open(filename, 'w') do |f|
+      safe_mkdir(File.dirname(filepath)) unless File.exists? File.dirname(filepath)
+      File.open(filepath, 'w') do |f|
         f.puts content
       end
-      puts " + #{filename}"
+      puts " + #{filepath}"
     end
   end
 end

data/lib/retrospec/puppet_module.rb

@@ -1,5 +1,5 @@
 require 'singleton'
-
+require 'puppet/face'
 module Utilities
   class PuppetModule
     attr_writer :module_path
@@ -72,6 +72,15 @@ module Utilities
       else
         files = Dir.glob("#{manifest_dir}/**/*.pp")
         warn "No puppet manifest files found at #{manifest_dir}" if files.length < 1
+        # validate the manifest files, because if one files doesn't work it affects everything
+        files.each do |file|
+          begin
+            Puppet::Face[:parser, '0.0.1'].validate(file)
+          rescue SystemExit => e
+            puts "Manifest file: #{file} has parser errors, please fix and re-check using\n puppet parser validate #{file}"
+            exit 1
+          end
+        end
       end
       dir
     end
@@ -160,4 +169,3 @@ module Utilities
     end
   end
 end
-

data/lib/retrospec/templates/acceptance_spec_test.erb

@@ -9,7 +9,7 @@ class { '<%= @type.name %>':
   <%- if v.nil? -%>
   <%= "#{k} => 'place_value_here'," %>
   <%- else -%>
-  <%= "##{k} => #{v}," %>
+  <%= "##{k} => #{variable_value(v)}," %>
   <%- end -%>
 <%- end -%>
 }

data/lib/retrospec/templates/module_files/.gitignore.erb

@@ -0,0 +1,8 @@
+.*.sw?
+pkg
+spec/fixtures
+.rspec_system
+.vagrant
+.bundle
+vendor
+.idea

data/lib/retrospec/templates/module_files/Gemfile

@@ -0,0 +1,29 @@
+source "https://rubygems.org"
+
+group :test do
+gem "rake"
+gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.3'
+gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
+gem "puppetlabs_spec_helper"
+gem 'rspec-puppet-utils', :git => 'https://github.com/Accuity/rspec-puppet-utils.git'
+gem 'hiera-puppet-helper', :git => 'https://github.com/bobtfish/hiera-puppet-helper.git'
+<%- if enable_beaker_tests? -%>
+    gem "beaker", :git => 'https://github.com/puppetlabs/beaker.git'
+    gem "beaker-rspec", :git => 'https://github.com/puppetlabs/beaker-rspec.git'
+    gem "vagrant-wrapper"
+    gem 'serverspec'
+<%- end -%>
+# there seems to be a bug with puppet-blacksmith and metadata-json-lint
+# removing metadata for now
+gem "metadata-json-lint"
+gem 'puppet-syntax'
+gem 'puppet-lint'
+end
+
+group :development do
+gem "travis"
+gem "travis-lint"
+gem "puppet-blacksmith"
+gem "guard-rake"
+end
+

data/lib/retrospec/templates/{shared_context.erb → module_files/spec/shared_contexts.rb}

@@ -5,7 +5,7 @@ require 'hiera-puppet-helper'
 # I only assume its data, but it could be anything
 hiera_config_file = File.expand_path(File.join(File.dirname(__FILE__), '..','data', 'hiera.yaml'))
 
-# hiera_file and hiera_data are mutally exclusive contexts.
+# hiera_config and hiera_data are mutually exclusive contexts.
 
 shared_context :hiera do
     # example only,
@@ -29,6 +29,7 @@ shared_context :windows_hiera do
     end
 end
 
+# you cannot use this in addition to any of the hiera_data contexts above
 shared_context :real_hiera_data do
     let(:hiera_config) do
        hirea_config_file

data/lib/retrospec/templates/{spec_helper_file.erb → module_files/spec/spec_helper.rb}

@@ -6,5 +6,5 @@ require 'rspec-puppet-utils'
 
 RSpec.configure do |c|
     c.formatter = 'documentation'
-    config.mock_with :rspec
+    c.mock_with :rspec
 end