diff --git a/.travis.yml b/.travis.yml index 7169a4d6..9fced467 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,10 @@ sudo: false language: ruby cache: bundler rvm: - - 2.4.1 - - 2.3.4 - - 2.2.7 + - 2.5.0 + - 2.4.3 + - 2.3.6 + - 2.2.9 gemfile: - test/gemfiles/Gemfile.chef-12 - test/gemfiles/Gemfile.chef-13 @@ -14,7 +15,7 @@ matrix: - gemfile: test/gemfiles/Gemfile.chef-master exclude: # Chef ~> 13 requires Ruby version >= 2.3.0 - - rvm: 2.2.7 + - rvm: 2.2.9 gemfile: test/gemfiles/Gemfile.chef-13 - - rvm: 2.2.7 + - rvm: 2.2.9 gemfile: test/gemfiles/Gemfile.chef-master diff --git a/CHANGELOG.md b/CHANGELOG.md index cb704c5d..124453fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# 0.7.0 / 2018-11-14 + +## Updates + +* OpenSUSE Leap support (#492) +* Legacy mode option (#504) +* Allow net-ssh 4.x (#506) +* Use sudo when running clean (#519) +* Configurable log level (#522) +* Debian 9 support (#524) +* Removed testing for EOL chefs and rubies, ad support for new rubies (#516, #528) +* Make chef version check configurable (#535) + # 0.6.0 / 2016-05-23 ## Changes and new features diff --git a/lib/chef/knife/solo_cook.rb b/lib/chef/knife/solo_cook.rb index d0229b5f..95358d70 100644 --- a/lib/chef/knife/solo_cook.rb +++ b/lib/chef/knife/solo_cook.rb @@ -9,7 +9,6 @@ class Knife # Approach ported from spatula (https://github.com/trotter/spatula) # Copyright 2009, Trotter Cashion class SoloCook < Knife - CHEF_VERSION_CONSTRAINT = ">=0.10.4" unless defined? CHEF_VERSION_CONSTRAINT include KnifeSolo::SshCommand include KnifeSolo::NodeConfigCommand @@ -152,6 +151,10 @@ def solo_legacy_mode Chef::Config[:solo_legacy_mode] || false end + def chef_version_constraint + Chef::Config[:solo_chef_version] || ">=0.10.4" + end + def log_level config_value(:log_level, Chef::Config[:log_level] || :warn).to_sym end @@ -310,8 +313,8 @@ def rsync(source_path, target_path, extra_opts = ['--delete-after', '-zt']) def check_chef_version ui.msg "Checking Chef version..." - unless chef_version_satisfies? CHEF_VERSION_CONSTRAINT - raise "Couldn't find Chef #{CHEF_VERSION_CONSTRAINT} on #{host}. Please run `knife solo prepare #{ssh_args}` to ensure Chef is installed and up to date." + unless chef_version_satisfies?(chef_version_constraint) + raise "Couldn't find Chef #{chef_version_constraint} on #{host}. Please run `knife solo prepare #{ssh_args}` to ensure Chef is installed and up to date." end if node_environment != '_default' && chef_version_satisfies?('<11.6.0') ui.warn "Chef version #{chef_version} does not support environments. Environment '#{node_environment}' will be ignored." diff --git a/lib/knife-solo/info.rb b/lib/knife-solo/info.rb index 74c5f18c..b5f5b392 100644 --- a/lib/knife-solo/info.rb +++ b/lib/knife-solo/info.rb @@ -1,6 +1,6 @@ module KnifeSolo def self.version - '0.7.0.pre3' + '0.8.0.pre1' end def self.post_install_message diff --git a/lib/knife-solo/librarian.rb b/lib/knife-solo/librarian.rb index 50ae7e31..154eb0b3 100644 --- a/lib/knife-solo/librarian.rb +++ b/lib/knife-solo/librarian.rb @@ -28,7 +28,7 @@ def env end def initial_config - "site 'http://supermarket.getchef.com/api/v1'" + "site 'https://supermarket.chef.io/api/v1'" end # Returns an array of strings to gitignore when bootstrapping