poise-boiler 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5ded661ddd8346aef18000700efc49408848c22
-  data.tar.gz: dbf3daf8e8c38d793fe6605aadc092fe47b08e7c
+  metadata.gz: decb85a1657b0c1c205af3a06f5230e560ebd263
+  data.tar.gz: f1779ebb60dce5312bbe7e6acc0b04888ef752fb
 SHA512:
-  metadata.gz: 5e5e41877b1b81393aa2e5d4c3bce42d45ea27824ce3cd9b735b216e4577c0d7b15bb67b1721cf45b84fc527a8a91bdd3ce0f421ffd7854c1298c8e0f9c79e2e
-  data.tar.gz: 5b0e6fac49b3a8d52c99061c1cf8637f3f889df6b73527969e9b0561648f76db1b3659573ce3f2dc7e49935b7f3d5c868591c7c99ebd8755ec1b86b06ef9316e
+  metadata.gz: 7592335dce58c6705c6e563ab94f83e5d39bb328dae8bbf93999af6364b89ecbb88056a553e447b348b56d89ed7c6f3997a45c7d2707d7ed919bd601e284fb82
+  data.tar.gz: d3a1c25c7071428b36971465a31a76a1949ecb839e48824348532c2c9bfd849de1a391bd9123a08149ddd7c8885b4cae42a51cf8b6a83611ec16973468d6f4e1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.9.0
+
+* Super experimental Halite+Policy provisioner plugin.
+* Set `node['CI']` if needed for poise-profiler.
+
 ## v1.8.0
 
 * Windows testing harness support.

data/lib/kitchen/provisioner/poise_policyfile_zero.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/helpers/kitchen/policy_provisioner'
+
+
+# @api private
+module Kitchen
+  module Provisioner
+    # An alias for Kitchen plugin loading.
+    PoisePolicyfileZero = PoiseBoiler::Helpers::Kitchen::PolicyProvisioner
+  end
+end

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

@@ -0,0 +1,79 @@
+#
+# 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'
+
+# From chef-dk.
+require 'kitchen/provisioner/policyfile_zero'
+require 'mixlib/shellout'
+
+require 'poise_boiler/helpers/kitchen/provisioner_helpers'
+
+
+module PoiseBoiler
+  module Helpers
+    class Kitchen
+      class PolicyProvisioner < ::Kitchen::Provisioner::PolicyfileZero
+        include ProvisionerHelpers
+
+        # Override the default value from the base class.
+        # default_config :policyfile, '.kitchen/poise_policy.rb'
+        # expand_path_for :policyfile
+
+        def self.name
+          'PoisePolicyfileZero'
+        end
+
+        # Run our policy generation first.
+        def create_sandbox
+          policy_base = File.join(config[:kitchen_root], '.kitchen', 'poise_policy')
+          # Copy all my halite-y stuff to a folder. This should probably use a
+          # temp dir instead.
+          FileUtils.rm_rf(policy_base)
+          convert_halite_cookbooks(policy_base) unless poise_helper_instance.options['no_gem']
+          copy_test_cookbook(policy_base)
+          copy_test_cookbooks(policy_base)
+          # Generate a modified policy to use the cookbooks we just made.
+          policy_path = generate_poise_policy(policy_base)
+          # 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
+          super
+        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
+        end
+
+        def compile_poise_policy(policy_path)
+          info("Compiling policy")
+          compile_cmd = Mixlib::ShellOut.new(['chef', 'update', policy_path])
+          compile_cmd.run_command
+          compile_cmd.error!
+        end
+
+      end
+    end
+  end
+end

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

@@ -14,18 +14,18 @@
 # limitations under the License.
 #
 
-require 'fileutils'
-
-require 'halite'
 require 'kitchen/provisioner/chef_solo'
 
 require 'poise_boiler/helpers/kitchen/core_ext'
+require 'poise_boiler/helpers/kitchen/provisioner_helpers'
 
 
 module PoiseBoiler
   module Helpers
     class Kitchen
       class Provisioner < ::Kitchen::Provisioner::ChefSolo
+        include ProvisionerHelpers
+
         default_config :gemspec do |provisioner|
           Dir[File.join(provisioner[:kitchen_root], '*.gemspec')].first
         end
@@ -37,62 +37,9 @@ module PoiseBoiler
 
         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)
+          convert_halite_cookbooks(sandbox_path) unless poise_helper_instance.options['no_gem']
+          copy_test_cookbook(sandbox_path)
+          copy_test_cookbooks(sandbox_path)
         end
 
       end

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

@@ -0,0 +1,83 @@
+#
+# 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'
+
+
+module PoiseBoiler
+  module Helpers
+    class Kitchen
+      # Helper methods for the two TK provisioners.
+      module ProvisionerHelpers
+        private
+
+        def poise_helper_instance
+          PoiseBoiler::Kitchen.instance || begin
+            raise 'Global poise-boiler kitchen instance not set'
+          end
+        end
+
+        def convert_halite_cookbooks(dest)
+          @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(dest, '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(dest)
+          fixture_base = File.join(config[:kitchen_root], 'test', 'cookbook')
+          return unless File.exist?(File.join(fixture_base, 'metadata.rb'))
+          tmp_base = File.join(dest, '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(dest)
+          fixtures_base = File.join(config[:kitchen_root], 'test', 'cookbooks')
+          return unless File.exist?(fixtures_base)
+          tmp_base = File.join(dest, '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

@@ -178,8 +178,10 @@ module PoiseBoiler
           'log_level' => (ENV['DEBUG'] ? 'debug' : (ENV['CHEF_LOG_LEVEL'] || 'auto')),
           # Use the poise_solo provisioner, also part of kitchen-docker.
           'name' => 'poise_solo',
-          # Pass through debug/poise_debug settings to the test instance.
           'attributes' => {
+            # Pass through $CI to know if we are on Travis.
+            'CI' => ENV['CI'],
+            # Pass through debug/poise_debug settings to the test instance.
             'POISE_DEBUG' => !!((ENV['POISE_DEBUG'] && ENV['POISE_DEBUG'] != 'false') ||
                                 (ENV['poise_debug'] && ENV['poise_debug'] != 'false') ||
                                 (ENV['DEBUG'] && ENV['DEBUG'] != 'false')

data/lib/poise_boiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.8.0'
+  VERSION = '1.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-boiler
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -462,6 +462,7 @@ files:
 - Rakefile
 - gemfiles/default.gemfile
 - gemfiles/master.gemfile
+- lib/kitchen/provisioner/poise_policyfile_zero.rb
 - lib/kitchen/provisioner/poise_solo.rb
 - lib/poise-boiler.rb
 - lib/poise_boiler.rb
@@ -470,7 +471,9 @@ files:
 - 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/policy_provisioner.rb
 - lib/poise_boiler/helpers/kitchen/provisioner.rb
+- lib/poise_boiler/helpers/kitchen/provisioner_helpers.rb
 - lib/poise_boiler/helpers/rake.rb
 - lib/poise_boiler/helpers/rake/badges.rb
 - lib/poise_boiler/helpers/rake/bump.rb