poise-boiler 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1b2217f90d2b5e97250517db809e44a9922f86
-  data.tar.gz: ef8ddebba565e10342604fde82e2fe5f860e1ddc
+  metadata.gz: fbb661ad23215d6e2cc998c52f72e75564aabe6a
+  data.tar.gz: 96e0f665a92f32f71a25269ac9c8efc8fdacf320
 SHA512:
-  metadata.gz: 0062710d338b8d3773ae3048a361461cae0e3e9344e77da7dc3646c4fce8341f47918631887cda0d7df044d920693209d77a4b8cbdecdbfa54ba1734a92f9e99
-  data.tar.gz: 6e5772aa9071c4a6e27d4007518ff6df3f324535bca64a0936cb4ae5823bd6d55e6db5fad5264ca406fb48d9bd0614b85c8fe554b947e8c638e2f4220b171c95
+  metadata.gz: 82927ab621c179ad8cc61efdc3587aaeb3bfefad43cd10e7e6b02e615a831826b974b21e38cc338f4a1d6bbebba5e078b4d7efe0c912a6679382130b7fd25969
+  data.tar.gz: efa5581c318d27ece306af470391e052539141c43a4a300ddfb09e2bfc8c8833b9d899ebab39bcb46a4ee1acab9712eb6a4b64a669bd5d820cc9e6bd54e2fe5b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.7.0
+
+* Revamped Test Kitchen helper to improve build speed and stability.
+
 ## v1.6.0
 
 * New rake task to update copyright years.

data/lib/kitchen/provisioner/poise_solo.rb

@@ -14,13 +14,13 @@
 # limitations under the License.
 #
 
-require 'poise_boiler/kitchen/provisioner'
+require 'poise_boiler/helpers/kitchen/provisioner'
 
 
 # @api private
 module Kitchen
   module Provisioner
     # An alias for Kitchen plugin loading.
-    PoiseSolo = PoiseBoiler::Kitchen::Provisioner
+    PoiseSolo = PoiseBoiler::Helpers::Kitchen::Provisioner
   end
 end

data/lib/poise_boiler/{kitchen → helpers/kitchen}/Dockerfile.erb

@@ -24,10 +24,10 @@ RUN ln -sf /bin/true /sbin/initctl
 <% end %>
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update -o dockercachebust=<%= Date.today %>
-RUN apt-get install -y sudo openssh-server curl lsb-release net-tools
+RUN apt-get install -y sudo openssh-server curl lsb-release net-tools rsync
 <% when 'rhel', 'centos', 'fedora' %>
 RUN yum clean all
-RUN yum install -y sudo openssh-server openssh-clients which curl net-tools passwd
+RUN yum install -y sudo openssh-server openssh-clients which curl net-tools iproute rsync passwd
 <%# CentOS 7 does not install hostname by default, but EL6 has no hostname package. %>
 RUN yum install -y hostname || true
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
@@ -48,6 +48,7 @@ RUN cave resolve -zx net-misc/openssh app-admin/sudo
 RUN ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
 RUN ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
 <% when 'freebsd' %>
+<%# SUPER UN-TESTED BULLSHIT %>
 RUN echo "nameserver 8.8.8.8" >> /etc/resolv.conf \
   && env ASSUME_ALWAYS_YES=true pkg install sudo curl bash
 RUN ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
@@ -73,6 +74,11 @@ RUN chmod 0700 <%= homedir %>/.ssh
 RUN touch <%= homedir %>/.ssh/authorized_keys
 RUN chown <%= @username %> <%= homedir %>/.ssh/authorized_keys
 RUN chmod 0600 <%= homedir %>/.ssh/authorized_keys
+<%# Install Chef and Test Kitchen-related gems. %>
+RUN curl -L https://chef.io/chef/install.sh | bash -s --<%= ENV['POISE_MASTER_BUILD'] ? " -n -- #{Date.today}" : PoiseBoiler::Kitchen.instance.chef_version ? " -v #{PoiseBoiler::Kitchen.instance.chef_version}" : '' %> && \
+    env GEM_HOME=/tmp/verifier/gems GEM_PATH=/tmp/verifier/gems GEM_CACHE=/tmp/verifier/gems/cache /opt/chef/embedded/bin/gem install --no-rdoc --no-ri --bindir /tmp/verifier/bin busser busser-serverspec serverspec && \
+    env GEM_HOME=/tmp/verifier/gems GEM_PATH=/tmp/verifier/gems GEM_CACHE=/tmp/verifier/gems/cache /opt/chef/embedded/bin/gem install --no-rdoc --no-ri bundler && \
+    chown -R <%= @username %> /tmp/verifier
 <%# Custom provisioning commands. %>
 <% Array(@provision_command).each do |cmd| %>
 RUN <%= cmd %>

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

@@ -0,0 +1,101 @@
+#
+# Copyright 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.
+#
+
+require 'fileutils'
+
+require 'halite'
+require 'kitchen/provisioner/chef_solo'
+
+require 'poise_boiler/helpers/kitchen/core_ext'
+
+
+module PoiseBoiler
+  module Helpers
+    class Kitchen
+      class Provisioner < ::Kitchen::Provisioner::ChefSolo
+        default_config :gemspec do |provisioner|
+          Dir[File.join(provisioner[:kitchen_root], '*.gemspec')].first
+        end
+        expand_path_for :gemspec
+
+        def self.name
+          'PoiseSolo'
+        end
+
+        def create_sandbox
+          super
+          convert_halite_cookbooks unless poise_helper_instance.options['no_gem']
+          copy_test_cookbook
+          copy_test_cookbooks
+        end
+
+        private
+
+        def poise_helper_instance
+          PoiseBoiler::Kitchen.instance || begin
+            raise 'Global poise-boiler kitchen instance not set'
+          end
+        end
+
+        def convert_halite_cookbooks
+          @real_cookbook_deps = {}
+          gems_to_convert = {'poise-profiler' => Halite::Gem.new('poise-profiler')}
+          gems_to_check = [poise_helper_instance.cookbook]
+          until gems_to_check.empty?
+            check = gems_to_check.pop
+            # Already in the list, skip expansion.
+            next if gems_to_convert.include?(check.name)
+            # Not a cookbook, don't expand.
+            next unless check.is_halite_cookbook?
+            gems_to_convert[check.name] = check
+            # Expand dependencies and check each of those.
+            check.cookbook_dependencies.each do |dep|
+              dep_cook = dep.cookbook
+              if dep_cook
+                gems_to_check << dep_cook
+              else
+                @real_cookbook_deps[dep.name] = dep
+              end
+            end
+          end
+          # Convert all the things!
+          tmpbooks_dir = File.join(sandbox_path, 'cookbooks')
+          FileUtils.mkdir_p(tmpbooks_dir)
+          gems_to_convert.each do |name, gem_data|
+            Halite.convert(gem_data, File.join(tmpbooks_dir, gem_data.cookbook_name))
+          end
+        end
+
+        def copy_test_cookbook
+          fixture_base = File.join(config[:kitchen_root], 'test', 'cookbook')
+          return unless File.exist?(File.join(fixture_base, 'metadata.rb'))
+          tmp_base = File.join(sandbox_path, 'cookbooks', "#{poise_helper_instance.cookbook_name}_test")
+          FileUtils.mkdir_p(tmp_base)
+          FileUtils.cp_r(File.join(fixture_base, "."), tmp_base)
+        end
+
+        def copy_test_cookbooks
+          fixtures_base = File.join(config[:kitchen_root], 'test', 'cookbooks')
+          return unless File.exist?(fixtures_base)
+          tmp_base = File.join(sandbox_path, 'cookbooks')
+          FileUtils.mkdir_p(tmp_base)
+          FileUtils.cp_r(File.join(fixtures_base, "."), tmp_base)
+        end
+
+      end
+    end
+  end
+end

data/lib/poise_boiler/helpers/kitchen.rb

@@ -0,0 +1,210 @@
+#
+# 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.
+#
+
+require 'halite/helper_base'
+
+
+module PoiseBoiler
+  module Helpers
+    # Helpers for Test Kitchen and .kitchen.yml configuration.
+    #
+    # @see PoiseBoiler::Kitchen.kitchen
+    # @since 1.7.0
+    class Kitchen < Halite::HelperBase
+      # Shorthand names for Test Kitchen platforms.
+      #
+      # @see #expand_platforms
+      PLATFORM_ALIASES = {
+        'ubuntu' => %w{ubuntu-12.04 ubuntu-14.04},
+        'rhel' => %w{centos-6 centos-7},
+        'centos' => %w{rhel},
+        'linux' => %w{ubuntu rhel},
+        'unix' => %w{linux freebsd},
+        'all' => %{unix windows},
+      }
+
+      def initialize(**options)
+        # Figure out the directory that contains the kitchen.yml by looking for
+        # the first entry in the stack that isn't inside poise-boiler.
+        options[:base] ||= if caller.find {|line| !line.start_with?(File.expand_path('../../..', __FILE__)) } =~ /^(.*?):\d+:in/
+          File.expand_path('..', $1)
+        else
+          # ¯\_(ツ)_/¯ hope for the best.
+          Dir.pwd
+        end
+        super(**options)
+      end
+
+      # Generate YAML text for inclusion in a config file.
+      #
+      # @return [String]
+      def to_yaml
+        kitchen_config.to_yaml.gsub(/---[ \n]/, '')
+      end
+
+      # The Chef version to use for Test Kitchen or nil for any version.
+      #
+      # @return [String, nil]
+      def chef_version
+        # SPEC_BLOCK_CI is used to force non-locking behavior inside tests.
+        @chef_version ||= ENV['CHEF_VERSION'] || if ENV['POISE_MASTER_BUILD']
+          # We're going to install the latest nightly via Omnitruck later on.
+          nil
+        elsif ENV['SPEC_BLOCK_CI'] != 'true'
+          # If there isn't a specific override, lock TK to use the same version of Chef as the Gemfile.
+          require 'chef/version'
+          Chef::VERSION
+        end
+      end
+
+      def cookbook_name
+        options[:cookbook_name] || cookbook.cookbook_name
+      end
+
+      # Make this public for use in {PoiseBoiler::Helpers::Kitchen::Provisioner}.
+      public :cookbook
+
+      private
+
+      # Which Test Kitchen driver are we going to use.
+      #
+      # @return [String]
+      def kitchen_driver
+        @kitchen_driver ||= if options[:driver]
+          # Manual override.
+          options[:driver]
+        elsif File.exist?(File.expand_path('test/docker/docker.key', base))
+          # Look for the decrypted private key. In CI this is generated by `rake travis`.
+          'docker'
+        elsif ENV['CI']
+          # Don't try to use Vagrant on CI ever.
+          'dummy'
+        else
+          'vagrant'
+        end
+      end
+
+      # Expand the requested platforms using {PLATFORM_ALIASES}.
+      #
+      # @return [Array<String>]
+      def expand_platforms
+        # Default platform is linux unless overridden from the helper options.
+        platforms = Array(options[:platforms] || 'linux')
+        last_platforms = []
+        # This is probably not the most effcient solution but oh well.
+        while platforms != last_platforms
+          last_platforms = platforms
+          platforms = platforms.map {|p| PLATFORM_ALIASES[p] || p}
+          platforms.flatten!
+          platforms.uniq!
+        end
+        platforms
+      end
+
+      # Generate a Test Kitchen configuration hash.
+      #
+      # @return [Hash]
+      def kitchen_config
+        {
+          'driver' => driver_config,
+          'transport' => transport_config,
+          'provisioner' => provisioner_config,
+          'platforms' => expand_platforms.map {|name| platform_config(name) },
+          'suites' => [suite_config],
+        }
+      end
+
+      # Generate a Test Kitchen driver configuration hash.
+      #
+      # @return [Hash]
+      def driver_config
+        # Default config for all drivers. {#chef_version} returns nil for "any
+        # version" so use true to prevent reinstall attempts.
+        config = {'name' => kitchen_driver, 'require_chef_omnibus' => chef_version || true}
+        case kitchen_driver
+        when 'docker'
+          # Docker-specific configuration.
+          config.update(
+            # Custom Dockerfile.
+            'dockerfile' => File.expand_path('../kitchen/Dockerfile.erb', __FILE__),
+            # No password for securiteeeee.
+            'password' => nil,
+            # Our docker settings.
+            'binary' => (ENV['TRAVIS'] == 'true' ? './' : '') + 'docker',
+            'socket' => 'tcp://docker.poise.io:443',
+            'tls_verify' => 'true',
+            'tls_cacert' => 'test/docker/docker.ca',
+            'tls_cert' => 'test/docker/docker.pem',
+            'tls_key' => 'test/docker/docker.key',
+          )
+        when 'rackspace'
+          # Set a default instance size.
+          config['flavor_id'] = options[:rackspace_flavor] || 'general1-1'
+        end
+        config
+      end
+
+      # Generate a Test Kitchen transport configuration hash.
+      #
+      # @return [Hash]
+      def transport_config
+        {
+          # Use the sftp transport from kitchen-sync.
+          'name' => 'sftp',
+          # Use the generated SSH key from kitchen-docker if present.
+          'ssh_key' => kitchen_driver == 'docker' ? File.expand_path('.kitchen/docker_id_rsa', base) : nil,
+        }
+      end
+
+      # Generate a Test Kitchen provisioner configuration hash.
+      #
+      # @return [Hash]
+      def provisioner_config
+        {
+          # Use the poise_solo provisioner, also part of kitchen-docker.
+          'name' => 'poise_solo',
+          # Pass through debug/poise_debug settings to the test instance.
+          'attributes' => {
+            'POISE_DEBUG' => !!((ENV['POISE_DEBUG'] && ENV['POISE_DEBUG'] != 'false') ||
+                                (ENV['poise_debug'] && ENV['poise_debug'] != 'false') ||
+                                (ENV['DEBUG'] && ENV['DEBUG'] != 'false')
+                               ),
+          }
+        }
+      end
+
+      # Generate a Test Kitchen platform configuration hash.
+      #
+      # @return [Hash]
+      def platform_config(name)
+        {
+          'name' => name,
+          # On CI enable poise-profiler automatically. Load it here in case the
+          # user defines their own suites.
+          'run_list' => ((ENV['CI'] || ENV['DEBUG'] || ENV['PROFILE']) ? %w{poise-profiler} : []),
+        }
+      end
+
+      def suite_config
+        {
+          'name' => 'default',
+          'run_list' => (File.exist?(File.join(base, 'test', 'cookbook')) || File.exist?(File.join(base, 'test', 'cookbooks'))) ? ["#{cookbook_name}_test"] : [cookbook_name],
+        }
+      end
+
+    end
+  end
+end

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

@@ -91,7 +91,7 @@ module PoiseBoiler
         #
         # @return [Boolean]
         def integration_rackspace?
-          File.exist?('.kitchen.travis.yml') && IO.read('.kitchen.travis.yml').include?('name: rackspace')
+          File.exist?('.kitchen.yml') && IO.read('.kitchen.yml') =~ /(driver|name): (['"]?)rackspace\2/
         end
 
         # Convert a Time object to nanoseconds since the epoch.

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

@@ -30,7 +30,7 @@ module PoiseBoiler
       # @example Updating all copyright years
       #   $ rake year
       # @example Updating copyright years on a non-boiler project.
-      #   $ git ls-files | xargs perl -pi -e "s/Copyright ((?\!$(date +%Y))\\d{4})(-\\d{4})?,/Copyright \\1-$(date +%Y),/g"
+      #   $ git ls-files | xargs perl -pi -e "s/Copyright (?:\(c\) )?((?\!$(date +%Y))\\d{4})(-\\d{4})?,/Copyright \\1-$(date +%Y),/gi"
       class Year < Halite::HelperBase
         # Install the rake tasks.
         #

data/lib/poise_boiler/helpers.rb

@@ -20,6 +20,7 @@ module PoiseBoiler
   #
   # @since 1.0.0
   module Helpers
+    autoload :Kitchen, 'poise_boiler/helpers/kitchen'
     autoload :Rake, 'poise_boiler/helpers/rake'
     autoload :SpecHelper, 'poise_boiler/helpers/spec_helper'
   end

data/lib/poise_boiler/kitchen.rb

@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-require 'bundler'
-require 'halite'
-require 'kitchen'
+require 'poise_boiler'
 
 
 module PoiseBoiler
@@ -24,168 +22,21 @@ module PoiseBoiler
   #
   # @since 1.0.0
   module Kitchen
-    extend self
-    # Shorthand names for kitchen platforms.
-    #
-    # @see PoiseBoiler::Kitchen.kitchen
-    PLATFORM_ALIASES = {
-      'ubuntu' => %w{ubuntu-12.04 ubuntu-14.04},
-      'rhel' => %w{centos-6 centos-7},
-      'centos' => %w{rhel},
-      'linux' => %w{ubuntu rhel},
-      'unix' => %w{linux freebsd},
-      'all' => %{unix windows},
-    }
+    def self.instance
+      @instance
+    end
 
     # Return a YAML string suitable for inclusion in a .kitchen.yml config. This
     # will include the standard Poise/Halite boilerplate and some default values.
     #
     # @param platforms [String, Array<String>] Name(s) of platforms to use by default.
-    # @see PoiseBoiler::Kitchen::PLATFORM_ALIASES
+    # @see PoiseBoiler::Helpers::Kitchen::PLATFORM_ALIASES
     # @example .kitchen.yml
     #   #<% require 'poise_boiler' %>
     #   <%= PoiseBoiler.kitchen %>
-    def kitchen(platforms: 'linux', root: nil)
-      # Figure out the directory that contains the kitchen.yml.
-      root ||= if caller.find {|line| !line.start_with?(File.expand_path('../..', __FILE__)) } =~ /^(.*?):\d+:in/
-        File.expand_path('..', $1)
-      else
-        # ¯\_(ツ)_/¯
-        Dir.pwd
-      end
-      # SPEC_BLOCK_CI is used to force non-locking behavior inside tests.
-      chef_version = ENV['CHEF_VERSION'] || if ENV['SPEC_BLOCK_CI'] != 'true'
-        # If there isn't a specific override, lock TK to use the same version of Chef as the Gemfile.
-        require 'chef/version'
-        Chef::VERSION
-      end
-      install_arguments = if ENV['POISE_MASTER_BUILD']
-        # Force it to use any version down below.
-        chef_version = nil
-        # 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' => {
-          'name' => (docker_enabled?(root) ? 'docker' : ENV['TRAVIS'] == 'true' ? 'dummy' : 'vagrant'),
-          'require_chef_omnibus' => chef_version || true,
-          'dockerfile' => File.expand_path('../kitchen/Dockerfile.erb', __FILE__),
-          # No password for securiteeeee.
-          'password' => nil,
-          # Our docker settings.
-          'binary' => (ENV['TRAVIS'] == 'true' ? './' : '') + 'docker',
-          'socket' => 'tcp://docker.poise.io:443',
-          'tls_verify' => 'true',
-          'tls_cacert' => 'test/docker/docker.ca',
-          'tls_cert' => 'test/docker/docker.pem',
-          'tls_key' => 'test/docker/docker.key',
-          # Cache some stuff in the Docker image.
-          'provision_command' => [
-            # Run some installs at provision so they are cached in the image.
-            # Install net-tools for netstat which is used by serverspec, and
-            # iproute for ss (only used on EL7).
-            "test ! -f /etc/debian_version || apt-get install -y net-tools rsync",
-            "test ! -f /etc/redhat-release || yum -y install net-tools iproute rsync",
-            # Make sure the hostname utilitiy is installed on CentOS 7. The
-            # ||true is for EL6 which has no hostname package. Sigh.
-            "test ! -f /etc/redhat-release || yum -y install hostname || true",
-            # Install Chef (with the correct verison).
-            "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 --no-rdoc --no-ri --bindir /tmp/verifier/bin thor busser busser-serverspec serverspec",
-            # Install bundler for some tests that pull in spechelper gems.
-            "env GEM_HOME=/tmp/verifier/gems GEM_PATH=/tmp/verifier/gems GEM_CACHE=/tmp/verifier/gems/cache /opt/chef/embedded/bin/gem install --no-rdoc --no-ri bundler",
-            # Fix directory permissions.
-            "chown -R kitchen /tmp/verifier",
-          ],
-        },
-        'transport' => {
-          'name' => 'sftp',
-          'ssh_key' => docker_enabled?(root) ? File.expand_path('.kitchen/docker_id_rsa', root) : nil,
-        },
-        'provisioner' => {
-          'name' => 'poise_solo',
-          'attributes' => {
-            'POISE_DEBUG' => !!((ENV['POISE_DEBUG'] && ENV['POISE_DEBUG'] != 'false') ||
-                                (ENV['poise_debug'] && ENV['poise_debug'] != 'false') ||
-                                (ENV['DEBUG'] && ENV['DEBUG'] != 'false')
-                               ),
-          },
-        },
-        'platforms' => expand_kitchen_platforms(platforms).map {|p| platform_definition(p, root) },
-        'suites' => [suite_definition(root)],
-      }.to_yaml.gsub(/---[ \n]/, '')
-    end
-
-    private
-
-    # Expand aliases from PLATFORM_ALIASES.
-    def expand_kitchen_platforms(platforms)
-      platforms = Array(platforms)
-      last_platforms = []
-      while platforms != last_platforms
-        last_platforms = platforms
-        platforms = platforms.map {|p| PLATFORM_ALIASES[p] || p}.flatten.uniq
-      end
-      platforms
+    def self.kitchen(**options)
+      @instance = PoiseBoiler::Helpers::Kitchen.new(**options)
+      @instance.to_yaml
     end
-
-    def platform_definition(name, root)
-      {
-        'name' => name,
-        'run_list' => platform_run_list(name, root) + ((ENV['CI'] || ENV['DEBUG'] || ENV['PROFILE']) ? %w{poise-profiler} : []),
-        'driver_config' => platform_driver(name),
-      }
-    end
-
-    # Return the platform-level run list for a given platform.
-    #
-    # @param platform [String] Platform name.
-    # @return [Array<String>]
-    def platform_run_list(platform, root)
-      if (platform.start_with?('debian') || platform.start_with?('ubuntu')) && !docker_enabled?(root)
-        %w{apt}
-      else
-        []
-      end
-    end
-
-    def platform_driver(platform)
-      if platform.start_with?('freebsd')
-        {
-          'binary' => (ENV['TRAVIS'] == 'true' ? './' : '') + 'docker-1.7.1',
-          'image' => 'lexaguskov/freebsd',
-          'socket' => ENV['POISE_DOCKER_FREEBSD'] || 'tcp://dockerbsd.poise.io:443',
-        }
-      else
-        {
-          'binary' => (ENV['TRAVIS'] == 'true' ? './' : '') + 'docker',
-          'socket' => ENV['POISE_DOCKER_LINUX'] || 'tcp://docker.poise.io:443',
-        }
-      end
-    end
-
-    def suite_definition(root)
-      gemspec_path = Dir[File.join(root, '*.gemspec')].first
-      unless gemspec_path
-        puts "Unable to determine gemspec path for #{root}"
-        return {}
-      end
-      gem_data = Halite::Gem.new(Bundler.load_gemspec(gemspec_path))
-      {
-        'name' => 'default',
-        'run_list' => (File.exist?(File.join(root, 'test', 'cookbook')) || File.exist?(File.join(root, 'test', 'cookbooks'))) ? ["#{gem_data.cookbook_name}_test"] : [gem_data.cookbook_name],
-      }
-    end
-
-    def docker_enabled?(root)
-      File.exist?(File.expand_path('test/docker/docker.key', root))
-    end
-
   end
 end

data/lib/poise_boiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/lib/poise_boiler.rb

@@ -14,15 +14,14 @@
 # limitations under the License.
 #
 
-require 'poise_boiler/kitchen'
-
 
 module PoiseBoiler
   autoload :Helpers, 'poise_boiler/helpers'
+  autoload :Kitchen, 'poise_boiler/kitchen'
 
   # (see PoiseBoiler::Kitchen#kitchen)
-  def self.kitchen(platforms: 'linux')
+  def self.kitchen(**options)
     # Alias in a top-level namespace to reduce typing.
-    Kitchen.kitchen(platforms: platforms)
+    Kitchen.kitchen(**options)
   end
 end

data/poise-boiler.gemspec

@@ -61,7 +61,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'vagrant-wrapper'
   spec.add_dependency 'kitchen-docker'
   spec.add_dependency 'kitchen-sync', '~> 2.1'
-  spec.add_dependency 'poise-profiler', '~> 1.0.pre'
+  spec.add_dependency 'poise-profiler', '~> 1.0'
 
   # Travis gems
   spec.add_dependency 'codeclimate-test-reporter', '~> 0.4'
@@ -69,4 +69,5 @@ Gem::Specification.new do |spec|
 
   # Development dependencies (yo dawg)
   spec.add_development_dependency 'rspec-command', '~> 1.0'
+  spec.add_development_dependency 'kitchen-rackspace', '~> 0.20'
 end

data/spec/helpers/rake/travis_spec.rb

@@ -117,7 +117,20 @@ EOH
   end # /context secure vars
 
   context 'secure vars and Rackspace' do
-    file '.kitchen.travis.yml', 'name: rackspace'
+    file '.kitchen.yml', <<-EOH
+# PoiseBoiler.kitchen(driver: 'rackspace')
+driver:
+  name: dummy
+
+provisioner:
+  name: dummy
+
+platforms:
+- name: default
+
+suites:
+- name: default
+EOH
     file '.ssh/stub'
     environment TRAVIS_SECURE_ENV_VARS: 'true'
     before do

data/spec/kitchen_spec.rb

@@ -19,26 +19,47 @@ require 'chef/version'
 
 describe 'poise_boiler/kitchen' do
     environment SPEC_BLOCK_CI: true
+    file 'poise-boiler-test1.gemspec', <<-EOH
+Gem::Specification.new do |spec|
+  spec.name = 'poise-boiler-test1'
+  spec.version = '1.0.0'
+  spec.authors = ['Noah Kantrowitz']
+  spec.email = %w{noah@coderanger.net}
+  spec.description = %q||
+  spec.summary = %q||
+  spec.homepage = 'http://example.com/'
+  spec.license = 'Apache 2.0'
+
+  spec.files = []
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = []
+
+  spec.add_dependency 'halite'
+end
+EOH
     file '.kitchen.yml', <<-EOH
 ---
 #<% require 'poise_boiler' %>
 <%= PoiseBoiler.kitchen %>
-
-suites:
-- name: default
 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+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
+      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-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
     end # /context kitchen list
 
     context 'kitchen diagnose' do
       command 'kitchen diagnose'
-      its(:stdout) { is_expected.to match(%r{- curl -L https://chef.io/chef/install.sh | bash -s --$}) }
-      its(:stdout) { is_expected.to match(%r{/opt/chef/embedded/bin/gem\s+install\s+--no-rdoc\s+--no-ri\s+--bindir\s+/tmp/verifier/bin\s+thor\s+busser\s+busser-serverspec}m) }
-      its(:stdout) { is_expected.to include('require_chef_omnibus: true') }
+      its(:stdout) do
+        is_expected.to include('require_chef_omnibus: true')
+      end
     end # /context kitchen diagnose
   end # /context with defaults
 
@@ -46,30 +67,31 @@ EOH
     file '.kitchen.yml', <<-EOH
 ---
 #<% require 'poise_boiler' %>
-<%= PoiseBoiler.kitchen(platforms: 'linux') %>
-
-suites:
-- name: default
+<%= PoiseBoiler.kitchen(platforms: 'centos') %>
 EOH
     command 'kitchen list'
-    its(:stdout) { is_expected.to match(/default-ubuntu-1404\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-ubuntu-1204\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-centos-6\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-centos-7\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
+    its(:stdout) do
+      is_expected.to_not match(/default-ubuntu-1404/)
+      is_expected.to_not match(/default-ubuntu-1204/)
+      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
   end # /context with a platform alias
 
   context 'with $CHEF_VERSION set' do
     command 'kitchen diagnose'
     environment CHEF_VERSION: 12
-    its(:stdout) { is_expected.to match(%r{- curl -L https://chef.io/chef/install.sh | bash -s -- -v 12$}) }
-    its(:stdout) { is_expected.to include("require_chef_omnibus: '12'") }
+    its(:stdout) do
+      is_expected.to include("require_chef_omnibus: '12'")
+    end
   end # /context with $CHEF_VERSION set
 
   context 'with $CI set' do
     command 'kitchen diagnose'
     environment CI: true, SPEC_BLOCK_CI: false
-    its(:stdout) { is_expected.to match(%r{- curl -L https://chef.io/chef/install.sh | bash -s -- -v #{Chef::VERSION}$}) }
-    its(:stdout) { is_expected.to include("require_chef_omnibus: #{Chef::VERSION}") }
+    its(:stdout) do
+      is_expected.to include("require_chef_omnibus: #{Chef::VERSION}")
+    end
   end # /context with $CI set
 
   context 'with a platform override' do
@@ -81,12 +103,27 @@ EOH
 platforms:
 - name: gentoo
 - name: arch
-
-suites:
-- name: default
 EOH
     command 'kitchen list'
-    its(:stdout) { is_expected.to match(/default-gentoo\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-arch\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
+    its(:stdout) do
+      is_expected.to match(/default-gentoo\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
+      is_expected.to match(/default-arch\s+(Vagrant|Dummy)\s+PoiseSolo\s+(Busser\s+Sftp\s+)?<Not Created>/)
+    end
   end # /context with a platform override
+
+  context 'with kitchen-rackspace' do
+    file '.kitchen.yml', <<-EOH
+#<% require 'poise_boiler' %>
+<%= PoiseBoiler.kitchen(driver: 'rackspace') %>
+EOH
+    file '.ssh/id_rsa.pub'
+    command 'kitchen list'
+    environment RACKSPACE_USERNAME: 'dummy', RACKSPACE_API_KEY: '1234'
+    before do
+      _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>/)
+    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.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,14 +322,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.pre
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.pre
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +378,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: kitchen-rackspace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 description: Boilerplate-reduction helpers for Poise/Halite-style gemss.
 email:
 - noah@coderanger.net
@@ -399,6 +413,10 @@ files:
 - lib/poise_boiler.rb
 - lib/poise_boiler/error.rb
 - lib/poise_boiler/helpers.rb
+- lib/poise_boiler/helpers/kitchen.rb
+- lib/poise_boiler/helpers/kitchen/Dockerfile.erb
+- lib/poise_boiler/helpers/kitchen/core_ext.rb
+- lib/poise_boiler/helpers/kitchen/provisioner.rb
 - lib/poise_boiler/helpers/rake.rb
 - lib/poise_boiler/helpers/rake/badges.rb
 - lib/poise_boiler/helpers/rake/bump.rb
@@ -410,9 +428,6 @@ files:
 - lib/poise_boiler/helpers/rake/year.rb
 - lib/poise_boiler/helpers/spec_helper.rb
 - lib/poise_boiler/kitchen.rb
-- lib/poise_boiler/kitchen/Dockerfile.erb
-- lib/poise_boiler/kitchen/core_ext.rb
-- lib/poise_boiler/kitchen/provisioner.rb
 - lib/poise_boiler/rake.rb
 - lib/poise_boiler/rakefile.rb
 - lib/poise_boiler/spec_helper.rb

data/lib/poise_boiler/kitchen/provisioner.rb

@@ -1,102 +0,0 @@
-#
-# Copyright 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.
-#
-
-require 'fileutils'
-
-require 'halite'
-require 'kitchen/provisioner/chef_solo'
-
-require 'poise_boiler/kitchen/core_ext'
-
-
-module PoiseBoiler
-  module Kitchen
-    class Provisioner < ::Kitchen::Provisioner::ChefSolo
-      default_config :gemspec do |provisioner|
-        Dir[File.join(provisioner[:kitchen_root], '*.gemspec')].first
-      end
-      expand_path_for :gemspec
-
-      def self.name
-        'PoiseSolo'
-      end
-
-      def create_sandbox
-        super
-        convert_halite_cookbooks
-        copy_test_cookbook
-        copy_test_cookbooks
-      end
-
-      private
-
-      def cookbook_gem
-        @cookbook_gem ||= begin
-          gemspec = Bundler.load_gemspec(config[:gemspec])
-          # Fix the gem path because it defaults to where the gem would be installed.
-          gemspec.full_gem_path = File.dirname(config[:gemspec])
-          Halite::Gem.new(gemspec)
-        end
-      end
-
-      def convert_halite_cookbooks
-        @real_cookbook_deps = {}
-        gems_to_convert = {'poise-profiler' => Halite::Gem.new('poise-profiler')}
-        gems_to_check = [cookbook_gem]
-        until gems_to_check.empty?
-          check = gems_to_check.pop
-          # Already in the list, skip expansion.
-          next if gems_to_convert.include?(check.name)
-          # Not a cookbook, don't expand.
-          next unless check.is_halite_cookbook?
-          gems_to_convert[check.name] = check
-          # Expand dependencies and check each of those.
-          check.cookbook_dependencies.each do |dep|
-            dep_cook = dep.cookbook
-            if dep_cook
-              gems_to_check << dep_cook
-            else
-              @real_cookbook_deps[dep.name] = dep
-            end
-          end
-        end
-        # Convert all the things!
-        tmpbooks_dir = File.join(sandbox_path, 'cookbooks')
-        FileUtils.mkdir_p(tmpbooks_dir)
-        gems_to_convert.each do |name, gem_data|
-          Halite.convert(gem_data, File.join(tmpbooks_dir, gem_data.cookbook_name))
-        end
-      end
-
-      def copy_test_cookbook
-        fixture_base = File.join(config[:kitchen_root], 'test', 'cookbook')
-        return unless File.exist?(File.join(fixture_base, 'metadata.rb'))
-        tmp_base = File.join(sandbox_path, 'cookbooks', "#{cookbook_gem.cookbook_name}_test")
-        FileUtils.mkdir_p(tmp_base)
-        FileUtils.cp_r(File.join(fixture_base, "."), tmp_base)
-      end
-
-      def copy_test_cookbooks
-        fixtures_base = File.join(config[:kitchen_root], 'test', 'cookbooks')
-        return unless File.exist?(fixtures_base)
-        tmp_base = File.join(sandbox_path, 'cookbooks')
-        FileUtils.mkdir_p(tmp_base)
-        FileUtils.cp_r(File.join(fixtures_base, "."), tmp_base)
-      end
-
-    end
-  end
-end