Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several improvements (Foodcritic/Cookstyle fixes, Kitchen cfg etc.) #5

Merged
merged 10 commits into from
Jul 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
/test/tmp/
/test/version_tmp/
/tmp/
.vagrant
Berksfile.lock
.kitchen/

## Specific to RubyMotion:
.dat*
Expand Down
57 changes: 57 additions & 0 deletions .kitchen.dokken.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
---
driver:
name: dokken
privileged: true
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>

transport:
name: dokken

provisioner:
name: dokken
deprecations_as_errors: true

platforms:
- name: ubuntu-16.04
driver:
image: dokken/ubuntu-16.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: ubuntu-18.04
driver:
image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: centos-6
driver:
image: dokken/centos-6
pid_one_command: /sbin/init
intermediate_instructions:
- RUN yum clean all

- name: centos-7
driver:
image: dokken/centos-7
platform: rhel
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN yum clean all

- name: debian-8
driver:
image: dokken/debian-8
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: debian-9
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

22 changes: 22 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
driver:
name: vagrant

verifier:
name: inspec

provisioner:
name: chef_zero

platforms:
- name: centos-6
- name: centos-7
- name: ubuntu-16.04
- name: ubuntu-18.04
- name: debian-8
- name: debian-9

suites:
- name: default
run_list:
- recipe[sbp_cloudmonkey::default]
2 changes: 1 addition & 1 deletion Berksfile
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source "https://api.berkshelf.com"
source 'https://supermarket.chef.io'
metadata
Empty file modified CHANGELOG.md
100755 → 100644
Empty file.
Empty file modified LICENSE
100755 → 100644
Empty file.
Empty file modified README.md
100755 → 100644
Empty file.
40 changes: 20 additions & 20 deletions attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#
# Cookbook Name:: sbp_cloudmonkey
# Attribute:: default
#
# Copyright 2014, Schuberg Philis
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
default['cloudmonkey']['version'] = nil
#
# Cookbook Name:: sbp_cloudmonkey
# Attribute:: default
#
# Copyright 2014, Schuberg Philis
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

default['cloudmonkey']['version'] = nil
12 changes: 8 additions & 4 deletions metadata.rb
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
name 'sbp_cloudmonkey'
maintainer 'Sander van Harmelen'
maintainer_email '[email protected]'
license 'Apache 2.0'
chef_version '>= 12.14'
license 'Apache-2.0'
description 'Installs/Configures cloudmonkey'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
issues_url 'https://github.com/schubergphilis/sbp_cloudmonkey/issues'
source_url 'https://github.com/schubergphilis/sbp_cloudmonkey'
version '0.1.3'

supports 'redhat'
supports 'centos'
%w(debian centos redhat ubuntu).each do |os|
supports os
end

depends 'poise-python', '~> 1.6.0'
depends 'poise-python', '~> 1.7.0'
4 changes: 2 additions & 2 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@

include_recipe 'poise-python::default'

python_package "cloudmonkey" do
version "#{node['cloudmonkey']['version']}"
python_package 'cloudmonkey' do
version node['cloudmonkey']['version'].to_s
end