summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Sluijters <daenney@users.noreply.github.com>2015-04-22 16:51:45 +0200
committerDaniele Sluijters <daenney@users.noreply.github.com>2015-04-22 16:51:45 +0200
commitee4481bb0479a6264b83c0ad9e4bc32aa2b66a0b (patch)
tree1838964837a9c378e853c2ba2c0f140afb678c53
parenta39191a843ed3a5fa9f5220ae2b2e1e01cc7beda (diff)
parent9a7123984dfd3c9ae95aa795963b74c4cde1ee14 (diff)
Merge pull request #8 from puppet-community/rake-travis-changelog
Rake travis changelog
-rw-r--r--.travis.yml8
-rw-r--r--CHANGELOG.md10
-rw-r--r--Gemfile11
-rw-r--r--Rakefile12
4 files changed, 16 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml
index f34c2e3..740091b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,21 @@
---
language: ruby
sudo: false
+
branches:
only:
- master
-bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+
+script: "bundle exec rake test SPEC_OPTS='--format documentation'"
+
matrix:
fast_finish: true
include:
- rvm: 2.1.6
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random"
- rvm: 2.1.6
+ env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random" FUTURE_PARSER="yes"
+ - rvm: 2.1.6
env: PUPPET_VERSION="~> 4.0" ORDERING="random"
allow_failures:
- env: PUPPET_VERSION="~> 4.0" ORDERING="random"
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..478fe63
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased][unreleased]
+### Added
+- Full configuration of unattended-upgrades and all possible options for `APT::Periodic`.
+- Test suite covering the current behaviour.
+- README with full documentation.
+- Boilerplate such as Gemfile, Travis configuration, LICENSE and so on.
diff --git a/Gemfile b/Gemfile
index a2f968e..cce9320 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,14 +9,3 @@ group :test do
gem "metadata-json-lint"
gem "rspec-puppet-facts"
end
-
-group :development do
- gem "travis"
- gem "travis-lint"
- gem "puppet-blacksmith"
-end
-
-group :system_tests do
- gem "beaker"
- gem "beaker-rspec"
-end
diff --git a/Rakefile b/Rakefile
index 1778d2a..2343b25 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,13 +4,6 @@ require 'puppet/vendor/semantic/lib/semantic' unless Puppet.version.to_f < 3.6
require 'puppet-lint/tasks/puppet-lint'
require 'puppet-syntax/tasks/puppet-syntax'
-# These gems aren't always present, for instance
-# on Travis with --without development
-begin
- require 'puppet_blacksmith/rake_tasks'
-rescue LoadError
-end
-
Rake::Task[:lint].clear
PuppetLint.configuration.relative = true
@@ -33,11 +26,6 @@ exclude_paths = [
PuppetLint.configuration.ignore_paths = exclude_paths
PuppetSyntax.exclude_paths = exclude_paths
-desc "Run acceptance tests"
-RSpec::Core::RakeTask.new(:acceptance) do |t|
- t.pattern = 'spec/acceptance'
-end
-
desc "Populate CONTRIBUTORS file"
task :contributors do
system("git log --format='%aN' | sort -u > CONTRIBUTORS")