Merge pull request #66 from RoboticCheese/jdh-update-everything

WIP: 4.0

.kitchen.circle.yml

@@ -4,12 +4,11 @@ driver:
   privileged: true
 
 platforms:
-  - name: ubuntu-15.10
+  - name: ubuntu-16.04
   - name: ubuntu-14.04
   - name: ubuntu-12.04
   - name: debian-8
   - name: debian-7
-  - name: debian-6
   - name: centos-7
   - name: centos-6
-  - name: fedora-22
+  - name: fedora-23

.kitchen.yml

@@ -6,14 +6,14 @@ provisioner:
   name: chef_zero
 
 platforms:
+  - name: ubuntu-16.04
   - name: ubuntu-14.04
   - name: ubuntu-12.04
-  - name: debian-8.2
-  - name: debian-7.9
-  - name: debian-6.0.10
+  - name: debian-8.4
+  - name: debian-7.10
   - name: centos-7.2
   - name: centos-6.7
-  - name: fedora-22
+  - name: fedora-23
   - name: macosx-10.10
     driver:
       box: roboticcheese/macosx-10.10
@@ -26,43 +26,28 @@ platforms:
 suites:
   - name: default
     run_list:
-      - recipe[chef-dk]
+      - recipe[chef-dk_test]
   - name: remove
     run_list:
       - recipe[chef-dk_test::remove]
-    attributes:
-      chef_dk:
-        global_shell_init: true
-    excludes:
-      - macosx
-      - windows-2012
-      - windows
-  - name: global_shell_init
-    run_list:
-      - recipe[chef-dk]
-    attributes:
-      chef_dk:
-        global_shell_init: true
   - name: install_from_specific_url
     run_list:
-      - recipe[chef-dk]
+      - recipe[chef-dk_test]
     attributes:
       chef_dk:
-        package_url: https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/chefdk_0.3.4-1_amd64.deb
+        source: https://packages.chef.io/stable/ubuntu/12.04/chefdk_0.14.25-1_amd64.deb
     excludes:
-      - ubuntu-15.10
+      - ubuntu-16.04
       - ubuntu-12.04
-      - debian-8.2
+      - debian-8.4
       - debian-8
-      - debian-7.9
+      - debian-7.10
       - debian-7
-      - debian-6.0.10
-      - debian-6
       - centos-7.2
       - centos-7
       - centos-6.7
       - centos-6
-      - fedora-22
+      - fedora-23
       - macosx-10.10
       - macosx
       - windows-2012

.travis.yml

@@ -1,24 +1,17 @@
 language: objective-c
+osx_image: xcode7.3
+rvm: 2.3.1
+cache: vendor/bundle
 
 branches:
   only:
     - master
 
 install:
-  # Need Berkshelf to resolve dependencies for the local Chef run
-  - curl -L https://www.opscode.com/chef/install.sh | sudo bash -s -- -P chefdk
-  - chef exec berks vendor /tmp/kitchen/cookbooks
-  # Need to delete ChefDK so the local run actually tests something
-  - sudo pkgutil --forget com.getchef.pkg.chefdk
-  - sudo rm -rf /opt/chefdk
-  # Use regular Chef to reinstall ChefDK locally
-  - curl -L https://www.opscode.com/chef/install.sh | sudo bash
-  - sudo chef-client -z -c test/client.rb -j test/dna.json
-  # Then the build can continue on with ChefDK
-  - chef exec bundle install --without=development integration
+  - bundle install --path vendor/bundle --without=development integration
 
 before_script:
   - cp .kitchen.travis.yml .kitchen.local.yml
 
 script:
-  - chef exec kitchen test
+  - bundle exec kitchen test

Berksfile

@@ -1,12 +1,13 @@
-# Encoding: UTF-8
+# encoding: utf-8
+# frozen_string_literal: true
 
 source 'https://supermarket.chef.io'
 
 metadata
 
-group :test do
-  cookbook 'chef_dk_shell_init_test',
-           path: 'spec/support/cookbooks/chef_dk_shell_init_test'
+group :unit do
+  cookbook 'chef_dk_resource_test',
+           path: 'spec/support/cookbooks/chef_dk_resource_test'
 end
 
 group :integration do

CHANGELOG.md

@@ -1,10 +1,16 @@
 Chef-DK Cookbook CHANGELOG
 ==========================
 
-v?.?.? (????-??-??)
--------------------
-* Update to modern provider resolution (breaking compatibility with Chef < 12)
+Unreleased
+----------
+* Convert to Chef custom resources, breaking compatibility with Chef < 12.5
+* Rename the `package_url` property to `source`
 * Move shell-init logic to its own custom resource
+* Add support for Chef's new APT and YUM repositories
+* Add support for OS X installs via Homebrew
+* Replace `:prerelease` and `:nightlies` with a `:channel` property
+* Remove dependency on the Omnijack gem
+* Rename the `package_url` attribute to `source`
 
 v3.1.0 (2015-06-03)
 -------------------

Gemfile

@@ -1,4 +1,5 @@
-# Encoding: UTF-8
+# encoding: utf-8
+# frozen_string_literal: true
 
 source 'https://rubygems.org'
 
@@ -14,8 +15,8 @@ group :test do
   gem 'rake'
   gem 'rubocop'
   gem 'foodcritic'
-  gem 'rspec', '>= 3'
-  gem 'chefspec', '>= 4'
+  gem 'rspec'
+  gem 'chefspec'
   gem 'simplecov'
   gem 'simplecov-console'
   gem 'coveralls'
@@ -24,19 +25,19 @@ group :test do
   gem 'kitchen-localhost'
   gem 'kitchen-vagrant'
   gem 'winrm-transport'
+  gem 'winrm-fs'
   gem 'kitchen-docker'
 end
 
 group :integration do
-  gem 'serverspec', '>= 2'
+  gem 'serverspec'
 end
 
 group :deploy do
   gem 'stove'
 end
 
 group :production do
-  gem 'chef', '>= 11'
-  gem 'berkshelf', '>= 3'
-  gem 'omnijack', '~> 1.0'
+  gem 'chef', '>= 12.5'
+  gem 'berkshelf'
 end

Guardfile

@@ -1,4 +1,5 @@
-# Encoding: UTF-8
+# encoding: utf-8
+# frozen_string_literal: true
 
 guard :rspec, all_on_start: true, notification: false do
   watch(%r{^spec/.+_spec\.rb$})