From 349df92cb01a0b33f7d2d8bbc6bcdcd733de4331 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Thu, 23 Apr 2015 16:41:52 -0700 Subject: [PATCH 1/4] set stdlib requirement to 4.6.0 --- .fixtures.yml | 4 ++-- metadata.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 3e4caa9..e64e467 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,8 +1,8 @@ fixtures: repositories: stdlib: - repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git' - ref: '4.2.0' + repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git' + ref: '4.6.0' wget: repo: 'git://github.com/maestrodev/puppet-wget.git' ref: 'v1.2.2' diff --git a/metadata.json b/metadata.json index 7021560..f0eac8c 100644 --- a/metadata.json +++ b/metadata.json @@ -13,7 +13,7 @@ { "operatingsystem": "Scientific", "operatingsystemrelease": [ "5", "6", "7" ] } ], "dependencies": [ - { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 < 5.0.0" }, + { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.6.0 < 5.0.0" }, { "name": "maestrodev/wget", "version_requirement": ">= 1.2.2" }, { "name": "rodjek/logrotate", "version_requirement": ">= 1.1.1" } ] From 773e16b67739fcedb388aa45fd967c6ecb68509b Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Thu, 23 Apr 2015 17:01:06 -0700 Subject: [PATCH 2/4] add metadata-json-lint gem Needed by rake metadata.json validation target. --- Gemfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index ce03a3c..2614884 100644 --- a/Gemfile +++ b/Gemfile @@ -13,20 +13,21 @@ else end group :development, :test do - gem 'rake', :require => false + gem 'rake', :require => false # https://github.com/rspec/rspec-core/issues/1864 gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]} - gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', '>= 1.1.0', :require => false - gem 'puppet-syntax', :require => false + gem 'puppetlabs_spec_helper', :require => false + gem 'puppet-lint', '>= 1.1.0', :require => false + gem 'puppet-syntax', :require => false gem 'rspec-puppet', '~> 2.1.0', :require => false + gem 'metadata-json-lint', :require => false end group :beaker do - gem 'serverspec', :require => false - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'pry', :require => false + gem 'serverspec', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', :require => false + gem 'pry', :require => false end # vim:ft=ruby From 18c08a586968651ec39fe2e34bc67f4c082c4ed5 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Thu, 23 Apr 2015 17:07:56 -0700 Subject: [PATCH 3/4] add :validate to default rake target list --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 94dea10..4fcf788 100644 --- a/Rakefile +++ b/Rakefile @@ -10,7 +10,7 @@ PuppetLint::RakeTask.new :lint do |config| end task :default => [ - :syntax, + :validate, :lint, :spec, ] From 4c0410672029046ae0ff4de42e7a406e64e8b1dc Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Thu, 23 Apr 2015 17:18:01 -0700 Subject: [PATCH 4/4] pull fixtures repos via https --- .fixtures.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index e64e467..5247480 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -4,10 +4,10 @@ fixtures: repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git' ref: '4.6.0' wget: - repo: 'git://github.com/maestrodev/puppet-wget.git' + repo: 'https://github.com/maestrodev/puppet-wget.git' ref: 'v1.2.2' logrotate: - repo: 'git://github.com/rodjek/puppet-logrotate.git' + repo: 'https://github.com/rodjek/puppet-logrotate.git' # The current forge release (1.1.1) of logrotate is not compatible with # the future parser. See: # https://github.com/rodjek/puppet-logrotate/pull/39