From d446bfacaefad5b7f7caac8132d20381c7e6caa5 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Tue, 28 Feb 2017 20:52:47 -0800
Subject: [PATCH] Test with Local Delivery instead of Rake

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 .delivery/project.toml                     |  1 +
 .gitignore                                 |  2 +
 .kitchen.docker.yml => .kitchen.dokken.yml |  9 +--
 .travis.yml                                |  4 +-
 Rakefile                                   | 69 ----------------------
 5 files changed, 6 insertions(+), 79 deletions(-)
 create mode 100644 .delivery/project.toml
 rename .kitchen.docker.yml => .kitchen.dokken.yml (88%)
 delete mode 100644 Rakefile

diff --git a/.delivery/project.toml b/.delivery/project.toml
new file mode 100644
index 0000000..6d5e361
--- /dev/null
+++ b/.delivery/project.toml
@@ -0,0 +1 @@
+remote_file = "https://raw.githubusercontent.com/chef-cookbooks/community_cookbook_tools/master/delivery/project.toml"
diff --git a/.gitignore b/.gitignore
index 6c97e28..abdff6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,8 @@ vendor/
 .coverage/
 .zero-knife.rb
 Policyfile.lock.json
+Cheffile.lock
+.librarian/
 
 # vagrant stuff
 .vagrant/
diff --git a/.kitchen.docker.yml b/.kitchen.dokken.yml
similarity index 88%
rename from .kitchen.docker.yml
rename to .kitchen.dokken.yml
index df09ebd..b2c88e5 100644
--- a/.kitchen.docker.yml
+++ b/.kitchen.dokken.yml
@@ -51,7 +51,7 @@ platforms:
     image: fedora:latest
     pid_one_command: /usr/lib/systemd/systemd
     intermediate_instructions:
-      - RUN dnf -y install yum which systemd-sysv initscripts
+      - RUN dnf -y install which systemd-sysv initscripts
 
 - name: ubuntu-14.04
   driver:
@@ -67,13 +67,6 @@ platforms:
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
 
-- name: opensuse-13.2
-  driver:
-    image: opensuse:13.2
-    pid_one_command: /bin/systemd
-    intermediate_instructions:
-      - RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive which net-tools
-
 - name: opensuse-leap
   driver:
     image: opensuse:leap
diff --git a/.travis.yml b/.travis.yml
index 5ea79b2..9f51f20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,10 @@ before_script:
   - /opt/chefdk/embedded/bin/cookstyle --version
   - /opt/chefdk/embedded/bin/foodcritic --version
 
-script: KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
+script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
 
 matrix:
   include:
     - script:
-      - /opt/chefdk/bin/chef exec rake
+      - /opt/chefdk/bin/chef exec delivery local all
       env: UNIT_AND_LINT=1
diff --git a/Rakefile b/Rakefile
deleted file mode 100644
index f810d23..0000000
--- a/Rakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env rake
-
-require_relative 'tasks/maintainers'
-
-# Style tests. cookstyle (rubocop) and Foodcritic
-namespace :style do
-  begin
-    require 'cookstyle'
-    require 'rubocop/rake_task'
-
-    desc 'Run Ruby style checks'
-    RuboCop::RakeTask.new(:ruby)
-  rescue LoadError => e
-    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
-  end
-
-  begin
-    require 'foodcritic'
-
-    desc 'Run Chef style checks'
-    FoodCritic::Rake::LintTask.new(:chef) do |t|
-      t.options = {
-        fail_tags: ['any'],
-        progress: true,
-      }
-    end
-  rescue LoadError => e
-    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
-  end
-end
-
-desc 'Run all style checks'
-task style: ['style:chef', 'style:ruby']
-
-# ChefSpec
-begin
-  require 'rspec/core/rake_task'
-
-  desc 'Run ChefSpec examples'
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError => e
-  puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
-end
-
-# Integration tests. Kitchen.ci
-namespace :integration do
-  begin
-    require 'kitchen/rake_tasks'
-
-    desc 'Run kitchen integration tests'
-    Kitchen::RakeTasks.new
-  rescue LoadError, StandardError => e
-    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
-  end
-end
-
-namespace :supermarket do
-  begin
-    require 'stove/rake_task'
-
-    desc 'Publish cookbook to Supermarket with Stove'
-    Stove::RakeTask.new
-  rescue LoadError => e
-    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV['CI']
-  end
-end
-
-# Default
-task default: %w(style spec)