Skip to content

Commit

Permalink
Add Strainer use for test
Browse files Browse the repository at this point in the history
Fix travis to use it.
  • Loading branch information
guilhem committed Feb 6, 2014
1 parent 03fb6e2 commit 99c8522
Show file tree
Hide file tree
Showing 9 changed files with 285 additions and 162 deletions.
29 changes: 25 additions & 4 deletions .gitignore
@@ -1,7 +1,28 @@
*.gem
*.rbc
.bundle
.cache
.config
.rvmrc
.yardoc
/Gemfile.lock
_yardoc
/coverage
/doc/
/pkg
/spec/reports
/Berksfile*
tmp
*~
*.tar*
\#*
.DS_Store
/spec/knife.rb
/spec/*.pem
/features/config.yml
*.sw[op]
\.\#*
rerun.txt
.rspec
.kitchen
bin
Gemfile.lock
Berksfile.lock
.vagrant
vendor
21 changes: 21 additions & 0 deletions .kitchen.yml
@@ -0,0 +1,21 @@
---
driver:
name: vagrant

driver_config:
require_chef_omnibus: true

platforms:
- name: ubuntu-10.04
- name: ubuntu-12.04
- name: centos-6.4
- name: centos-5.9

provisioner:
name: chef_zero

suites:
- name: default
run_list:
- "recipe[zabbix::default]"
attributes:
16 changes: 16 additions & 0 deletions .rubocop.yml
@@ -0,0 +1,16 @@
AllCops:
Excludes:
- vendor/**

AlignParameters:
Enabled: false
Encoding:
Enabled: false
HashSyntax:
Enabled: false
StringLiterals:
Enabled: false
LineLength:
Enabled: false
MethodLength:
Max: 30
11 changes: 6 additions & 5 deletions .travis.yml
@@ -1,7 +1,8 @@
language: ruby
gemfile:
- test/support/Gemfile
rvm:
- 1.9.2
- 1.9.3
script: BUNDLE_GEMFILE=test/support/Gemfile bundle exec rake test foodcritic
- 2.0.0
before_script:
- bundle exec berks install
bundler_args: --without integration
script:
- bundle exec strainer test --except kitchen
17 changes: 13 additions & 4 deletions Gemfile
@@ -1,5 +1,14 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gem 'test-kitchen'
gem 'berkshelf'
gem 'chefspec', '~> 2.0' # NOTE: ChefSpec 3 conflicts with Berkshelf.
gem "chef", "~> 11"
gem "json", "<= 1.7.7" # chef 11 dependency
gem "berkshelf", "~> 2.0.10"
gem "chefspec", "~> 3.0.2"
gem "foodcritic", "~> 3.0.3"
gem "strainer"
gem "rubocop"

group :integration do
gem "test-kitchen", "~> 1.1.1"
gem "kitchen-vagrant", "~> 0.14"
end

0 comments on commit 99c8522

Please sign in to comment.