poise-boiler 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a9de8bb85af2b08dbe09f5d11dab690d494d9d
-  data.tar.gz: 2c888ad9e14103920e64995d536c49db2a9b1d13
+  metadata.gz: cd1b2217f90d2b5e97250517db809e44a9922f86
+  data.tar.gz: ef8ddebba565e10342604fde82e2fe5f860e1ddc
 SHA512:
-  metadata.gz: 7a4b49b6126cf54927217b49e6476ec2655e6b144db513deb88d7611a7ba4947f1e8935018a54a9e31bbeafa83a6a0311163ad4085c2372308e016d59bd912d5
-  data.tar.gz: 79a1f7c2c9aafeb67bb2d38f773215eb27cde051fddf702741ee77576671ec3ff903c9cd4b13d49b0783048c191b1c730570adc765f4b57c43f923aa2b649fef
+  metadata.gz: 0062710d338b8d3773ae3048a361461cae0e3e9344e77da7dc3646c4fce8341f47918631887cda0d7df044d920693209d77a4b8cbdecdbfa54ba1734a92f9e99
+  data.tar.gz: 6e5772aa9071c4a6e27d4007518ff6df3f324535bca64a0936cb4ae5823bd6d55e6db5fad5264ca406fb48d9bd0614b85c8fe554b947e8c638e2f4220b171c95

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v1.6.0
+
+* New rake task to update copyright years.
+* New kitchen provisioner to avoid using Berkshelf unless we need non-gem cookbooks.
+* Provide a default suite config for kitchen.
+* Berkshelf is no longer a dependency. This is kind of a compat break but oh well.
+* Automatically run poise-profiler in CI.
+
 ## v1.5.1
 
 * Fix the bundler gem install to work with busser-serverspec.

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -18,11 +18,14 @@ source 'https://rubygems.org/'
 
 gemspec path: File.expand_path('..', __FILE__)
 
-def dev_gem(name, path: File.join('..', name))
+def dev_gem(name, path: File.join('..', name), github: nil)
   path = File.expand_path(File.join('..', path), __FILE__)
   if File.exist?(path)
     gem name, path: path
+  elsif github
+    gem name, github: github
   end
 end
 
 dev_gem 'halite'
+dev_gem 'poise-profiler', github: 'poise/poise-profiler'

data/README.md

@@ -127,7 +127,7 @@ suites:
 
 ## License
 
-Copyright 2015, Noah Kantrowitz
+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.

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/gemfiles/default.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/gemfiles/master.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/kitchen/provisioner/poise_solo.rb

@@ -0,0 +1,26 @@
+#
+# 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 'poise_boiler/kitchen/provisioner'
+
+
+# @api private
+module Kitchen
+  module Provisioner
+    # An alias for Kitchen plugin loading.
+    PoiseSolo = PoiseBoiler::Kitchen::Provisioner
+  end
+end

data/lib/poise-boiler.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_boiler.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -21,7 +21,7 @@ module PoiseBoiler
   autoload :Helpers, 'poise_boiler/helpers'
 
   # (see PoiseBoiler::Kitchen#kitchen)
-  def self.kitchen(platforms: 'ubuntu-14.04')
+  def self.kitchen(platforms: 'linux')
     # Alias in a top-level namespace to reduce typing.
     Kitchen.kitchen(platforms: platforms)
   end

data/lib/poise_boiler/error.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_boiler/helpers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_boiler/helpers/rake.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -33,6 +33,7 @@ module PoiseBoiler
       autoload :Debug, 'poise_boiler/helpers/rake/debug'
       autoload :Release, 'poise_boiler/helpers/rake/release'
       autoload :Travis, 'poise_boiler/helpers/rake/travis'
+      autoload :Year, 'poise_boiler/helpers/rake/year'
 
       # Install all rake tasks.
       #
@@ -45,6 +46,7 @@ module PoiseBoiler
         Debug.install(gem_name: gem_name, base: base, **options)
         Release.install(gem_name: gem_name, base: base, **options)
         Travis.install(gem_name: gem_name, base: base, **options)
+        Year.install(gem_name: gem_name, base: base, **options)
       end
     end
   end

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-require 'addressable/uri'
+require 'uri'
+
 require 'halite/gem'
 require 'halite/helper_base'
 require 'mixlib/shellout'
@@ -82,7 +83,7 @@ module PoiseBoiler
         # @return [String]
         def badge(alt, img, href)
           # Default scheme and hostname because I can.
-          img = "https://img.shields.io/#{img}.svg" unless Addressable::URI.parse(img).host
+          img = "https://img.shields.io/#{img}.svg" unless URI.parse(img).host
           "[![#{alt}](#{img})](#{href})\n"
         end
 
@@ -97,11 +98,16 @@ module PoiseBoiler
           git_remote = git_shell_out(%W{config --get branch.#{git_head}.remote})
           git_remote = 'origin' if !git_remote || git_remote.empty? # Default value
           git_info = git_shell_out(%w{ls-remote --get-url}+[git_remote])
-          git_regex = %r{/?(.*/.+?)(\.git)?$}
-          if md = Addressable::URI.parse(git_info).path.match(git_regex)
-            md[1]
+          parsed_remote = if git_info =~ /^git@[^:]+:/
+            path = git_info.split(':').last
+            path = "/#{path}" unless path.start_with?('/')
+            path
+          else
+            URI.parse(git_info).path
+          end
+          if parsed_remote =~ %r{/?(.*/.+?)(\.git)?$}
+            $1
           else
-            # Unable to auto-detect
             nil
           end
         end

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

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

@@ -0,0 +1,84 @@
+#
+# 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 'halite/helper_base'
+require 'mixlib/shellout'
+
+
+module PoiseBoiler
+  module Helpers
+    class Rake
+      # Helper for a Rakefile to install tasks for updating copyright years.
+      #
+      # @since 1.6.0
+      # @example Installing tasks
+      #   require 'poise_boiler/helpers/rake/year'
+      #   PoiseBoiler::Helpers::Rake::Year.install
+      # @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"
+      class Year < Halite::HelperBase
+        # Install the rake tasks.
+        #
+        # @return [void]
+        def install
+          # Delayed so that Rake doesn't need to be loaded to run this file.
+          extend ::Rake::DSL
+
+          task 'year' do
+            current_year = Time.now.year.to_s
+            git_files.each do |path|
+              full_path = File.expand_path(path, base)
+              update_file(full_path, current_year)
+            end
+          end
+        end
+
+        private
+
+        def git_files
+          cmd = Mixlib::ShellOut.new(%w{git ls-files}, cwd: base)
+          cmd.run_command
+          cmd.error!
+          cmd.stdout.split(/\n/)
+        end
+
+        def update_file(path, year)
+          st = File.stat(path)
+          # Skip weird files, things over 1MB.
+          return unless st.file? && st.size < 1024 * 1024
+          fd = File.new(path, mode: 'r+b')
+          content = fd.read
+          # Skip any file with null bytes.
+          return if content.include?("\00")
+          new_content = content.gsub(/Copyright (\d\d\d\d)(-\d\d\d\d)?,/) do |match|
+            if $1 == year
+              match
+            else
+              "Copyright #{$1}-#{year},"
+            end
+          end
+          # No change, bailing.
+          return if content == new_content
+          fd.seek(0, 0)
+          fd.write(new_content)
+        end
+
+      end
+    end
+  end
+end

data/lib/poise_boiler/helpers/spec_helper.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_boiler/kitchen.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require 'bundler'
+require 'halite'
 require 'kitchen'
 
 
@@ -43,7 +45,7 @@ module PoiseBoiler
     # @example .kitchen.yml
     #   #<% require 'poise_boiler' %>
     #   <%= PoiseBoiler.kitchen %>
-    def kitchen(platforms: 'ubuntu-14.04', root: nil)
+    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)
@@ -67,11 +69,10 @@ module PoiseBoiler
       else
         ''
       end
-      docker_enabled = File.exist?(File.expand_path('test/docker/docker.key', root))
       {
         'chef_versions' => %w{12},
         'driver' => {
-          'name' => (docker_enabled ? 'docker' : ENV['TRAVIS'] == 'true' ? 'dummy' : 'vagrant'),
+          '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.
@@ -105,9 +106,10 @@ module PoiseBoiler
         },
         'transport' => {
           'name' => 'sftp',
-          'ssh_key' => docker_enabled ? File.expand_path('.kitchen/docker_id_rsa', root) : nil,
+          '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') ||
@@ -115,7 +117,8 @@ module PoiseBoiler
                                ),
           },
         },
-        'platforms' => expand_kitchen_platforms(platforms).map {|p| platform_definition(p) },
+        'platforms' => expand_kitchen_platforms(platforms).map {|p| platform_definition(p, root) },
+        'suites' => [suite_definition(root)],
       }.to_yaml.gsub(/---[ \n]/, '')
     end
 
@@ -132,10 +135,10 @@ module PoiseBoiler
       platforms
     end
 
-    def platform_definition(name)
+    def platform_definition(name, root)
       {
         'name' => name,
-        'run_list' => platform_run_list(name),
+        'run_list' => platform_run_list(name, root) + ((ENV['CI'] || ENV['DEBUG'] || ENV['PROFILE']) ? %w{poise-profiler} : []),
         'driver_config' => platform_driver(name),
       }
     end
@@ -144,8 +147,8 @@ module PoiseBoiler
     #
     # @param platform [String] Platform name.
     # @return [Array<String>]
-    def platform_run_list(platform)
-      if platform.start_with?('debian') || platform.start_with?('ubuntu')
+    def platform_run_list(platform, root)
+      if (platform.start_with?('debian') || platform.start_with?('ubuntu')) && !docker_enabled?(root)
         %w{apt}
       else
         []
@@ -166,5 +169,23 @@ module PoiseBoiler
         }
       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/kitchen/core_ext.rb

@@ -0,0 +1,24 @@
+#
+# 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 'kitchen/provisioner/chef/common_sandbox'
+
+
+# Monkey-patch Test Kitchen to not try to create the fake cookbook.
+class Kitchen::Provisioner::Chef::CommonSandbox
+  def make_fake_cookbook
+  end
+end

data/lib/poise_boiler/kitchen/provisioner.rb

@@ -0,0 +1,102 @@
+#
+# 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

data/lib/poise_boiler/rake.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_boiler/rakefile.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_boiler/spec_helper.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_boiler/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end

data/poise-boiler.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -35,12 +35,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w{lib}
 
   # Development gems
-  spec.add_dependency 'addressable', '~> 2.3'
+  spec.add_dependency 'bundler' # Used for Bundler.load_gemspec
   spec.add_dependency 'rake', '~> 10.4'
   spec.add_dependency 'travis', '~> 1.8', '>= 1.8.1'
   spec.add_dependency 'yard', '~> 0.8'
   spec.add_dependency 'yard-classmethods', '~> 1.0'
-  spec.add_dependency 'halite', '~> 1.0' # This is a circular dependency
+  spec.add_dependency 'halite', '~> 1.2' # This is a circular dependency
   spec.add_dependency 'mixlib-shellout', '>= 1.4', '< 3.0' # Chef 11 means shellout 1.4 :-(
   spec.add_dependency 'pry'
   spec.add_dependency 'pry-byebug'
@@ -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 'berkshelf', '~> 4.0'
+  spec.add_dependency 'poise-profiler', '~> 1.0.pre'
 
   # Travis gems
   spec.add_dependency 'codeclimate-test-reporter', '~> 0.4'

data/spec/helpers/rake/badge_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/spec/helpers/rake/bump_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/spec/helpers/rake/check_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/spec/helpers/rake/travis_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/spec/helpers/rake_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/spec/helpers/spec_helper_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/spec/kitchen_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -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+Sftp\s+)?<Not Created>/) }
+      its(:stdout) { is_expected.to match(/default-ubuntu-1404\s+(Vagrant|Dummy)\s+PoiseSolo\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+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>/) }
+    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>/) }
   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+Sftp\s+)?<Not Created>/) }
-    its(:stdout) { is_expected.to match(/default-arch\s+(Vagrant|Dummy)\s+ChefSolo\s+(Busser\s+Sftp\s+)?<Not Created>/) }
+    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>/) }
   end # /context with a platform override
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: poise-boiler
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -317,19 +317,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: berkshelf
+  name: poise-profiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.0.pre
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -394,6 +394,7 @@ files:
 - Rakefile
 - gemfiles/default.gemfile
 - gemfiles/master.gemfile
+- lib/kitchen/provisioner/poise_solo.rb
 - lib/poise-boiler.rb
 - lib/poise_boiler.rb
 - lib/poise_boiler/error.rb
@@ -406,9 +407,12 @@ files:
 - lib/poise_boiler/helpers/rake/debug.rb
 - lib/poise_boiler/helpers/rake/release.rb
 - lib/poise_boiler/helpers/rake/travis.rb
+- 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