summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.expeditor/update_dep.sh5
-rw-r--r--CHANGELOG.md8
-rw-r--r--Gemfile.lock10
-rw-r--r--Rakefile16
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/http.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/tiny_server.rb1
-rw-r--r--tasks/announce.rb2
-rw-r--r--tasks/templates/prerelease.md.erb9
-rw-r--r--tasks/templates/release.md.erb8
12 files changed, 43 insertions, 24 deletions
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh
index 14ef80463b..c9097d3dea 100644
--- a/.expeditor/update_dep.sh
+++ b/.expeditor/update_dep.sh
@@ -15,6 +15,11 @@ branch="expeditor/${GEM_NAME}_${VERSION}"
git checkout -b "$branch"
bundle install
+
+# it appears that the gem that triggers this script fires off this script before
+# the gem is actually available via bundler on rubygems.org.
+sleep 120
+
bundle exec rake dependencies:update
git add .
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bd6eb6a7d..ca98f21c64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,17 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.49 -->
-## [v14.4.49](https://github.com/chef/chef/tree/v14.4.49) (2018-08-24)
+<!-- latest_release 14.4.51 -->
+## [v14.4.51](https://github.com/chef/chef/tree/v14.4.51) (2018-08-24)
#### Merged Pull Requests
-- Pull in latest omnibus definitions + new inspec/train [#7581](https://github.com/chef/chef/pull/7581) ([tas50](https://github.com/tas50))
+- Update the announcement rake task with kitchen examples [#7583](https://github.com/chef/chef/pull/7583) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Update the announcement rake task with kitchen examples [#7583](https://github.com/chef/chef/pull/7583) ([tas50](https://github.com/tas50)) <!-- 14.4.51 -->
+- Simplify / fix our yard doc Rake task [#7580](https://github.com/chef/chef/pull/7580) ([tas50](https://github.com/tas50)) <!-- 14.4.50 -->
- Pull in latest omnibus definitions + new inspec/train [#7581](https://github.com/chef/chef/pull/7581) ([tas50](https://github.com/tas50)) <!-- 14.4.49 -->
- Fix rake task to build the correct gemspec on Chef [#7579](https://github.com/chef/chef/pull/7579) ([tas50](https://github.com/tas50)) <!-- 14.4.48 -->
- Modernize our Rakefile / Version bumping system [#7574](https://github.com/chef/chef/pull/7574) ([tas50](https://github.com/tas50)) <!-- 14.4.47 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ffc962653..b0f61e5996 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.49)
+ chef (14.4.51)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.49)
+ chef-config (= 14.4.51)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.4.49-universal-mingw32)
+ chef (14.4.51-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.49)
+ chef-config (= 14.4.51)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.4.49)
+ chef-config (14.4.51)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/Rakefile b/Rakefile
index 1c6480f00e..e42832c365 100644
--- a/Rakefile
+++ b/Rakefile
@@ -57,21 +57,17 @@ begin
task.options += ["--display-cop-names", "--no-color"]
end
rescue LoadError
- puts "chefstyle/rubocop is not available. gem install chefstyle to do style checking."
+ puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
end
begin
require "yard"
- DOC_FILES = [ "README.rdoc", "LICENSE", "spec/tiny_server.rb", "lib/**/*.rb" ].freeze
- namespace :yard do
- desc "Create YARD documentation"
+ DOC_FILES = [ "spec/tiny_server.rb", "lib/**/*.rb" ].freeze
- YARD::Rake::YardocTask.new(:html) do |t|
- t.files = DOC_FILES
- t.options = ["--format", "html"]
- end
+ YARD::Rake::YardocTask.new(:docs) do |t|
+ t.files = DOC_FILES
+ t.options = ["--format", "html"]
end
-
rescue LoadError
- puts "yard is not available. (sudo) gem install yard to generate yard documentation."
+ puts "yard is not available. bundle install first to make sure all dependencies are installed."
end
diff --git a/VERSION b/VERSION
index 013da1c5f0..393cd2fff1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.49 \ No newline at end of file
+14.4.51 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index b0bfd0810b..d8a51e8415 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "14.4.49".freeze
+ VERSION = "14.4.51".freeze
end
#
diff --git a/lib/chef/http.rb b/lib/chef/http.rb
index 016e81d12c..3f815b9eff 100644
--- a/lib/chef/http.rb
+++ b/lib/chef/http.rb
@@ -215,7 +215,7 @@ class Chef
# you to unlink the tempfile when you're done with it.
#
# @yield [tempfile] block to process the tempfile
- # @yieldparams [tempfile<Tempfile>] tempfile
+ # @yieldparam [tempfile<Tempfile>] tempfile
def streaming_request(path, headers = {}, tempfile = nil)
http_attempts ||= 0
url = create_url(path)
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 768078fc4b..261287e844 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.4.49")
+ VERSION = Chef::VersionString.new("14.4.51")
end
#
diff --git a/spec/tiny_server.rb b/spec/tiny_server.rb
index 4a6bdfb599..948bde04f2 100644
--- a/spec/tiny_server.rb
+++ b/spec/tiny_server.rb
@@ -16,7 +16,6 @@
# limitations under the License.
#
-require "rubygems"
require "webrick"
require "webrick/https"
require "rack"
diff --git a/tasks/announce.rb b/tasks/announce.rb
index 0399137eb0..b6b701f04b 100644
--- a/tasks/announce.rb
+++ b/tasks/announce.rb
@@ -1,5 +1,5 @@
#
-# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# Copyright:: Copyright 2016-2018, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tasks/templates/prerelease.md.erb b/tasks/templates/prerelease.md.erb
index 0c5c55cffc..9e9e33bbeb 100644
--- a/tasks/templates/prerelease.md.erb
+++ b/tasks/templates/prerelease.md.erb
@@ -24,3 +24,12 @@ $ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef -v <%= @ve
# In Windows Powershell
. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version <%= @version %> -channel current
```
+
+If you want to give this version a spin in Test Kitchen, create or add the following to your `kitchen.yml` file:
+
+```yaml
+provisioner:
+ product_name: chef
+ channel: current
+ product_version: <%= @version %>
+```
diff --git a/tasks/templates/release.md.erb b/tasks/templates/release.md.erb
index 2c6ff0b7c6..cad14d27df 100644
--- a/tasks/templates/release.md.erb
+++ b/tasks/templates/release.md.erb
@@ -24,3 +24,11 @@ $ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chef -v <%= @ve
# In Windows Powershell
. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chef -version <%= @version %>
```
+
+If you want to give this version a spin in Test Kitchen, create or add the following to your `kitchen.yml` file:
+
+```yaml
+provisioner:
+ product_name: chef
+ product_version: <%= @version %>
+```
View Lorry Controller Status