poise-boiler 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 735ac18006b5b15588fb188a9c215b849fe07e02
-  data.tar.gz: 7a37271c8dad805106b1dcdea3c1fc2114016839
+  metadata.gz: c5ded661ddd8346aef18000700efc49408848c22
+  data.tar.gz: dbf3daf8e8c38d793fe6605aadc092fe47b08e7c
 SHA512:
-  metadata.gz: 3c9fea5a7d835f11b88e63404911df4f23d67309b46b919ac00f4b4d42d85479f22770d72692d52e04e79452720e1da66383b813f405b4c7c2f88a84f9678fe9
-  data.tar.gz: 6990e52d1222794d6f96085be75811be522bd925054df70e755f54504c5d8ff4827373dcb1734589bec72c4505ed515ed728f8f3e081f23f964774e36e09e246
+  metadata.gz: 5e5e41877b1b81393aa2e5d4c3bce42d45ea27824ce3cd9b735b216e4577c0d7b15bb67b1721cf45b84fc527a8a91bdd3ce0f421ffd7854c1298c8e0f9c79e2e
+  data.tar.gz: 5b0e6fac49b3a8d52c99061c1cf8637f3f889df6b73527969e9b0561648f76db1b3659573ce3f2dc7e49935b7f3d5c868591c7c99ebd8755ec1b86b06ef9316e

data/.travis.yml

@@ -6,7 +6,6 @@ addons:
     packages:
     - libgecode-dev
 rvm:
-- "2.0"
 - "2.1"
 - "2.2"
 gemfile:

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v1.8.0
+
+* Windows testing harness support.
+* Allow specifying Chef log level via `$CHEF_LOG_LEVEL`.
+* Support for latest docker release format.
+
+## v1.7.2
+
+* Test Kitchen 1.7.1 resolves the issue with 1.7.0.
+
 ## v1.7.1
 
 * Pin TK 1.6 until I sort out issues with 1.7.

data/lib/poise_boiler/helpers/kitchen.rb

@@ -28,12 +28,13 @@ module PoiseBoiler
       #
       # @see #expand_platforms
       PLATFORM_ALIASES = {
+        'windows' => %w{windows-2012r2},
         '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},
+        'rhel' => %w{centos},
+        'centos' => %w{centos-6 centos-7},
+        'linux' => %w{ubuntu rhel centos},
+        'unix' => %w{linux}, #, freebsd},
+        'all' => %w{unix windows},
       }
 
       def initialize(**options)
@@ -102,7 +103,7 @@ module PoiseBoiler
       # @return [Array<String>]
       def expand_platforms
         # Default platform is linux unless overridden from the helper options.
-        platforms = Array(options[:platforms] || 'linux')
+        platforms = Array(options[:platforms] || (ENV['CI'] ? 'linux' : 'all'))
         last_platforms = []
         # This is probably not the most effcient solution but oh well.
         while platforms != last_platforms
@@ -174,6 +175,7 @@ module PoiseBoiler
       # @return [Hash]
       def provisioner_config
         {
+          '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.
@@ -195,9 +197,28 @@ module PoiseBoiler
           # 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} : []),
+        }.tap {|cfg| cfg.update(windows_platform_config(name)) if name.include?('windows') }
+      end
+
+      # Generate extra Test Kitchen platform configuration for Windows hosts.
+      def windows_platform_config(name)
+        {
+          'driver' => {
+            'name' => 'ec2',
+            'instance_type' => 'm3.medium',
+            'aws_ssh_key_id' => 'ec2',
+          },
+          'transport' => {
+            'name' => 'winrm',
+            'ssh_key' => File.expand_path('~/.ssh/ec2.pem'),
+          },
         }
       end
 
+      # Generate a Test Kitchen suite configuration hash. This is a single suite
+      # that runs the fixture cookbook if present otherwise the main cookbook.
+      #
+      # @return [Hash]
       def suite_config
         {
           'name' => 'default',

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

@@ -42,11 +42,12 @@ module PoiseBoiler
 
           file './docker' do
             begin
-              sh(*%w{wget https://get.docker.com/builds/Linux/x86_64/docker-latest -O docker})
+              sh(*%w{wget https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz -O docker.tgz})
             rescue RuntimeError
-              sh(*%w{curl https://get.docker.com/builds/Linux/x86_64/docker-latest -o docker})
+              sh(*%w{curl https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz -o docker.tgz})
             end
-            File.chmod(0755, './docker')
+            sh(*%w{tar --strip-components=1 -xzvf docker.tgz})
+            File.chmod(0755, *%w{./docker ./docker-containerd ./docker-containerd-ctr ./docker-containerd-shim ./docker-runc})
           end
 
           file '.ssh/id_rsa' do

data/lib/poise_boiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.7.1'
+  VERSION = '1.8.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'
+  spec.add_dependency 'rake', '>= 10.4', '< 12.0'
   spec.add_dependency 'travis', '~> 1.8', '>= 1.8.1'
   spec.add_dependency 'yard', '~> 0.8'
   spec.add_dependency 'yard-classmethods', '~> 1.0'
@@ -56,13 +56,18 @@ Gem::Specification.new do |spec|
 
   # Integration gems
   # https://github.com/test-kitchen/test-kitchen/issues/922
-  spec.add_dependency 'test-kitchen', '~> 1.6.0'
+  spec.add_dependency 'test-kitchen', '~> 1.7', '>= 1.7.1'
   spec.add_dependency 'kitchen-vagrant'
   spec.add_dependency 'vagrant-wrapper'
   spec.add_dependency 'kitchen-docker'
   spec.add_dependency 'kitchen-sync', '~> 2.1'
   spec.add_dependency 'poise-profiler', '~> 1.0'
 
+  # Windows integration gems
+  spec.add_dependency 'kitchen-ec2', '~> 1.0'
+  spec.add_dependency 'winrm', '~> 1.6'
+  spec.add_dependency 'winrm-fs', '~> 0.4'
+
   # Travis gems
   spec.add_dependency 'codeclimate-test-reporter', '~> 0.4'
   spec.add_dependency 'codecov', '~> 0.0', '>= 0.0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-boiler
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -252,14 +258,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: kitchen-vagrant
   requirement: !ruby/object:Gem::Requirement
@@ -330,6 +342,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: kitchen-ec2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: winrm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: winrm-fs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement