From 34d93d3b1aa106a8e49b1e23d5a6f4b17e3814d9 Mon Sep 17 00:00:00 2001 From: John Clark Date: Sat, 27 Feb 2016 14:08:30 -0600 Subject: [PATCH 1/3] Fixing various linting errors, added changelog file, fixed install_java param which wasn't being used. --- .travis.yml | 7 +++---- CHANGELOG.md | 9 +++++++++ README.md | 1 + manifests/init.pp | 4 +++- manifests/install.pp | 28 +++++++++++++++------------- manifests/params.pp | 2 +- manifests/service.pp | 12 ++++++------ metadata.json | 6 +++--- 8 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.travis.yml b/.travis.yml index 66a5bd9..caec2ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ notifications: email: - john@johnlawerance.com env: - - PUPPET_VERSION=3.0 - - PUPPET_VERSION=4.0 - - PUPPET_VERSION=4.1 + - PUPPET_VERSION=2.6 + - PUPPET_VERSION=2.7 + - PUPPET_VERSION=3.8 - PUPPET_VERSION=4.2 - - PUPPET_VERSION=4.3 diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..0837fe7 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +##2016-02-27 - Release 0.1.1 +###Summary +- Fixed puppet-lint errors +- Fixed metadata java/stdlib dependency info +- Fixed install_java param not actually being used + +##2016-02-26 - Release 0.1.0 +###Summary + - Initial Release diff --git a/README.md b/README.md index 8fd4688..04a36ce 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # crucible +[![Puppet Forge](https://img.shields.io/puppetforge/v/johnlawerance/crucible.svg)](https://forge.puppetlabs.com/johnlawerance/crucible) [![Build Status](https://travis-ci.org/johnlawerance/crucible.svg?branch=master)](https://github.com/johnlawerance/crucible) #### Table of Contents diff --git a/manifests/init.pp b/manifests/init.pp index 40a67a7..f2ad9db 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,7 +7,9 @@ $service_user = $crucible::params::service_user, $install_java = $crucible::params::install_java, $install_dir = $crucible::params::install_dir, -) inherits crucible::params { +) { + + include ::crucible::params validate_re($version, '^*\.*\.*') validate_bool($service_manage) diff --git a/manifests/install.pp b/manifests/install.pp index 47a5509..69a4d23 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,32 +1,34 @@ -class crucible::install inherits crucible { +class crucible::install { # Install Java - class { 'java': - distribution => 'jre', - package => 'java-1.8.0-openjdk', + if $crucible::install_java == true { + class { 'java': + distribution => 'jre', + package => 'java-1.8.0-openjdk', + } } # Setup service user - user { "$service_user": + user { $crucible::service_user: ensure => present, home => '/home/crucible', shell => '/bin/bash', } - # exec to download and install the crucible directory if version file doesn't exist + # Download and install the crucible directory if version file doesn't exist exec { 'install_crucible': - command => "/usr/bin/wget -q -O /tmp/crucible-$version.zip https://www.atlassian.com/software/crucible/downloads/binary/crucible-$version.zip && /usr/bin/unzip /tmp/crucible-$version.zip -d /tmp/ && mv /tmp/fecru-$version $install_dir-$version && chown -R $service_user.$service_user $install_dir-$version", - creates => "/opt/crucible-$version", - require => User[$service_user], + command => "/usr/bin/wget -q -O /tmp/crucible-${crucible::version}.zip https://www.atlassian.com/software/crucible/downloads/binary/crucible-${crucible::version}.zip && /usr/bin/unzip /tmp/crucible-${crucible::version}.zip -d /tmp/ && mv /tmp/fecru-${crucible::version} ${crucible::install_dir}-${crucible::version} && chown -R ${crucible::service_user}.${crucible::service_user} ${crucible::install_dir}-${crucible::version}", + creates => "/opt/crucible-${crucible::version}", + require => User[$crucible::service_user], } # symlink versioned directory with /opt/crucible/ directory name file { 'crucible_dir': - path => "$install_dir", ensure => 'link', - owner => "$service_user", - target => "$install_dir-$version", - require => User[$service_user], + path => $crucible::install_dir, + owner => $crucible::service_user, + target => "${crucible::install_dir}-${crucible::version}", + require => User[$crucible::service_user], } } diff --git a/manifests/params.pp b/manifests/params.pp index ada48b2..05c2454 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -6,7 +6,7 @@ $service_ensure = 'running' $service_enable = true $service_name = 'crucible' + $service_user = 'crucible' $install_java = true $install_dir = '/opt/crucible' - $service_user = 'crucible' } diff --git a/manifests/service.pp b/manifests/service.pp index 2dd2b96..c41c417 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -1,20 +1,20 @@ class crucible::service inherits crucible { - if $service_manage == true { + if $crucible::service_manage == true { file { '/etc/init.d/crucible': ensure => file, content => template('crucible/crucible-init.sh.erb'), - mode => '755', + mode => '0755', } service { 'crucible': - ensure => $service_ensure, - enable => $service_enable, - name => $service_name, + ensure => $crucible::service_ensure, + enable => $crucible::service_enable, + name => $crucible::service_name, hasstatus => true, hasrestart => true, - require => File['/etc/init.d/crucible'], + require => File['/etc/init.d/crucible'], } } diff --git a/metadata.json b/metadata.json index 7b975fa..75e60f5 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "johnlawerance-crucible", - "version": "0.1.0", + "version": "0.1.1", "author": "John Clark", "summary": "Crucible / Fisheye", "license": "WTFPL", @@ -38,8 +38,8 @@ } ], "dependencies": [ - {"name":"puppetlabs-stdlib","version_requirement":">= 1.0.0"}, - {"name":"puppetlabs-java","version_requirement":">= 1.0.0"} + {"name":"puppetlabs-stdlib","version_requirement":">= 3.0.0"}, + {"name":"puppetlabs-java","version_requirement":">= 1.2.0"} ], "data_provider": null } From a28e7ff5c69ab1fae7eead34c6856ea5c272752c Mon Sep 17 00:00:00 2001 From: John Clark Date: Sat, 27 Feb 2016 14:24:24 -0600 Subject: [PATCH 2/3] Trying out new travis yml --- .travis.yml | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index caec2ea..18314dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,40 @@ -rvm: 1.9.3 +--- +sudo: false +language: ruby +cache: bundler +bundler_args: --without system_tests +before_install: rm Gemfile.lock || true +script: + - 'bundle exec rake' +matrix: + fast_finish: true + include: + - rvm: 1.9.3 + env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" + - rvm: 2.1.8 + env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" + - rvm: 1.9.3 + env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER=yes + - rvm: 2.1.8 + env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER=yes + - rvm: 2.1.8 + env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" + - rvm: 2.2.4 + env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" + - rvm: 2.2.4 + env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" + - rvm: 2.3.0 + env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" notifications: - email: - - john@johnlawerance.com -env: - - PUPPET_VERSION=2.6 - - PUPPET_VERSION=2.7 - - PUPPET_VERSION=3.8 - - PUPPET_VERSION=4.2 + email: john@johnlawerance.com +deploy: + provider: puppetforge + user: johnlawerance + password: + secure: "gNMWPdh6zKIaVJzRBA/DMFoj1IEpQjJ6Sb2NPL6Pt5Yh/+Dgj7zD6jNl/whylUYEkx11DSdfle0S8E7hw0VsLqJOTY4J0E88DZI0UQlT4QyjpUrfOltbGEGssBedl0tm+H7tUqVgqY1VHK+RCHrawkk3Qv2lMfIZEX6mcmuZb0cPmtazdVgXm9v6SLiS3IG/mnxKUPzB/ITna44u2cTqcfZ0MEeeNKOTtKioj05yds1obqbv4BgfXM/RXD0mPCiXnr6Pdx6GlN9xF7Q66FxWb1Shrf+n4WUMLgA9cFNfRR94uMo+19kDkNkALC9+Eb+YjgFxKSteE8jItUn2W32C6wA7jUhpUsAenfLih6Bwvdt2nvqyoxer/l7ddqF9ikUkPCT3CO3N+sKtUVHCxc6PWrjY81mDJsn4jtZzLEUtwR1G3+SJUgM7ysNQMPxMRM+IqvCJasbV/lB8ki9WnjVPeguElm0O0BDMYCMP1tuG3Nx0N8113rWZAoJE6yqxJhyO36B8GaCT6o9Lt4PtP1a5+vwz6bAC1lrqag83GoYMASVxFoP1DBmWvDPjuB71ybn7WrYRXg2ekIeY3WA0lXe1TKjOVpcgw1CkEgxdNImMIxeOX+WlWAHF3cINfcOFP0A+pAlhzQLEYraYZypQSRF+vejHWjkkrA95gNTvA1UBigo=" + on: + tags: true + # all_branches is required to use tags + all_branches: true + # Only publish if our main Ruby target builds + rvm: 1.9.3 From 5d63ed7d0d8c753700d3903c6ed903ccf8853941 Mon Sep 17 00:00:00 2001 From: John Clark Date: Sat, 27 Feb 2016 15:51:52 -0600 Subject: [PATCH 3/3] Removing unecessary params class --- manifests/init.pp | 20 ++++++++------------ manifests/params.pp | 12 ------------ 2 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 manifests/params.pp diff --git a/manifests/init.pp b/manifests/init.pp index f2ad9db..ca47903 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,16 +1,14 @@ class crucible ( - $version = $crucible::params::version, - $service_manage = $crucible::params::service_manage, - $service_ensure = $crucible::params::service_ensure, - $service_enable = $crucible::params::service_enable, - $service_name = $crucible::params::service_name, - $service_user = $crucible::params::service_user, - $install_java = $crucible::params::install_java, - $install_dir = $crucible::params::install_dir, + $version = '3.10.3', + $service_manage = true, + $service_ensure = 'running', + $service_enable = true, + $service_name = 'crucible', + $service_user = 'crucible', + $install_java = true, + $install_dir = '/opt/crucible', ) { - include ::crucible::params - validate_re($version, '^*\.*\.*') validate_bool($service_manage) validate_string($service_ensure) @@ -25,5 +23,3 @@ class { '::crucible::service': } } - - diff --git a/manifests/params.pp b/manifests/params.pp deleted file mode 100644 index 05c2454..0000000 --- a/manifests/params.pp +++ /dev/null @@ -1,12 +0,0 @@ -class crucible::params { - - # Default params values go here - $version = '3.10.3' - $service_manage = true - $service_ensure = 'running' - $service_enable = true - $service_name = 'crucible' - $service_user = 'crucible' - $install_java = true - $install_dir = '/opt/crucible' -}