Update users cookbook and poise cookbooks

The poise cookbooks were incompatible with Chef 13
2017-06-16 15:50:13 +02:00
parent f93070c4c0
commit ff3d062c73
65 changed files with 238 additions and 130 deletions
--- a/cookbooks/poise-ruby/CHANGELOG.md
+++ b/cookbooks/poise-ruby/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog

+## v2.3.0
+
+* Chef 13 support.
+
 ## v2.2.0

 * Add support for Ubuntu 16.04 system packages.
--- a/cookbooks/poise-ruby/README.md
+++ b/cookbooks/poise-ruby/README.md
@@ -290,7 +290,7 @@ The Poise test server infrastructure is sponsored by [Rackspace](https://rackspa

 ## License

-Copyright 2015-2016, Noah Kantrowitz
+Copyright 2015-2017, Noah Kantrowitz

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/attributes/default.rb
+++ b/cookbooks/poise-ruby/attributes/default.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/bundler_mixin.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/bundler_mixin.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/cheftie.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/cheftie.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/error.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/error.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/bundle_install.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/bundle_install.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -128,7 +128,7 @@ module PoiseRuby
        #
        # @return [String]
        def bundler_binary
-          @bundler_binary ||= ::File.join(gem_bindir, 'bundle')
+          @bundler_binary ||= ::File.join(poise_gem_bindir, 'bundle')
        end

        # Find the absolute path to the Gemfile. This mirrors bundler's internal
@@ -168,8 +168,12 @@ module PoiseRuby
        # the required configuration on the resource combined with gem having
        # terrible output formats.
        #
+        # Renamed from #gem_bindir in 2.3.0 because of a conflict with a method
+        # of the same name in Chef::Mixin::PathSanity (which is pulled in via
+        # ShellOut) added in 13.0.
+        #
        # @return [String]
-        def gem_bindir
+        def poise_gem_bindir
          cmd = ruby_shell_out!(new_resource.gem_binary, 'environment')
          # Parse a line like:
          # - EXECUTABLE DIRECTORY: /usr/local/bin
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/ruby_execute.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/ruby_execute.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/ruby_gem.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/ruby_gem.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/ruby_runtime.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/ruby_runtime.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/ruby_runtime_test.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/resources/ruby_runtime_test.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_command_mixin.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_command_mixin.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/base.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/base.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/chef.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/chef.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/dummy.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/dummy.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/scl.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/scl.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/system.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/ruby_providers/system.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/files/halite_gem/poise_ruby/version.rb
+++ b/cookbooks/poise-ruby/files/halite_gem/poise_ruby/version.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@


 module PoiseRuby
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end
--- a/cookbooks/poise-ruby/libraries/default.rb
+++ b/cookbooks/poise-ruby/libraries/default.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/cookbooks/poise-ruby/metadata.json
+++ b/cookbooks/poise-ruby/metadata.json
--- a/cookbooks/poise-ruby/recipes/default.rb
+++ b/cookbooks/poise-ruby/recipes/default.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.