diff options
| author | Seth Vargo <sethvargo@gmail.com> | 2013-06-07 09:32:28 -0700 |
|---|---|---|
| committer | Seth Vargo <sethvargo@gmail.com> | 2013-06-07 09:32:28 -0700 |
| commit | e201aca7af925a88f2192d3eaf0c994f7029837f (patch) | |
| tree | b153b2083ead6d5c5fd844c68e085324a432468b | |
| parent | 451bd0a12a60d697891d08f22856864bd65bad5b (diff) | |
| download | chef-zero-e201aca7af925a88f2192d3eaf0c994f7029837f.tar.gz | |
Downgrade Puma so Chef Zero runs on Windows
| -rw-r--r-- | .travis.yml | 21 | ||||
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | chef-zero.gemspec | 2 | ||||
| -rw-r--r-- | spec/run.rb | 26 |
4 files changed, 28 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index 49ff340..da3c821 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,19 @@ -rvm: - - 1.8.7 - - 1.9.2 - - 1.9.3 - - 2.0.0 - - jruby-19mode - script: bundle exec rake spec matrix: include: + - rvm: 1.8.7 + env: SKIP_PEDANT=true + - rvm: 1.9.3 - rvm: 1.9.3 gemfile: gemfiles/gemfile.latest-pedant + - rvm: 1.9.3 + env: SERVER=thin + - rvm: jruby-19mode + env: SKIP_PEDANT=true + - rvm: 2.0.0 + - rvm: 2.0.0 + env: SERVER=thin allow_failures: - - rvm: 1.8.7 # We support 1.8.7, but chef-pedant doesn't - - rvm: 2.0.0 # chef-pedant has at least one failure in 2.0.0 - - rvm: jruby-19mode # Mixlib Shellout uses fork+exec + - rvm: jruby-19mode - gemfile: gemfiles/gemfile.latest-pedant @@ -4,5 +4,5 @@ require 'bundler/gem_tasks' require 'chef_zero/version' task :spec do - sh 'ruby spec/run.rb' + require File.expand_path('spec/run') end diff --git a/chef-zero.gemspec b/chef-zero.gemspec index 3918c90..ca9e1a7 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |s| s.email = 'jkeiser@opscode.com' s.homepage = 'http://www.opscode.com' - s.add_dependency 'puma', '~> 2.0' + s.add_dependency 'puma', '~> 1.6' s.add_dependency 'mixlib-log', '~> 1.3' s.add_dependency 'hashie', '~> 2.0' s.add_dependency 'moneta', '< 0.7.0' # For chef, see CHEF-3721 diff --git a/spec/run.rb b/spec/run.rb index e4fad0e..e122c1a 100644 --- a/spec/run.rb +++ b/spec/run.rb @@ -5,21 +5,25 @@ require 'bundler/setup' require 'chef_zero/server' require 'rspec/core' -require 'pedant' -require 'pedant/opensource' - server = ChefZero::Server.new(:port => 8889) server.start_background -Pedant.config.suite = 'api' -Pedant.config[:config_file] = 'spec/support/pedant.rb' -Pedant.setup([ - '--skip-validation', - '--skip-authentication', - '--skip-authorization' -]) +unless ENV['SKIP_PEDANT'] + require 'pedant' + require 'pedant/opensource' + + Pedant.config.suite = 'api' + Pedant.config[:config_file] = 'spec/support/pedant.rb' + Pedant.setup([ + '--skip-validation', + '--skip-authentication', + '--skip-authorization' + ]) -result = RSpec::Core::Runner.run(Pedant.config.rspec_args) + result = RSpec::Core::Runner.run(Pedant.config.rspec_args) +else + result = 0 +end server.stop exit(result) |