Switch to Delivery local for testing

Signed-off-by: Tim Smith <[email protected]>

.gitignore

@@ -42,6 +42,8 @@ vendor/
 .coverage/
 .zero-knife.rb
 Policyfile.lock.json
+Cheffile.lock
+.librarian/
 
 # vagrant stuff
 .vagrant/

.kitchen.dokken.yml

@@ -35,7 +35,7 @@ platforms:
     platform: rhel
     pid_one_command: /sbin/init
     intermediate_instructions:
-      - RUN yum -y install which initscripts net-tools wget
+      - RUN yum -y install lsof which initscripts net-tools wget net-tools
 
 - name: centos-7
   driver:
@@ -50,7 +50,7 @@ platforms:
     image: fedora:latest
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN dnf -y install yum which systemd-sysv initscripts wget net-tools
+      - RUN dnf -y install which systemd-sysv initscripts wget net-tools
 
 - name: ubuntu-14.04
   driver:
@@ -73,7 +73,7 @@ platforms:
     image: opensuse:leap
     pid_one_command: /bin/systemd
     intermediate_instructions:
-      - RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive which hostname
+      - RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive which net-tools
 
 suites:
 - name: multi_instance

.kitchen.yml

@@ -13,7 +13,7 @@ platforms:
   - name: debian-7.11
   - name: debian-8.6
   - name: fedora-25
-  - name: opensuse-leap-42.1
+  - name: opensuse-leap-42.2
   - name: ubuntu-14.04
   - name: ubuntu-16.04
 

.travis.yml

@@ -1,7 +1,6 @@
 sudo: required
 dist: trusty
 
-# install the pre-release chef-dk.  Use chef-stable-trusty to install the stable release
 addons:
   apt:
     sources:
@@ -40,9 +39,6 @@ script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml /opt/chefdk/embedded/bin/kitchen
 
 matrix:
   include:
-    - before_script:
-      - eval "$(/opt/chefdk/bin/chef shell-init bash)"
-
     - script:
-      - /opt/chefdk/bin/chef exec rake
+      - /opt/chefdk/bin/chef exec delivery local all
       env: UNIT_AND_LINT=1

Gemfile

@@ -7,6 +7,5 @@
 source 'https://rubygems.org'
 
 gem 'tomlrb'
-gem 'rake'
 gem 'stove'
 gem 'community_cookbook_releaser'

libraries/tomcat.rb

@@ -27,9 +27,8 @@ def derived_install_path
 
 # make sure catalina base is in the env_var has no matter what
 def ensure_catalina_base
-  unless new_resource.env_vars.any? { |env_hash| env_hash.key?('CATALINA_BASE') }
-    new_resource.env_vars.unshift('CATALINA_BASE' => derived_install_path)
-  end
+  return if new_resource.env_vars.any? { |env_hash| env_hash.key?('CATALINA_BASE') }
+  new_resource.env_vars.unshift('CATALINA_BASE' => derived_install_path)
 end
 
 # choose the right platform init class

spec/unit/recipes/default_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'default recipe on ubuntu 16.04' do
   let(:runner) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04') }
-  let(:chef_run) { runner.converge('tomcat::default') }
+  let(:chef_run) { runner.converge('test::default') }
 
   it 'converges successfully' do
     expect { :chef_run }.to_not raise_error