diff options
| author | John Keiser <jkeiser@opscode.com> | 2014-05-27 14:42:51 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2014-05-27 14:42:51 -0700 |
| commit | 8632d76b1ee03ccdf258bb6b23a0dacc3e4ada46 (patch) | |
| tree | d590712599a17dc08d575ff6cceb3f10b1e8ac19 | |
| parent | 7c78d743d7867b59912da2edc30414744a4101f5 (diff) | |
| download | chef-zero-8632d76b1ee03ccdf258bb6b23a0dacc3e4ada46.tar.gz | |
Run chef specs against chef-zero in travis on each checkin
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Rakefile | 10 | ||||
| -rw-r--r-- | gemfiles/berkshelf.gemfile | 15 | ||||
| -rw-r--r-- | gemfiles/latest-chef.gemfile | 5 |
6 files changed, 42 insertions, 9 deletions
@@ -16,3 +16,4 @@ test/tmp test/version_tmp tmp rspec.failures +gemfiles/*.lock diff --git a/.travis.yml b/.travis.yml index 6e5b74f..aeb3329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,28 +7,30 @@ script: bundle exec rake spec matrix: include: - rvm: 1.8.7 - gemfile: Gemfile - rvm: 1.8.7 env: SKIP_PEDANT=true gemfile: gemfiles/no-pedant.gemfile - rvm: 1.9.3 gemfile: gemfiles/latest-pedant.gemfile - rvm: jruby-19mode - gemfile: Gemfile - rvm: jruby-19mode env: SKIP_PEDANT=true gemfile: gemfiles/no-pedant.gemfile - rvm: 2.0.0 - gemfile: Gemfile - rvm: 2.1.1 - gemfile: Gemfile - rvm: 2.1.1 env: CHEF_FS=true - gemfile: Gemfile + - rvm: 2.1.1 + script: bundle exec rake chef_spec + allow_failures: - rvm: 1.8.7 - gemfile: Gemfile - rvm: jruby-19mode - gemfile: Gemfile - - rvm: 1.9.3 + - rvm: 2.1.1 gemfile: gemfiles/latest-pedant.gemfile + - rvm: 2.1.1 + gemfile: gemfiles/latest-chef.gemfile + script: bundle exec rake chef_spec +# - rvm: 2.1.1 +# gemfile: gemfiles/berkshelf.gemfile +# script: bundle exec rake berkshelf_spec @@ -3,4 +3,4 @@ gemspec gem 'rest-client', :github => 'opscode/rest-client' gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => '4744d7f318b629ff60a0d22cf02296df36936397' -gem 'chef', :github => 'opscode/chef', :ref => 'd12cffbdfd4c55b3ddeec45f5bcb30719a298c83' +gem 'chef', :github => 'opscode/chef', :ref => '678b568eb29d8eae51a942e60a7b5e6786d69bdc' @@ -6,3 +6,13 @@ require 'chef_zero/version' task :spec do require File.expand_path('spec/run') end + +task :chef_spec do + gem_path = Bundler.environment.specs['chef'].first.full_gem_path + system("cd #{gem_path} && rspec spec/integration") +end + +task :berkshelf_spec do + gem_path = Bundler.environment.specs['berkshelf'].first.full_gem_path + system("cd #{gem_path} && thor spec:ci") +end diff --git a/gemfiles/berkshelf.gemfile b/gemfiles/berkshelf.gemfile new file mode 100644 index 0000000..ca99e91 --- /dev/null +++ b/gemfiles/berkshelf.gemfile @@ -0,0 +1,15 @@ +source 'https://rubygems.org' + +gemspec :path => "../" + +gem 'berkshelf', :github => 'berkshelf' + +# development dependencies of berkshelf +gem 'aruba', '~> 0.5' +gem 'fuubar', '~> 1.1' +gem 'rake', '~> 0.9' +gem 'rspec', '~> 2.13' +gem 'spork', '~> 0.9' +gem 'test-kitchen', '~> 1.2' +gem 'webmock', '~> 1.11' +gem 'yard', '~> 0.8' diff --git a/gemfiles/latest-chef.gemfile b/gemfiles/latest-chef.gemfile new file mode 100644 index 0000000..ba98724 --- /dev/null +++ b/gemfiles/latest-chef.gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +gemspec :path => "../" + +gem 'chef', :github => 'opscode/chef' |