Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coderanger/now-cookbook
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: chef-cookbooks/now
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
### Cookbook version
[Version of the cookbook where you are encountering the issue]

### Chef-client version
[Version of chef-client in your environment]

### Platform Details
[Operating system distribution and release version. Cloud provider if running in the cloud]

### Scenario:
[What you are trying to achieve and you can't?]

### Steps to Reproduce:
[If you are filing an issue what are the things we need to do in order to repro your problem? How are you using this cookbook or any resources it includes?]

### Expected Result:
[What are you expecting to happen as the consequence of above reproduction steps?]

### Actual Result:
[What actually happens after the reproduction steps? Include the error output or a link to a gist if possible.]
14 changes: 14 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
### Description

[Describe what this change achieves]

### Issues Resolved

[List any existing issues this PR resolves]

### Check List
- [ ] All tests pass. See https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD
- [ ] New functionality includes testing.
- [ ] New functionality has been documented in the README if applicable
- [ ] The CLA has been signed. See https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD

46 changes: 39 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,49 @@
.vagrant
Berksfile.lock
*.rbc
.config
coverage
InstalledFiles
lib/bundler/man
pkg
rdoc
spec/reports
test/tmp
test/version_tmp
tmp
_Store
*~
*#
.#*
\#*#
.*.sw[a-z]
*.un~
/cookbooks
*.tmp
*.bk
*.bkup

# Bundler
# ruby/bundler files
.ruby-version
.ruby-gemset
.rvmrc
Gemfile.lock
bin/*
.bundle/*
.bundle
*.gem

.kitchen/
# YARD artifacts
.yardoc
_yardoc
doc/
.idea

# chef stuff
Berksfile.lock
.kitchen
.kitchen.local.yml
vendor/
.coverage/
.zero-knife.rb
Policyfile.lock.json

# vagrant stuff
.vagrant/
.vagrant.d/
.kitchen/
47 changes: 47 additions & 0 deletions .kitchen.docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
settings:
parallel: true

driver:
name: docker
# privileged is required otherwise the container doesn't boot right
privileged: true

platforms:
- name: centos-6
driver:
image: centos:6
platform: rhel
run_command: /sbin/init
provision_command:
- /usr/bin/yum install -y initscripts net-tools wget
- name: centos-7
driver:
image: centos:7
platform: rhel
run_command: /usr/lib/systemd/systemd
provision_command:
- /bin/yum install -y initscripts net-tools wget
- name: ubuntu-12.04
driver:
image: ubuntu-upstart:12.04
platform: ubuntu
disable_upstart: false
run_command: /sbin/init
provision_command:
- /usr/bin/apt-get update
- /usr/bin/apt-get install apt-transport-https net-tools -y
- name: ubuntu-14.04
driver:
image: ubuntu-upstart:14.04
platform: ubuntu
disable_upstart: false
run_command: /sbin/init
provision_command:
- /usr/bin/apt-get update
- /usr/bin/apt-get install apt-transport-https net-tools -y

suites:
- name: default
run_list:
- recipe[now_test::default]
- recipe[now_test::third]
37 changes: 26 additions & 11 deletions .kitchen.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
---
driver_plugin: vagrant
driver_config:
require_chef_omnibus: true
driver:
name: vagrant

provisioner:
name: chef_zero

platforms:
- name: ubuntu-12.04
driver_config:
box: opscode-ubuntu-12.04
box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
- name: centos-5.11
- name: centos-6.8
- name: centos-7.2
- name: debian-7.10
run_list: apt::default
- name: debian-8.5
run_list: apt::default
- name: fedora-22
run_list: yum::dnf_yum_compat
- name: fedora-23
run_list: yum::dnf_yum_compat
- name: ubuntu-12.04
run_list: apt::default
- name: ubuntu-14.04
run_list: apt::default
- name: ubuntu-16.04
run_list: apt::default

suites:
- name: default
run_list:
- recipe[now_test]
- name: default
run_list:
- recipe[now_test::default]
- recipe[now_test::third]
37 changes: 37 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
sudo: required
dist: trusty

# install the pre-release chef-dk. Use chef-stable-precise to install the stable release
addons:
apt:
sources:
- chef-current-precise
packages:
- chefdk

services: docker

env:
matrix:
- INSTANCE=default-ubuntu-1204
- INSTANCE=default-ubuntu-1404
- INSTANCE=default-centos-6
- INSTANCE=default-centos-7

# Don't `bundle install`
install: echo "skip bundle install"

# Ensure we make ChefDK's Ruby the default
before_script:
# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142230889
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(/opt/chefdk/bin/chef shell-init bash)"
- /opt/chefdk/embedded/bin/chef gem install kitchen-docker
script:
- /opt/chefdk/embedded/bin/chef --version
- /opt/chefdk/embedded/bin/cookstyle --version
- /opt/chefdk/embedded/bin/cookstyle
- /opt/chefdk/embedded/bin/foodcritic --version
- /opt/chefdk/embedded/bin/foodcritic . --exclude spec -f any -P
- /opt/chefdk/embedded/bin/rspec
- KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
6 changes: 4 additions & 2 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
site :opscode
source 'https://supermarket.chef.io'

metadata

group :integration do
cookbook "now_test", :path => "./test/cookbooks/now_test"
cookbook 'yum'
cookbook 'apt'
cookbook 'now_test', path: './test/fixtures/cookbooks/now_test'
end
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
now cookbook CHANGELOG
======================
This file is used to list changes made in each version of the now cookbook.

## 1.0.0 (2016-09-16)
- Testing updates
- Require Chef 12.1

v0.3.2 (2015-10-21)
-------------------
* Added requirements section to the readme to clarify what distros are supported and the requirement of Chef 11+
* Updated .gitignore file
* Added Test Kitchen config
* Added Chef standard Rubocop config
* Updated Travis CI testing to use Chef DK
* Updated Berksfile to 3.X format
* Updated Gemfile with the latest development dependencies
* Updated contributing and testing docs
* Added maintainers.md and maintainers.toml files
* Added Travis and cookbook version badges to the readme
* Updated Opscode -> Chef Software
* Added a Rakefile for simplified testing
* Added a Chefignore file
* Resolved Rubocop warnings
* Added source_url and issues_url to the metadata
* Added basic convergence Chefspec test

v0.3.0 (2014-03-31)
-------------------
* Removing chef_gem monkeypatch

v0.2.2 (2014-02-26)
-------------------
* Updating CHANGELOG format

v0.2.0
------
* Initial release
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Please refer to
https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD
13 changes: 10 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# This gemfile provides additional gems for testing and releasing this cookbook
# It is meant to be installed on top of ChefDK which provides the majority
# of the necessary gems for testing this cookbook
#
# Run 'chef exec bundle install' to install these dependencies

source 'https://rubygems.org'

gem 'berkshelf'
gem 'test-kitchen', :group => :integration
gem 'kitchen-vagrant', :group => :integration
gem 'tomlrb'
gem 'rake'
gem 'stove'
gem 'community_cookbook_releaser'
Loading