Skip to content

Commit

Permalink
modulesync: pin rest-client for Ruby 1.8 compat, don't install blacks…
Browse files Browse the repository at this point in the history
…mith in tests
  • Loading branch information
Dominic Cleal committed Dec 3, 2014
1 parent 56b8044 commit 55387e9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -18,3 +18,4 @@ matrix:
# No support for Ruby 2.0 before Puppet 3.2
- rvm: 2.0.0
env: PUPPET_VERSION=2.7.0
bundler_args: --without development
4 changes: 3 additions & 1 deletion Gemfile
Expand Up @@ -10,6 +10,8 @@ gem 'rspec-puppet', '>= 1'
gem 'puppetlabs_spec_helper', '>= 0.8.0'
gem 'puppet-lint', '>= 1'
gem 'simplecov'
gem 'puppet-blacksmith', '>= 3.1.0'
gem 'puppet-blacksmith', '>= 3.1.0', {"groups"=>["development"]}
gem 'rest-client', '< 1.7', {"platforms"=>["ruby_18"], "groups"=>["development"]}
gem 'mime-types', '~> 1.0', {"platforms"=>["ruby_18"], "groups"=>["development"]}

# vim:ft=ruby
14 changes: 9 additions & 5 deletions Rakefile
Expand Up @@ -3,13 +3,17 @@

require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppet_blacksmith/rake_tasks'

# blacksmith isn't always present, e.g. on Travis with --without development
begin
require 'puppet_blacksmith/rake_tasks'
Blacksmith::RakeTask.new do |t|
t.tag_pattern = "%s"
end
rescue LoadError
end

PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'

Blacksmith::RakeTask.new do |t|
t.tag_pattern = "%s"
end

task :default => [:validate, :lint, :spec]

0 comments on commit 55387e9

Please sign in to comment.