From 1a5f29f83f5674afd33395968f201761e36c3bc1 Mon Sep 17 00:00:00 2001
From: Don Reilly <don.reilly@q2ebanking.com>
Date: Mon, 7 Jul 2014 11:05:16 -0500
Subject: [PATCH] Removed symlinked r10k fixture/modules directory. Added r10k
 to .fixtures.yaml to allow puppetlabs_spec_helper to handle the symlinking of
 the module at runtime. Added /spec/fixture/module/.gitignore to keep empty
 directory for testing purposes. removed spec/fixtures exclusion from
 .gitignore to maintain the spec/fixtures/modules directory.

---
 .fixtures.yml                        | 2 ++
 .gitignore                           | 1 -
 spec/fixtures/modules/.gitignore     | 5 +++++
 spec/fixtures/modules/r10k/files     | 1 -
 spec/fixtures/modules/r10k/manifests | 1 -
 spec/fixtures/modules/r10k/templates | 1 -
 6 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 spec/fixtures/modules/.gitignore
 delete mode 120000 spec/fixtures/modules/r10k/files
 delete mode 120000 spec/fixtures/modules/r10k/manifests
 delete mode 120000 spec/fixtures/modules/r10k/templates

diff --git a/.fixtures.yml b/.fixtures.yml
index f5326019..240f8d54 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -9,3 +9,5 @@ fixtures:
     vcsrepo: "git://github.com/puppetlabs/puppetlabs-vcsrepo.git"
     git:     "git://github.com/puppetlabs/puppetlabs-git.git"
     portage: "git://github.com/gentoo/puppet-portage.git"
+  symlinks:
+    r10k:    "#{source_dir}"
diff --git a/.gitignore b/.gitignore
index e847ec82..1699eb7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .swp
 pkg
-spec/fixtures/
 spec/fixtures/manifests/site.pp
 .DS_Store
 *.swp
diff --git a/spec/fixtures/modules/.gitignore b/spec/fixtures/modules/.gitignore
new file mode 100644
index 00000000..4b67cb90
--- /dev/null
+++ b/spec/fixtures/modules/.gitignore
@@ -0,0 +1,5 @@
+# This keeps the modules directory available for fixtures
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/spec/fixtures/modules/r10k/files b/spec/fixtures/modules/r10k/files
deleted file mode 120000
index 84dafe8d..00000000
--- a/spec/fixtures/modules/r10k/files
+++ /dev/null
@@ -1 +0,0 @@
-../../../../files
\ No newline at end of file
diff --git a/spec/fixtures/modules/r10k/manifests b/spec/fixtures/modules/r10k/manifests
deleted file mode 120000
index 373b9920..00000000
--- a/spec/fixtures/modules/r10k/manifests
+++ /dev/null
@@ -1 +0,0 @@
-../../../../manifests
\ No newline at end of file
diff --git a/spec/fixtures/modules/r10k/templates b/spec/fixtures/modules/r10k/templates
deleted file mode 120000
index f8a06d1d..00000000
--- a/spec/fixtures/modules/r10k/templates
+++ /dev/null
@@ -1 +0,0 @@
-../../../../templates
\ No newline at end of file