switch to puppetlabs_spec_helper

Removes librarian-puppet since puppetlabs_spec_helper
can now handle installing modules from the Forge.

.fixtures.yml

@@ -1,3 +1,7 @@
 fixtures:
   symlinks:
     nginx: "#{source_dir}"
+  forge_modules:
+    apt: "puppetlabs/apt"
+    concat: "puppetlabs/concat"
+    stdlib: "puppetlabs/stdlib"

.gitignore

@@ -1,8 +1,6 @@
 files/server_test.crt
 files/server_test.pem
 pkg/
-.librarian/
-.tmp/
 pkg/
 Gemfile.lock
 spec/fixtures/

.travis.yml

@@ -4,11 +4,11 @@ branches:
   - refactor
   - gh-pages
 language: ruby
-script: "bundle exec rake --rakefile $PWD/.travis/Rakefile spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+bundler_args: --without rake
 rvm:
   - 1.9.3
   - 2.0.0
-gemfile: .travis/Gemfile
 env:
   matrix:
     - PUPPET_GEM_VERSION="~> 2.7.0"
@@ -17,9 +17,7 @@ matrix:
   exclude:
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 2.7.0"
-      gemfile: .travis/Gemfile
     - rvm: 2.0.0
       env: PUPPET_GEM_VERSION="~> 2.7.0"
-      gemfile: .travis/Gemfile
 notifications:
   email: false  

.travis/Gemfile

@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-group :rake do
-  gem 'puppetlabs_spec_helper'
-  gem 'librarian-puppet', '<1.1.0'
-  gem 'open3_backport', :platforms => :ruby_18
-  gem 'json',           :platforms => :ruby_18
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end

.travis/Rakefile

@@ -1,8 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-
-# use librarian-puppet to manage fixtures instead of .fixtures.yml
-# offers more possibilities like explicit version management, forge downloads,...
-task :librarian_spec_prep do
-  sh "librarian-puppet install --path=$PWD/spec/fixtures/modules/"
-end
-task :spec_prep => :librarian_spec_prep

Gemfile

@@ -1,13 +1,24 @@
 source 'https://rubygems.org'
 
+group :test do
+  gem 'rest-client', '~> 1.6.8', :require => false, :platforms => :ruby_18
+end
+
+group :rake, :test do
+  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'puppet-blacksmith',       :require => false
+  gem 'rspec-system-puppet',     :require => false
+end
+
 group :rake do
-  gem 'puppet',       '>=3.0.1'
   gem 'rspec-puppet', '>=1.0.1'
   gem 'rake',         '>=0.9.2.2'
   gem 'puppet-lint',  '>=0.1.12'
-  gem 'puppetlabs_spec_helper'
-  gem 'puppet-blacksmith'
-  gem 'librarian-puppet', '<1.1.0'
-  gem 'rspec-system-puppet',     :require => false
   gem 'rspec-system-serverspec', :require => false
 end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end

Puppetfile

@@ -1,5 +0,0 @@
-forge 'http://forge.puppetlabs.com'
-
-mod 'puppetlabs/stdlib', '>= 3.0.0'
-mod 'puppetlabs/apt',    '>= 1.0.0'
-mod 'puppetlabs/concat', '>= 1.1.0'

Puppetfile.lock

@@ -1,13 +0,0 @@
-FORGE
-  remote: http://forge.puppetlabs.com
-  specs:
-    puppetlabs/apt (1.2.0)
-      puppetlabs/stdlib (>= 2.2.1)
-    puppetlabs/concat (1.1.0)
-    puppetlabs/stdlib (4.1.0)
-
-DEPENDENCIES
-  puppetlabs/apt (>= 1.0.0)
-  puppetlabs/concat (>= 1.1.0)
-  puppetlabs/stdlib (>= 3.0.0)
-

Rakefile

@@ -9,11 +9,4 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet_blacksmith/rake_tasks'
 require 'rspec-system/rake_task'
 
-# use librarian-puppet to manage fixtures instead of .fixtures.yml
-# offers more possibilities like explicit version management, forge downloads,...
-task :librarian_spec_prep do
- sh "librarian-puppet install --path=spec/fixtures/modules/"
-end
-task :spec_prep => :librarian_spec_prep
-
 task :default => [:clean, :spec]