From 90cc951753edeb3380b0ee6193c4d6febdc84a18 Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Sun, 15 Feb 2015 10:45:25 -0800 Subject: [PATCH] get rid of builddep --- examples/builddep.pp | 5 +++-- manifests/builddep.pp | 16 ---------------- metadata.json | 2 +- spec/defines/builddep_spec.rb | 19 ------------------- 4 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 manifests/builddep.pp delete mode 100644 spec/defines/builddep_spec.rb diff --git a/examples/builddep.pp b/examples/builddep.pp index 8b4f796..67cc86b 100644 --- a/examples/builddep.pp +++ b/examples/builddep.pp @@ -1,2 +1,3 @@ -class { 'apt': } -apt::builddep{ 'glusterfs-server': } +package{ 'glusterfs-server': + install_options => 'build-dep', +} diff --git a/manifests/builddep.pp b/manifests/builddep.pp deleted file mode 100644 index 3a059c2..0000000 --- a/manifests/builddep.pp +++ /dev/null @@ -1,16 +0,0 @@ -# builddep.pp - -define apt::builddep() { - include apt::update - - exec { "apt-builddep-${name}": - command => "/usr/bin/apt-get -y --force-yes build-dep ${name}", - logoutput => 'on_failure', - require => Exec['apt_update'], - } - - # Need anchor to provide containment for dependencies. - anchor { "apt::builddep::${name}": - require => Class['apt::update'], - } -} diff --git a/metadata.json b/metadata.json index 4c0e3d8..6135d62 100644 --- a/metadata.json +++ b/metadata.json @@ -35,6 +35,6 @@ } ], "dependencies": [ - {"name":"puppetlabs/stdlib","version_requirement":">= 2.2.1"} + {"name":"puppetlabs/stdlib","version_requirement":">= 4.5.0"} ] } diff --git a/spec/defines/builddep_spec.rb b/spec/defines/builddep_spec.rb deleted file mode 100644 index 41152d5..0000000 --- a/spec/defines/builddep_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'spec_helper' -describe 'apt::builddep', :type => :define do - - let(:facts) { { :lsbdistid => 'Debian', :osfamily => 'Debian' } } - let(:title) { 'my_package' } - - describe "defaults" do - it { should contain_exec("apt-builddep-my_package").that_requires('Exec[apt_update]').with({ - 'command' => "/usr/bin/apt-get -y --force-yes build-dep my_package", - 'logoutput' => 'on_failure' - }) - } - it { should contain_anchor("apt::builddep::my_package").with({ - 'require' => 'Class[Apt::Update]', - }) - } - end - -end -- 2.45.2