diff options
| author | Seth Vargo <sethvargo@gmail.com> | 2013-05-19 21:34:08 -0500 |
|---|---|---|
| committer | Seth Vargo <sethvargo@gmail.com> | 2013-05-19 21:34:08 -0500 |
| commit | 3963e1b0a3fd322a5a94a9257a8e5af03eebf3c4 (patch) | |
| tree | d4633a5f45d021fe5a6f7c126456e894e59f883f | |
| parent | 8c7d90ec5e216f703e7a6d8751eefc2d06aa5362 (diff) | |
| download | chef-zero-3963e1b0a3fd322a5a94a9257a8e5af03eebf3c4.tar.gz | |
Add support for 1.8.7 (back)
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | lib/chef_zero/server.rb | 7 | ||||
| -rw-r--r-- | spec/run.rb | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 45acf6b..0812e87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ rvm: + - 1.8.7 - 1.9.2 - 1.9.3 - 2.0.0 @@ -1,4 +1,4 @@ source 'https://rubygems.org' gemspec -gem 'chef-pedant', github: 'opscode/chef-pedant', ref: '458a3eed8' +gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => '458a3eed8' diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb index 824a0dd..d8f2c7d 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -56,7 +56,12 @@ require 'chef_zero/endpoints/not_found_endpoint' module ChefZero class Server - DEFAULT_OPTIONS = { host: '127.0.0.1', port: 8889, log_level: :info, generate_real_keys: true } + DEFAULT_OPTIONS = { + :host => '127.0.0.1', + :port => 8889, + :log_level => :info, + :generate_real_keys => true + }.freeze def initialize(options = {}) options = DEFAULT_OPTIONS.merge(options) diff --git a/spec/run.rb b/spec/run.rb index b1cc74f..e4fad0e 100644 --- a/spec/run.rb +++ b/spec/run.rb @@ -8,7 +8,7 @@ require 'rspec/core' require 'pedant' require 'pedant/opensource' -server = ChefZero::Server.new(port: 8889) +server = ChefZero::Server.new(:port => 8889) server.start_background Pedant.config.suite = 'api' |