Skip to content

Commit

Permalink
Merge pull request #41 from jlambert121/modulesync
Browse files Browse the repository at this point in the history
normalize common files
  • Loading branch information
jlambert121 committed Dec 21, 2014
2 parents b274e79 + 48f59df commit 0b484a2
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 32 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.*.sw?
pkg/
Gemfile.lock
.vendor/
vendor/
spec/fixtures/
.vagrant/
Expand Down
9 changes: 7 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
---
language: ruby
bundler_args: --without system_tests
cache: bundler
bundler_args: --without system_tests development
script: "bundle exec rake validate && bundle exec rake test SPEC_OPTS='--format documentation'"
sudo: false
matrix:
fast_finish: true
include:
Expand Down Expand Up @@ -57,6 +59,9 @@ notifications:
email: false
hipchat:
rooms:
- secure: a9p2xASxBbsRIHeBu598lOydZteAJu3Y33orhaw8dNIKx0NRY+Fpvko0m6dF\nifKELI0bixgl7684ML0CbNim+fCd2E0YWk+futhXSBvSCpAhNl+MLJMwgNW5\ncf8stHNEtNpQoDAPeVUeYQUDvDSduj4GHT6btvmDd90Y/dau+2g=
- secure: KyYTLx7Fv+6cA7JkOAzLChpBHy6ITJfKstZEdB8gZPBlUvrDNPOX0f+6CWMrMkIdCbWK2XS0P7YJxXFg2iouye9mRgeC+5fDpUwEq0T0WWN4mbLS6XGqHxfzsUGA+mXNEhlc2XlxMOglF768UYVRZ3FuHt2vAoWRPGzjJvsKNGk=
template:
- '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} (<a href="%{build_url}">Details</a>/<a href="%{compare_url}">Change view</a>)'
format: html
on_success: always
on_failure: always
18 changes: 10 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

group :development, :unit_tests do
group :unit_tests do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git', :tag => 'v2.0.0'
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
gem 'json', :require => false
gem 'puppet-lint', '1.0.1', :require => false
gem 'puppet-syntax', :require => false
gem 'metadata-json-lint', :require => false
gem 'vagrant-wrapper'
gem 'json', :require => false
end
group :development do
gem 'simplecov', :require => false
gem 'guard-rake', :require => false
end
group :system_tests do
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
gem 'vagrant-wrapper', :require => false
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
end

if facterversion = ENV['FACTER_GEM_VERSION']
Expand All @@ -28,4 +31,3 @@ else
gem 'puppet', :require => false
end

# vim:ft=ruby
7 changes: 7 additions & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
notification :off

guard 'rake', :task => 'test' do
watch(%r{^manifests\/(.+)\.pp$})
watch(%r{^spec\/classes\/(.+)\.rb$})
watch(%r{^spec\/defines\/(.+)\.rb$})
end
11 changes: 0 additions & 11 deletions spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

This file was deleted.

11 changes: 0 additions & 11 deletions spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

This file was deleted.

0 comments on commit 0b484a2

Please sign in to comment.