poise-boiler 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef60e7bfec2579685ca4869b7c01da0c3fab167
-  data.tar.gz: 3b69e2bd68f4104fba50e91855bb133bc01e1310
+  metadata.gz: c57f0874cd6f3de21e85242546d75f7697155947
+  data.tar.gz: 45f94bce4cfea5c06202a51cdc09c04dddaaa26b
 SHA512:
-  metadata.gz: b304e48949147a4f3ad8682404b700d53af313a52cca5ddca7c109d028a9d1f76af83df04184596f4a52dff597723cf639ab2b2ae9ab6c8e5144d9fca9086e04
-  data.tar.gz: ba76027ff93e660b83209cf0477e39de34c0e80407f32b3ef8733f63936e20951c81dff6cb4542225cd17d9fce09a7092a8d5bcd010b5797c25bfe8844ce2920
+  metadata.gz: 59f322469323237e2b8069aecd7e2c37b50209f174593d4d530735d3a8520a1cb428e85ef5ed1914c3fc60528284ec946eb062fa974077d5f78bc91d40e2cd87
+  data.tar.gz: 58ed212f372a7a488459f9d555c9b8fe7a206748c55688e138f589a043c76dcf287360b829430f1e0fadf07a0145ceee28f599ae301a98c44f2958a3136d3c3b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.1.11
+
+* Make sure `ss` is available on EL7 for `port` resources in Serverspec.
+
 ## v1.1.10
 
 * Better fix for faraday gzip issues.

data/lib/poise_boiler/helpers/spec_helper.rb

@@ -29,6 +29,8 @@ module PoiseBoiler
         require 'rspec'
         require 'rspec/its'
         require 'simplecov'
+        require 'pry'
+        require 'pry-byebug'
 
         # Check for coverage stuffs
         formatters = []

data/lib/poise_boiler/kitchen.rb

@@ -32,6 +32,8 @@ module PoiseBoiler
       'rhel' => %w{centos-6 centos-7},
       'centos' => %w{rhel},
       'linux' => %w{ubuntu rhel},
+      'unix' => %w{linux freebsd},
+      'all' => %{unix windows},
     }
 
     # Return a YAML string suitable for inclusion in a .kitchen.yml config. This
@@ -42,7 +44,14 @@ module PoiseBoiler
     # @example .kitchen.yml
     #   #<% require 'poise_boiler' %>
     #   <%= PoiseBoiler.kitchen %>
-    def kitchen(platforms: 'ubuntu-14.04')
+    def kitchen(platforms: 'ubuntu-14.04', 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.
@@ -59,16 +68,29 @@ module PoiseBoiler
       else
         ''
       end
+      docker_enabled = File.exist?(File.expand_path('test/docker/docker.key', root))
       {
         'chef_versions' => %w{12},
         'driver' => {
-          'name' => (ENV['TRAVIS'] == 'true' ? 'dummy' : 'vagrant'),
+          'name' => (docker_enabled ? '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.
+            # 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",
-            "test ! -f /etc/redhat-release || yum -y install net-tools",
+            "test ! -f /etc/redhat-release || yum -y install net-tools iproute",
             # 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",
@@ -82,8 +104,9 @@ module PoiseBoiler
         },
         'transport' => {
           'name' => 'sftp',
+          'ssh_key' => docker_enabled ? File.expand_path('.kitchen/docker_id_rsa', root) : nil,
         },
-        'platforms' => expand_kitchen_platforms(platforms).map {|p| {'name' => p, 'run_list' => platform_run_list(p)} },
+        'platforms' => expand_kitchen_platforms(platforms).map {|p| platform_definition(p) },
       }.to_yaml.gsub(/---[ \n]/, '')
     end
 
@@ -100,6 +123,14 @@ module PoiseBoiler
       platforms
     end
 
+    def platform_definition(name)
+      {
+        'name' => name,
+        'run_list' => platform_run_list(name),
+        'driver_config' => platform_driver(name),
+      }
+    end
+
     # Return the platform-level run list for a given platform.
     #
     # @param platform [String] Platform name.
@@ -111,5 +142,20 @@ module PoiseBoiler
         []
       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
   end
 end

data/lib/poise_boiler/kitchen/Dockerfile.erb

@@ -0,0 +1,82 @@
+<%# Pull in the base image. %>
+FROM <%= @image %>
+<%# Pass through proxy settings from Test Kitchen or the system. %>
+<% http_proxy = @http_proxy || ENV['http_proxy'] || ENV['HTTP_PROXY'] %>
+<% https_proxy = @https_proxy || ENV['https_proxy'] || ENV['HTTPS_PROXY'] %>
+<% no_proxy = @no_proxy || ENV['no_proxy'] || ENV['NO_PROXY'] %>
+<% if http_proxy %>
+ENV http_proxy <%= http_proxy %>
+ENV HTTP_PROXY <%= http_proxy %>
+<% end %>
+<% if https_proxy %>
+ENV https_proxy <%= https_proxy %>
+ENV HTTPS_PROXY <%= https_proxy %>
+<% end %>
+<% if no_proxy %>
+ENV no_proxy <%= no_proxy %>
+ENV NO_PROXY <%= no_proxy %>
+<% end %>
+<%# Per-platform initializations. %>
+<% case @platform; when 'debian', 'ubuntu' %>
+<% if @disable_upstart %>
+RUN dpkg-divert --local --rename --add /sbin/initctl
+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
+<% when 'rhel', 'centos', 'fedora' %>
+RUN yum clean all
+RUN yum install -y sudo openssh-server openssh-clients which curl net-tools 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 ''
+RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
+<% when 'arch' %>
+RUN pacman -Syu --noconfirm
+RUN pacman -S --noconfirm openssh sudo curl
+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 'gentoo' %>
+RUN emerge sync
+RUN emerge 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 'gentoo-paludis' %>
+RUN cave sync
+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' %>
+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
+RUN ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
+<% end %>
+<%# Create the kitchen user, give it sudo, and create and authorized keys. %>
+<% homedir = @username == 'root' ? '/root' : "/home/#{@username}" %>
+RUN if ! getent passwd <%= @username %>; then \
+  <% if @platform == 'freebsd' %>pw <% end %>useradd <%= @username %> -d <%= homedir %> -m -s /bin/<%= @platform == 'freebsd' ? 'csh' : 'bash' %>; \
+fi
+<% if @password && !@password.empty? %>
+RUN echo <%= @username %>:<%= @password %> | chpasswd
+<% else %>
+RUN passwd -d <%= @username %>
+<% end %>
+RUN echo '<%= @username %> ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+RUN mkdir -p /etc/sudoers.d
+RUN echo '<%= @username %> ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/<%= @username %>
+RUN chmod 0440 /etc/sudoers.d/<%= @username %>
+RUN mkdir -p <%= homedir %>/.ssh
+RUN chown -R <%= @username %> <%= homedir %>/.ssh
+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
+<%# Custom provisioning commands. %>
+<% Array(@provision_command).each do |cmd| %>
+RUN <%= cmd %>
+<% end %>
+<%# Write out the authorized_keys, this happens last because it breaks the
+layer cache on each new test run. %>
+RUN echo '<%= IO.read(@public_key).strip %>' >> <%= homedir %>/.ssh/authorized_keys

data/lib/poise_boiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.1.10'
+  VERSION = '1.1.11'
 end

data/poise-boiler.gemspec

@@ -37,12 +37,13 @@ Gem::Specification.new do |spec|
   # Development gems
   spec.add_dependency 'addressable', '~> 2.3'
   spec.add_dependency 'rake', '~> 10.4'
-  spec.add_dependency 'travis', '~> 1.7'
+  # spec.add_dependency 'travis', '~> 1.8'
   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 'mixlib-shellout', '>= 1.4', '< 3.0' # Chef 11 means shellout 1.4 :-(
   spec.add_dependency 'pry' # Travis depends on old-ass pry, see https://github.com/travis-ci/travis.rb/issues/245
+  spec.add_dependency 'pry-byebug'
 
   # Test gems
   spec.add_dependency 'rspec', '~> 3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-boiler
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
-- !ruby/object:Gem::Dependency
-  name: travis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -370,6 +370,7 @@ files:
 - lib/poise_boiler/helpers/rake/travis.rb
 - lib/poise_boiler/helpers/spec_helper.rb
 - lib/poise_boiler/kitchen.rb
+- lib/poise_boiler/kitchen/Dockerfile.erb
 - lib/poise_boiler/rake.rb
 - lib/poise_boiler/rakefile.rb
 - lib/poise_boiler/spec_helper.rb