poise-boiler 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f46bf2e852bf4d110073f1a1d7af64b800d18bc
-  data.tar.gz: 3f4ee4fec5f51076a249e97a6758cac235bd72e5
+  metadata.gz: 2238940c4ca23c51ac808bc84ccec29a784aa3ff
+  data.tar.gz: a05d943a5e649100ebcfa698eadc7be35006b2fd
 SHA512:
-  metadata.gz: 1d288fc044a6a51cd1728a05b7af27be7ad8819bb76f9077d71a02999a7379aaa9edf88d83d86a15e1a94ca962a16d7c6749e2d533a3f7af1f6b351056543c66
-  data.tar.gz: e36256449de30bc3ac59e43836d39039118e2d1a84af8e07aff9e42ee6f9c4a2e0cb48a9e713fb61e445f0f7f70dc55acdaa723074181da3b89590e29e3cf38e
+  metadata.gz: 2963fde329b7ec4a4760382bc7d2369e08e2ef18bc316b25a1dddc4e904759409ad95bac325dd8888f20b8207786418887245e1e407c73157a2f7c8d07fe833a
+  data.tar.gz: 46f7ef5f48c47acd57e90eada8747326259b6964c656dc357ad31173414effeb30ce41f66f45bc4723d3ed5191cd2ec774afa05f6690399288692874fab84100

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.1.3
+
+* Use the new Test Kitchen 1.4 transport from kitchen-sync.
+* Run integration tests for master builds using Chef nightlies.
+
 ## v1.1.2
 
 * Unbreak Rackspace integration testing support.

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

@@ -60,6 +60,7 @@ module PoiseBoiler
 
           desc 'Run CI tests'
           task 'travis' do
+            ENV['POISE_MASTER_BUILD'] = 'true' if master_build?
             run_subtask('spec')
             run_subtask('chef:foodcritic')
             run_subtask('travis:integration') if integration_tests?
@@ -71,11 +72,18 @@ module PoiseBoiler
 
         private
 
+        # Is this a master build?
+        #
+        # @return [Boolean]
+        def master_build?
+          ENV['BUNDLE_GEMFILE'].to_s.include?('master.gemfile')
+        end
+
         # Should we run integration tests?
         #
         # @return [Boolean]
         def integration_tests?
-          ENV['TRAVIS_SECURE_ENV_VARS'] && !ENV['TRAVIS_SECURE_ENV_VARS'].empty? && !ENV['BUNDLE_GEMFILE'].to_s.include?('master')
+          ENV['TRAVIS_SECURE_ENV_VARS'] == 'true'
         end
 
         # Should we set things up for Rackspace integration tests? The default

data/lib/poise_boiler/kitchen.rb

@@ -49,6 +49,14 @@ module PoiseBoiler
         require 'chef/version'
         Chef::VERSION
       end
+      install_arguments = if ENV['POISE_MASTER_BUILD']
+        # Use today's date as an ignored param to force the layer to rebuild.
+        " -n -- #{Date.today}"
+      elsif chef_version
+        " -v #{chef_version}"
+      else
+        ''
+      end
       {
         'chef_versions' => %w{12},
         'driver' => {
@@ -57,13 +65,16 @@ module PoiseBoiler
           'provision_command' => [
             # Run some installs at provision so they are cached in the image.
             # Install Chef (with the correct verison).
-            "curl -L https://chef.io/chef/install.sh | bash -s --" + (chef_version ? " -v #{chef_version}" : '' ),
+            "curl -L https://chef.io/chef/install.sh | bash -s --#{install_arguments}",
             # Install some kitchen-related gems. Normally installed during the verify step but that is idempotent.
             "env GEM_HOME=/tmp/verifier/gems GEM_PATH=/tmp/verifier/gems GEM_CACHE=/tmp/verifier/gems/cache /opt/chef/embedded/bin/gem install thor busser busser-serverspec serverspec bundler",
             # Fix directory permissions.
             "chown -R kitchen /tmp/verifier",
           ],
         },
+        'transport' => {
+          'name' => 'sftp',
+        },
         'platforms' => expand_kitchen_platforms(platforms).map {|p| {'name' => p, 'run_list' => platform_run_list(p)} },
       }.to_yaml.gsub(/---[ \n]/, '')
     end

data/lib/poise_boiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/poise-boiler.gemspec

@@ -53,11 +53,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'foodcritic', '~> 4.0'
 
   # Integration gems
-  spec.add_dependency 'test-kitchen', '~> 1.3'
+  spec.add_dependency 'test-kitchen', '~> 1.4'
   spec.add_dependency 'kitchen-vagrant'
   spec.add_dependency 'vagrant-wrapper'
   spec.add_dependency 'kitchen-docker'
-  spec.add_dependency 'kitchen-sync'
+  spec.add_dependency 'kitchen-sync', '~> 1.1'
   spec.add_dependency 'berkshelf', '~> 3.2'
 
   # Travis gems

data/spec/helpers/travis_spec.rb

@@ -41,7 +41,7 @@ EOH
   file 'README.md'
 
   context 'no secure vars' do
-    environment TRAVIS_SECURE_ENV_VARS: ''
+    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' }
@@ -50,7 +50,7 @@ EOH
   end # /context no secure vars
 
   context 'secure vars' do
-    environment TRAVIS_SECURE_ENV_VARS: '1', KITCHEN_DOCKER_PASS: 'secret'
+    environment TRAVIS_SECURE_ENV_VARS: 'true', KITCHEN_DOCKER_PASS: 'secret'
     file 'test/docker/docker.pem', <<-EOH
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
@@ -110,29 +110,21 @@ EOH
 
     its(:stdout) { is_expected.to include 'Running task spec' }
     its(:stdout) { is_expected.to include 'Running task chef:foodcritic' }
-    if (ENV['BUNDLE_GEMFILE'] || '').include?('master')
-      its(:stdout) { is_expected.to_not include 'Running task travis:integration' }
-    else
-      its(:stdout) { is_expected.to include 'Running task travis:integration' }
-    end
+    its(:stdout) { is_expected.to include 'Running task travis:integration' }
     its(:exitstatus) { is_expected.to eq 0 }
   end # /context secure vars
 
   context 'secure vars and Rackspace' do
     file '.kitchen.travis.yml', 'name: rackspace'
     file '.ssh/stub'
-    environment TRAVIS_SECURE_ENV_VARS: '1'
+    environment TRAVIS_SECURE_ENV_VARS: 'true'
     before do
       _environment['HOME'] = temp_path
     end
 
     its(:stdout) { is_expected.to include 'Running task spec' }
     its(:stdout) { is_expected.to include 'Running task chef:foodcritic' }
-    if (ENV['BUNDLE_GEMFILE'] || '').include?('master')
-      its(:stdout) { is_expected.to_not include 'Running task travis:integration' }
-    else
-      its(:stdout) { is_expected.to include 'Running task travis:integration' }
-    end
+    its(:stdout) { is_expected.to include 'Running task travis:integration' }
     its(:exitstatus) { is_expected.to eq 0 }
   end
 end

data/spec/kitchen_spec.rb

@@ -31,7 +31,7 @@ EOH
   context 'with defaults' do
     context 'kitchen list' do
       command 'kitchen list'
-      its(:stdout) { is_expected.to match(/default-ubuntu-1404\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Ssh\s+)?<Not Created>/) }
+      its(:stdout) { is_expected.to match(/default-ubuntu-1404\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
     end # /context kitchen list
 
     context 'kitchen diagnose' do
@@ -52,10 +52,10 @@ suites:
 - name: default
 EOH
     command 'kitchen list'
-    its(:stdout) { is_expected.to match(/default-ubuntu-1404\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Ssh\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-ubuntu-1204\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Ssh\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-centos-6\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Ssh\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-centos-7\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Ssh\s+)?<Not Created>/) }
+    its(:stdout) { is_expected.to match(/default-ubuntu-1404\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
+    its(:stdout) { is_expected.to match(/default-ubuntu-1204\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
+    its(:stdout) { is_expected.to match(/default-centos-6\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
+    its(:stdout) { is_expected.to match(/default-centos-7\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
   end # /context with a platform alias
 
   context 'with $CHEF_VERSION set' do
@@ -86,7 +86,7 @@ suites:
 - name: default
 EOH
     command 'kitchen list'
-    its(:stdout) { is_expected.to match(/default-gentoo\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Ssh\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-arch\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Ssh\s+)?<Not Created>/) }
+    its(:stdout) { is_expected.to match(/default-gentoo\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
+    its(:stdout) { is_expected.to match(/default-arch\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
   end # /context with a platform override
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-boiler
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -218,14 +218,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: kitchen-vagrant
   requirement: !ruby/object:Gem::Requirement
@@ -272,16 +272,16 @@ dependencies:
   name: kitchen-sync
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Boilerplate-reduction helpers for Poise/Halite-style gemss.