Skip to content

Commit

Permalink
Remove management of rack gem
Browse files Browse the repository at this point in the history
This code doesn't do anything.
rack is a dependency of sinatra which the module is already installing.
  • Loading branch information
alexjfisher committed May 8, 2017
1 parent 1d0c344 commit eef5801
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 18 deletions.
18 changes: 9 additions & 9 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
fixtures:
repositories:
stdlib:
repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
ref: "4.15.0"
ruby: "git://github.com/puppetlabs/puppetlabs-ruby.git"
gcc: "git://github.com/puppetlabs/puppetlabs-gcc.git"
pe_gem: "git://github.com/puppetlabs/puppetlabs-pe_gem.git"
make: "git://github.com/voxpupuli/puppet-make.git"
inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git"
vcsrepo: "git://github.com/puppetlabs/puppetlabs-vcsrepo.git"
git: "git://github.com/puppetlabs/puppetlabs-git.git"
ruby: "https://github.com/puppetlabs/puppetlabs-ruby.git"
gcc: "https://github.com/puppetlabs/puppetlabs-gcc.git"
pe_gem: "https://github.com/puppetlabs/puppetlabs-pe_gem.git"
make: "https://github.com/voxpupuli/puppet-make.git"
inifile: "https://github.com/puppetlabs/puppetlabs-inifile.git"
vcsrepo: "https://github.com/puppetlabs/puppetlabs-vcsrepo.git"
git: "https://github.com/puppetlabs/puppetlabs-git.git"
portage:
repo: "git://github.com/gentoo/puppet-portage.git"
repo: "https://github.com/gentoo/puppet-portage.git"
ref: "2.3.0"
symlinks:
r10k: "#{source_dir}"
7 changes: 0 additions & 7 deletions manifests/webhook/package.pp
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@
before => Service['webhook'],
}
}
if !defined(Package['rack']) {
package { 'rack':
ensure => installed,
provider => $provider,
before => Service['webhook'],
}
}
if (! $is_pe_server) {
if !defined(Package['webrick']) {
package { 'webrick':
Expand Down
2 changes: 0 additions & 2 deletions spec/classes/webhook/package_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
provider: 'puppet_gem'
)
end
it { is_expected.to contain_package('rack').with(ensure: 'installed') }
it { is_expected.not_to contain_package('webrick') }
it { is_expected.not_to contain_package('json') }
end
Expand All @@ -40,7 +39,6 @@
it { is_expected.to contain_package('sinatra').with(ensure: 'installed') }
it { is_expected.to contain_package('webrick').with(ensure: 'installed') }
it { is_expected.to contain_package('json').with(ensure: 'installed') }
it { is_expected.to contain_package('rack').with(ensure: 'installed') }
end
end
end
Expand Down

0 comments on commit eef5801

Please sign in to comment.