poise-boiler 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc759a1609799e0922269ecb5c7c49540d50c0f4
-  data.tar.gz: fd4be17592f8b129effff151b14405683affd658
+  metadata.gz: 1c4fb3bfa6f761790438770520c9da3a00d27d3f
+  data.tar.gz: f0fd873026544e9407e4828a2b82d4d08ab151b8
 SHA512:
-  metadata.gz: 3824c2a34bcce2f1c5aaf7a5c7ffeb240a9c982fb638a10cc4ab28bc0d5bbd75efa169cac2b7f526f520a0274b286a6c88e44d0ed8ef0e939aec612cc5ea934a
-  data.tar.gz: eed02e137bd93ce211d29721fd3e3900fba8e1c418a5d99d0a869eeed5a8c83dc10c237097d64bd56a874f12e2a4e346155a206d27c2b3de2a9da6d7d5feecd3
+  metadata.gz: f08303ed019060ef16e3a2734fb5ad32db5a718b9fa95b0e597a3082fdc7057a8c95742c89a95c5d506fb52df864e7d23213b88dfed5e56fd24f6abdb58e6336
+  data.tar.gz: bca5054061b44c5be66344dd8802cdf7c3b8d94200c22d2cf6158f7732bfc3011de62d11f3b57d2090cf145d7ca10f0773ee91c4ee11bf56f8587b3b77042574

data/.travis.yml

@@ -1,17 +1,21 @@
 sudo: false
 cache: bundler
 language: ruby
-addons:
-  apt:
-    packages:
-    - libgecode-dev
-rvm:
-- 2.3.1
-gemfile:
-- gemfiles/default.gemfile
-- gemfiles/master.gemfile
-env:
-  global:
-  - USE_SYSTEM_GECODE=true
-before_install: "gem install bundler"
-script: bundle exec rake test
+before_install:
+  - 'if [[ $BUNDLE_GEMFILE == *master.gemfile ]]; then gem update --system; fi'
+  - gem --version
+  - gem install bundler
+  - bundle --version
+  - 'bundle config --local path ${BUNDLE_PATH:-$(dirname $BUNDLE_GEMFILE)/vendor/bundle}'
+  - bundle config --local bin $PWD/bin
+install: bundle update --jobs=3 --retry=3
+script:
+  - ./bin/rake travis
+matrix:
+  include:
+    - rvm: 2.3.1
+      gemfile: gemfiles/chef-12.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/chef-13.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/master.gemfile

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Poise-Boiler Changelog
 
+## 1.16.0
+
+* Dropping Ubuntu 12.04 from the `linux` platform alias and adding 16.04.
+* Adding my IRB extension gems.
+* Use Test Kitchen's policyfile support for Chef versions that allow it.
+* Dependency version updates.
+
 ## 1.15.0
 
 * Support gathering development dependencies from cookbook gems when using the

data/gemfiles/{default.gemfile → chef-12.gemfile}

@@ -15,3 +15,5 @@
 #
 
 eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.0'

data/gemfiles/chef-13.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../Gemfile', __FILE__)
+
+gem 'chef', '~> 13.0'

data/gemfiles/master.gemfile

@@ -16,6 +16,9 @@
 
 eval_gemfile File.expand_path('../../Gemfile', __FILE__)
 
-gem 'chef', github: 'chef/chef'
-gem 'halite', github: 'poise/halite'
-gem 'ohai', github: 'chef/ohai'
+gem 'chef', git: 'https://github.com/chef/chef.git'
+gem 'chefspec', git: 'https://github.com/sethvargo/chefspec.git'
+gem 'fauxhai', git: 'https://github.com/customink/fauxhai.git'
+gem 'foodcritic', git: 'https://github.com/foodcritic/foodcritic.git'
+gem 'halite', git: 'https://github.com/poise/halite.git'
+gem 'ohai', git: 'https://github.com/chef/ohai.git'

data/lib/poise_boiler/helpers/kitchen.rb

@@ -30,7 +30,7 @@ module PoiseBoiler
       PLATFORM_ALIASES = {
         'windows' => %w{windows-2012r2},
         'windows32' => %w{windows-2008sp2},
-        'ubuntu' => %w{ubuntu-12.04 ubuntu-14.04},
+        'ubuntu' => %w{ubuntu-14.04 ubuntu-16.04},
         'rhel' => %w{centos},
         'centos' => %w{centos-6 centos-7},
         'linux' => %w{ubuntu rhel centos},
@@ -268,6 +268,8 @@ module PoiseBoiler
           'aws_ssh_key_id' => "#{cookbook_name}-kitchen",
           'security_group_ids' => ENV['AWS_SECURITY_GROUP_ID'] ? [ENV['AWS_SECURITY_GROUP_ID']] : [DEFAULT_EC2_SECURITY_GROUP_ID],
           'subnet_id' => ENV['AWS_SUBNET_ID'] || DEFAULT_EC2_SUBNET_ID,
+          # Because kitchen-rackspace also has a thing called flavor_id.
+          'flavor_id' => nil,
         }
       end
 

data/lib/poise_boiler/helpers/kitchen/policy_provisioner.rb

@@ -16,17 +16,23 @@
 
 require 'fileutils'
 
-# From chef-dk.
-require 'kitchen/provisioner/policyfile_zero'
+require 'chef/version'
 require 'mixlib/shellout'
 
 require 'poise_boiler/helpers/kitchen/provisioner_helpers'
 
+$use_policyfile_zero = Gem::Requirement.create('< 12.7').satisfied_by?(Gem::Version.create(Chef::VERSION))
+
+if $use_policyfile_zero
+  require 'kitchen/provisioner/policyfile_zero'
+else
+  require 'kitchen/provisioner/chef_zero'
+end
 
 module PoiseBoiler
   module Helpers
     class Kitchen
-      class PolicyProvisioner < ::Kitchen::Provisioner::PolicyfileZero
+      class PolicyProvisioner < ($use_policyfile_zero ? ::Kitchen::Provisioner::PolicyfileZero : ::Kitchen::Provisioner::ChefZero )
         include ProvisionerHelpers
 
         # Override the default value from the base class.
@@ -51,18 +57,26 @@ module PoiseBoiler
           # Compile that policy because the base provider doesn't do that.
           compile_poise_policy(policy_path)
           # Tell the base provider code to use our new policy instead.
-          config[:policyfile] = policy_path
+          if $use_policyfile_zero
+            config[:policyfile] = "#{config[:kitchen_root]}/#{policy_path}"
+          else
+            config[:policyfile_path] = policy_path
+          end
           super
         end
 
+        def cleanup_sandbox
+          super if @sandbox_path
+        end
+
         private
 
         def generate_poise_policy(base)
           info("Preparing modified policy")
           original_policy = IO.read(config[:policyfile])
           new_policy = "default_source :chef_repo, #{base.inspect}\n#{original_policy}"
-          policy_path = File.join(config[:kitchen_root], '.kitchen', "poise_policy_#{instance.name}.rb")
-          IO.write(policy_path, new_policy)
+          policy_path = ".kitchen/poise_policy_#{instance.name}.rb"
+          IO.write("#{config[:kitchen_root]}/#{policy_path}", new_policy)
           policy_path
         end
 

data/lib/poise_boiler/helpers/rake/travis.rb

@@ -52,7 +52,7 @@ module PoiseBoiler
 
           file '.ssh/id_rsa' do
             # Add a zero-byte passphrase field.
-            cmd = %w{ssh-keygen -f} + [File.expand_path('~/.ssh/id_rsa')] +  %w{-b 768 -P} + ['']
+            cmd = %w{ssh-keygen -f} + [File.expand_path('~/.ssh/id_rsa')] +  %w{-b 1024 -P} + ['']
             sh(*cmd)
           end
 

data/lib/poise_boiler/helpers/spec_helper.rb

@@ -31,6 +31,7 @@ module PoiseBoiler
         require 'simplecov'
         require 'pry'
         require 'pry-byebug'
+        require 'chefspec'
 
         # Check for coverage stuffs
         formatters = []

data/lib/poise_boiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.15.0'
+  VERSION = '1.16.0'
 end

data/poise-boiler.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   # Development gems
   spec.add_dependency 'bundler' # Used for Bundler.load_gemspec
-  spec.add_dependency 'rake', '>= 10.4', '< 12.0'
+  spec.add_dependency 'rake', '>= 10.4', '< 13'
   spec.add_dependency 'travis', '~> 1.8', '>= 1.8.1'
   spec.add_dependency 'yard', '~> 0.8'
   spec.add_dependency 'yard-classmethods', '~> 1.0'
@@ -46,14 +46,19 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pry-byebug'
   spec.add_dependency 'git', '~> 1.2'
 
+  # IRB helper gems
+  spec.add_dependency 'wirb'
+  spec.add_dependency 'hirb'
+  spec.add_dependency 'awesome_print'
+
   # Test gems
   spec.add_dependency 'rspec', '~> 3.2'
   spec.add_dependency 'rspec-its', '~> 1.2'
-  spec.add_dependency 'chefspec', '~> 5.0'
+  spec.add_dependency 'chefspec', '>= 5', '< 8' # Allow ChefSpec 5 for early 12.x.
   spec.add_dependency 'fuubar', '~> 2.0'
   spec.add_dependency 'simplecov', '~> 0.9'
   # Foodcritic 8.0 dropped support for Ruby 2.1, so it can't be used with olded Chef.
-  spec.add_dependency 'foodcritic', '>= 7', '< 9'
+  spec.add_dependency 'foodcritic', '>= 7', '< 12'
 
   # Integration gems
   # https://github.com/test-kitchen/test-kitchen/issues/922
@@ -71,7 +76,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'winrm-fs', '>= 0.4', '< 2'
 
   # Travis gems
-  spec.add_dependency 'codeclimate-test-reporter', '~> 0.4'
+  spec.add_dependency 'codeclimate-test-reporter', '~> 1.0'
   spec.add_dependency 'codecov', '~> 0.0', '>= 0.0.2'
 
   # Development dependencies (yo dawg)

data/spec/helpers/rake/travis_spec.rb

@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
   s.authors = ['Alan Smithee']
   s.email = %{asmithee@example.com}
   s.homepage = 'https://github.com/example/example'
+  s.license = 'Apache-2.0'
+  s.metadata['platforms'] = 'ubuntu'
 end
 EOH
   file '.kitchen.yml', <<-EOH
@@ -42,14 +44,17 @@ suites:
 - name: default
 EOH
   file 'README.md'
+  file 'LICENSE'
 
   context 'no secure vars' do
     environment TRAVIS_SECURE_ENV_VARS: 'false'
 
-    its(:stdout) { is_expected.to include 'Running task spec' }
-    its(:stdout) { is_expected.to include 'Running task chef:foodcritic' }
-    its(:stdout) { is_expected.to_not include 'Running task travis:integration' }
-    its(:exitstatus) { is_expected.to eq 0 }
+    it do
+      expect(subject.stdout).to include 'Running task spec'
+      expect(subject.stdout).to include 'Running task chef:foodcritic'
+      expect(subject.stdout).to_not include 'Running task travis:integration'
+      expect(subject.exitstatus).to eq 0
+    end
   end # /context no secure vars
 
   context 'secure vars' do
@@ -111,10 +116,12 @@ UbWRwbhlKYyN9bgK47cxD7r39KRh3jAkiTcMlscquirkZTuyWj5INTn/g2ICIg5w
 -----END RSA PRIVATE KEY-----
 EOH
 
-    its(:stdout) { is_expected.to include 'Running task spec' }
-    its(:stdout) { is_expected.to include 'Running task chef:foodcritic' }
-    its(:stdout) { is_expected.to include 'Running task travis:integration' }
-    its(:exitstatus) { is_expected.to eq 0 }
+    it do
+      expect(subject.stdout).to include 'Running task spec'
+      expect(subject.stdout).to include 'Running task chef:foodcritic'
+      expect(subject.stdout).to include 'Running task travis:integration'
+      expect(subject.exitstatus).to eq 0
+    end
   end # /context secure vars
 
   context 'secure vars and Rackspace' do
@@ -138,9 +145,11 @@ EOH
       _environment['HOME'] = temp_path
     end
 
-    its(:stdout) { is_expected.to include 'Running task spec' }
-    its(:stdout) { is_expected.to include 'Running task chef:foodcritic' }
-    its(:stdout) { is_expected.to include 'Running task travis:integration' }
-    its(:exitstatus) { is_expected.to eq 0 }
+    it do
+      expect(subject.stdout).to include 'Running task spec'
+      expect(subject.stdout).to include 'Running task chef:foodcritic'
+      expect(subject.stdout).to include 'Running task travis:integration'
+      expect(subject.exitstatus).to eq 0
+    end
   end
 end

data/spec/kitchen_spec.rb

@@ -49,7 +49,7 @@ EOH
       command 'kitchen list'
       its(:stdout) do
         is_expected.to match(/default-ubuntu-1404\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
-        is_expected.to match(/default-ubuntu-1204\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
+        is_expected.to match(/default-ubuntu-1604\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
         is_expected.to match(/default-centos-6\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
         is_expected.to match(/default-centos-7\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
       end
@@ -72,7 +72,7 @@ EOH
     command 'kitchen list'
     its(:stdout) do
       is_expected.to_not match(/default-ubuntu-1404/)
-      is_expected.to_not match(/default-ubuntu-1204/)
+      is_expected.to_not match(/default-ubuntu-1604/)
       is_expected.to match(/default-centos-6\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
       is_expected.to match(/default-centos-7\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
     end
@@ -123,7 +123,7 @@ EOH
       _environment['HOME'] = temp_path
     end
     its(:stdout) do
-      is_expected.to match(/default-ubuntu-1204\s+Rackspace\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
+      is_expected.to match(/default-ubuntu-1404\s+Rackspace\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
     end
   end # /context with kitchen-rackspace
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-boiler
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -33,7 +33,7 @@ dependencies:
         version: '10.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '10.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: wirb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hirb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -200,16 +242,22 @@ dependencies:
   name: chefspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +295,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -257,7 +305,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -408,14 +456,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -478,7 +526,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/default.gemfile
+- gemfiles/chef-12.gemfile
+- gemfiles/chef-13.gemfile
 - gemfiles/master.gemfile
 - lib/kitchen/provisioner/poise_policyfile_zero.rb
 - lib/kitchen/provisioner/poise_solo.rb