diff --git a/Gemfile b/Gemfile index 97ee7cc..7e7278f 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ group :development, :unit_tests do gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false + gem 'metadata-json-lint', :require => false gem 'pry', :require => false gem 'parallel_tests', '< 2.10.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') gem 'parallel_tests', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0') diff --git a/manifests/init.pp b/manifests/init.pp index 989b5b6..5a18523 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,3 +1,6 @@ class f5 { - class { 'f5::install': } + package { 'faraday': + ensure => present, + provider => 'puppet_gem', + } } diff --git a/manifests/install.pp b/manifests/install.pp deleted file mode 100644 index fdddca6..0000000 --- a/manifests/install.pp +++ /dev/null @@ -1,14 +0,0 @@ -# Private class -class f5::install { - if $::puppetversion and $::puppetversion =~ /Puppet Enterprise/ { - $provider = 'pe_gem' - } elsif $::puppetversion and versioncmp($::puppetversion, '4.0.0') >= 0 { - $provider = 'puppet_gem' - } else { - $provider = 'gem' - } - package { 'faraday': - ensure => present, - provider => $provider, - } -} diff --git a/metadata.json b/metadata.json index 9455951..eb62bde 100644 --- a/metadata.json +++ b/metadata.json @@ -31,6 +31,5 @@ } ], "dependencies": [ - {"name":"puppetlabs-pe_gem","version_requirement":">= 0.1.0 <1.0.0"} ] } diff --git a/spec/classes/coverage_spec.rb b/spec/classes/coverage_spec.rb new file mode 100644 index 0000000..c083569 --- /dev/null +++ b/spec/classes/coverage_spec.rb @@ -0,0 +1,3 @@ +require 'rspec-puppet' + +at_exit { RSpec::Puppet::Coverage.report! } diff --git a/spec/classes/f5_spec.rb b/spec/classes/f5_spec.rb new file mode 100644 index 0000000..975f3f3 --- /dev/null +++ b/spec/classes/f5_spec.rb @@ -0,0 +1,12 @@ +require 'spec_helper' + +describe 'f5' do + it { is_expected.to compile.with_all_deps } + it { is_expected.to contain_class('f5') } + it do + is_expected.to contain_package('faraday').with( + 'ensure' => 'present', + 'provider' => 'puppet_gem' + ) + end +end