From 4bf961ca415db27e4881bdfbdeb9d14c77070d92 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 11 Apr 2014 11:54:21 -0700 Subject: [PATCH 1/4] update .gitignore --- .gitignore | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index df21ceb..cdc123f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,11 @@ -pkg/ -spec/fixtures/manifests/ -spec/fixtures/modules/ +.bundle Gemfile.lock *.orig -*.rej *.patch +pkg/ +*.rej .rspec_system/ +spec/fixtures/manifests/ +spec/fixtures/modules/ *.swp +.vagrant From 521a11462692d00e4115bdcb2a5b4101279d1aa5 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 11 Apr 2014 11:54:35 -0700 Subject: [PATCH 2/4] update travis matrix --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5ebb51e..2165977 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,5 +19,6 @@ matrix: env: PUPPET_GEM_VERSION="~> 2.7" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 2.7" + fast_finish: true notifications: email: false From 293eda0f685fc5dbd8bfcbdc8452f4b04704314b Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 11 Apr 2014 11:56:32 -0700 Subject: [PATCH 3/4] update LICENSE copyright notice --- LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE b/LICENSE index 910ad2e..4c5c14d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright 2012 Massachusetts Institute of Technology +Copyright (C) 2013-2014 Joshua Hoblitt Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby From 6ea41b27ae0917cca1af20a50f375ca1d3f03859 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 11 Apr 2014 11:58:48 -0700 Subject: [PATCH 4/4] tidy Rakefile formatting --- Rakefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index 4150a7f..af17dd6 100644 --- a/Rakefile +++ b/Rakefile @@ -1,15 +1,17 @@ require 'puppetlabs_spec_helper/rake_tasks' -require 'rspec-system/rake_task' require 'puppet-syntax/tasks/puppet-syntax' require 'puppet-lint/tasks/puppet-lint' +require 'rspec-system/rake_task' PuppetLint.configuration.send("disable_class_inherits_from_params_class") -PuppetLint.configuration.ignore_paths = ['pkg/**/*.pp', 'spec/**/*.pp', 'tests/**/*.pp'] +PuppetLint.configuration.ignore_paths = [ + 'pkg/**/*.pp', + 'spec/**/*.pp', + 'tests/**/*.pp', +] task :default => [ :syntax, :lint, :spec, ] - -# vim:ft=ruby