Skip to content

Commit

Permalink
Merge branch 'release/v1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Suszyński Krzysztof committed Sep 21, 2016
2 parents 50e2199 + d7b30a1 commit bca56c2
Show file tree
Hide file tree
Showing 155 changed files with 5,141 additions and 841 deletions.
7 changes: 5 additions & 2 deletions .gitignore
@@ -1,6 +1,5 @@
pkg/
Gemfile.lock
.vendor
vendor/
spec/fixtures/
.vagrant/
.bundle/
Expand All @@ -11,3 +10,7 @@ Puppetfile.lock
.librarian/
log
Vagrantfile
.DS_Store
Gemfile.local
.idea/
Gemfile.lock
20 changes: 20 additions & 0 deletions .rubocop.ruby-1.8.7.yml
@@ -0,0 +1,20 @@
# Ruby 1.8.7 needs the . on chain of method calls at the end of a line
Style/DotPosition:
EnforcedStyle: trailing

# Ruby 1.8.7 doesn't have the -> lambda
Style/Lambda:
Enabled: false

# Ruby 1.8.7 doesn't have 1.9 style hash syntax
Style/HashSyntax:
EnforcedStyle: hash_rockets

Style/StringLiterals:
Enabled: false

Style/Documentation:
Enabled: false

Metrics/LineLength:
Max: 140
6 changes: 6 additions & 0 deletions .rubocop.yml
@@ -0,0 +1,6 @@
AllCops:
Exclude:
- 'vendor/**/*'

Metrics/LineLength:
Max: 140
25 changes: 20 additions & 5 deletions .travis.yml
Expand Up @@ -8,19 +8,28 @@ addons:
packages:
- libaugeas-dev
- libxml2-dev
bundler_args: --without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
- libgmp3-dev
bundler_args: "--without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}"
cache: bundler
script: bundle exec rake test
before_install: rm -f Gemfile.lock
before_install:
- 'bundler --version || gem install bundler' # TODO:Remove if fixed - travis-ci/travis-ci#5578
- 'rm -f Gemfile.lock'
matrix:
fast_finish: true
include:
- rvm: '1.8'
env: PUPPET_VERSION="~> 2.7.0" FACTER_VERSION="~> 1.6.0"
gemfile: gemfiles/Gemfile18.facter16
bundler_args: "--without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-../vendor/bundle}"
- rvm: '1.8'
env: PUPPET_VERSION="~> 2.7.0" FACTER_VERSION="~> 1.7.0"
gemfile: gemfiles/Gemfile18.facter17
bundler_args: "--without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-../vendor/bundle}"
- rvm: '1.9'
env: PUPPET_VERSION="~> 3.0"
gemfile: gemfiles/Gemfile19
bundler_args: "--without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-../vendor/bundle}"
- rvm: '2.0'
env: PUPPET_VERSION="~> 3.0"
- rvm: '2.1'
Expand All @@ -30,18 +39,24 @@ matrix:
- rvm: '2.1'
sudo: required
services: docker
env: PUPPET_VERSION="3.8.4" RS_SET="centos-6-x86_64-docker"
env: PUPPET_VERSION="3.8.5" RS_SET="centos-6-x86_64-docker"
script: bundle exec rake acceptance
- rvm: '2.1'
sudo: required
services: docker
env: PUPPET_VERSION="3.8.4" RS_SET="debian-7-x86_64-docker"
env: PUPPET_VERSION="3.8.5" RS_SET="debian-7-x86_64-docker"
script: bundle exec rake acceptance
- rvm: '2.1'
sudo: required
services: docker
env: PUPPET_VERSION="3.8.4" RS_SET="ubuntu-14.04-x86_64-docker"
env: PUPPET_VERSION="3.8.5" RS_SET="ubuntu-14.04-x86_64-docker"
script: bundle exec rake acceptance
# FIXME: GH Issue #3 - Activate acceptance tests on Travis CI for Puppet Enterprise, at least 2.8.8 and 3.8.2
notifications:
email: false
slack:
rooms:
secure: jKciSvj0RpuEcUSuEG4jXTsfWKo3sN1eYzdy9fdeO6ku7PCVkbLWunfrED7zEHGbfiiiAkdUoMqrgxQIz+iyEmS/kusa3/3II4J4NYcQE3jJz4+57ovfoMEJY1NWGofohW06NHkg+c9VwPKdtdUDWEcJ9jVvntXcPlMyJkoSk7I+EWyonyR/hzhDn8EjYGA+PQ+xdFAvBr1hN+1AFUGVwOub91Kv5UGjT6A/kqKx0uNUqF1raiizmpx2AZDixGnDRv2RpDDKjdUjA34RIHXxTrJvP4GIDInEho9Cnt11/OJtk7xm65wBS7vA3eCKse/QoPmbTpO21+HG0/pwKDujZL9mcbCGofRpfTtrDS5Fd0y3VxC3iyJN3fOUP9hxk3u+SZDWXFQAFVoR12LI9FMNSV5p4Kb0HoZ+6y7rk72ET0a76ubHu+r04pH14g8JTWi2ILI4DTvXOixmNZZIYbk8iodLUcxoubyIDcKkvaJ1MjXlEF3ZVg3+HYtk42xyir6uSKjA9OTHuHJkmxzSkjLaGh5SayhTTCf9FKiPcjztM2dHyZ18F0ZwCWAqmiMtSgKS9NkIBL1xJJWa8NAo8q5XOi1dlGUqLrQIxuA0aRoICxHjXF31hg7qRzzCZMM0MptNbkNxtxFtzg1n9tGQyepJBZyWJxvvk31N1sLHhdxFrDQ=
on_success: always
on_failure: always
on_start: always
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Expand Up @@ -34,10 +34,12 @@ you must set an environment variable such as:

export PUPPET_VERSION="~> 3.2.0"

Install the dependencies like so... (you can also ass `--path /fs/path/for/deps` to fetch dependencies to other directory)
Install the dependencies like so... (you can also pass `--path /fs/path/for/deps` to fetch dependencies to other directory)

bundle install

If you want to use Ruby 1.8 that we still support you have to pass `--gemfile gemfiles/Gemfile18.facter17` to download correct versions of gems that we use.

## Syntax and style

The test suite will run [Puppet Lint](http://puppet-lint.com/) and
Expand Down
48 changes: 14 additions & 34 deletions Gemfile
@@ -1,55 +1,35 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false
gem 'rake', :require => false unless dependencies.map {|dep| dep.name}.include?('rake')
# TODO: Remove this explicitly pinned version by the time ticket gh-org/puppet-jboss#84 is closed.
gem 'rspec-puppet', '2.3.2', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'metadata-json-lint', :require => false
gem 'json', :require => false

if RUBY_VERSION >= '1.9.0'
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'docker-api', :require => false
gem 'coveralls', :require => false
gem 'codeclimate-test-reporter', :require => false
gem 'simplecov', :require => false
end
gem 'os', :require => false
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'docker-api', :require => false
gem 'coveralls', :require => false
gem 'codeclimate-test-reporter', :require => false
gem 'simplecov', :require => false
if facterver = ENV['FACTER_VERSION']
gem 'facter', facterver, :require => false
else
gem 'facter', :require => false
end
puppetver = if RUBY_VERSION < '1.9.0' then '~> 2.7.0' else ENV['PUPPET_VERSION'] end
if puppetver
gem 'puppet', puppetver, :require => false
if Gem::Requirement.new(puppetver) =~ Gem::Version.new('2.7.0')
gem 'hiera-puppet', :require => false
end
else
gem 'puppet', '~> 3.0', :require => false
end
gem 'puppet', '~> 3.0', :require => false
gem 'ruby-augeas', :require => false
gem 'augeas', :require => false
end

group :development do
gem 'inch', :require => false
gem 'vagrant-wrapper', :require => false
if RUBY_VERSION >= '1.9.0'
gem 'travis', :require => false
gem 'puppet-blacksmith', :require => false
gem 'guard-rake', :require => false
if RUBY_VERSION >= '2.0.0'
gem 'pry-byebug', :require => false
else
gem 'pry-debugger', :require => false
end
end
gem 'travis', :require => false
gem 'puppet-blacksmith', :require => false
gem 'pry-byebug', :require => false
end

eval(IO.read(File.join(File.dirname(__FILE__), 'Gemfile.ruby19')), binding) if RUBY_VERSION < '2.0.0' and RUBY_VERSION >= '1.9.0'
eval(IO.read(File.join(File.dirname(__FILE__), 'Gemfile.ruby18')), binding) if RUBY_VERSION < '1.9.0'

# vim:ft=ruby
13 changes: 0 additions & 13 deletions Gemfile.ruby18

This file was deleted.

6 changes: 0 additions & 6 deletions Gemfile.ruby19

This file was deleted.

10 changes: 6 additions & 4 deletions README.md
Expand Up @@ -2,7 +2,7 @@

### ...with configuration management of resources and deployment in domain and stand-alone modes

[![Build Status](https://travis-ci.org/coi-gov-pl/puppet-jboss.svg?branch=develop)](https://travis-ci.org/coi-gov-pl/puppet-jboss) [![Puppet Forge](https://img.shields.io/puppetforge/v/coi/jboss.svg)](https://forge.puppetlabs.com/coi/jboss) [![Code Climate](https://codeclimate.com/github/coi-gov-pl/puppet-jboss/badges/gpa.svg)](https://codeclimate.com/github/coi-gov-pl/puppet-jboss) [![Dependency Status](https://gemnasium.com/coi-gov-pl/puppet-jboss.svg)](https://gemnasium.com/coi-gov-pl/puppet-jboss) [![Coverage Status](https://coveralls.io/repos/coi-gov-pl/puppet-jboss/badge.svg?branch=develop&service=github)](https://coveralls.io/github/coi-gov-pl/puppet-jboss?branch=develop) [![Inline docs](http://inch-ci.org/github/coi-gov-pl/puppet-jboss.svg?branch=develop)](http://inch-ci.org/github/coi-gov-pl/puppet-jboss)
[![Build Status](https://travis-ci.org/coi-gov-pl/puppet-jboss.svg?branch=develop)](https://travis-ci.org/coi-gov-pl/puppet-jboss) [![Puppet Forge](https://img.shields.io/puppetforge/v/coi/jboss.svg)](https://forge.puppetlabs.com/coi/jboss) [![Code Climate](https://codeclimate.com/github/coi-gov-pl/puppet-jboss/badges/gpa.svg)](https://codeclimate.com/github/coi-gov-pl/puppet-jboss) [![Dependency Status](https://gemnasium.com/coi-gov-pl/puppet-jboss.svg)](https://gemnasium.com/coi-gov-pl/puppet-jboss) [![Coverage Status](https://coveralls.io/repos/coi-gov-pl/puppet-jboss/badge.svg?branch=develop&service=github)](https://coveralls.io/github/coi-gov-pl/puppet-jboss?branch=develop) [![Inline docs](http://inch-ci.org/github/coi-gov-pl/puppet-jboss.svg?branch=develop)](http://inch-ci.org/github/coi-gov-pl/puppet-jboss) [![Join the chat at https://gitter.im/coi-gov-pl/puppet-jboss](https://badges.gitter.im/coi-gov-pl/puppet-jboss.svg)](https://gitter.im/coi-gov-pl/puppet-jboss?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

#### Table of Contents

Expand Down Expand Up @@ -42,7 +42,9 @@ The module allows user to perform all necessary operations for JBoss servers. He

In addition to the above list, you can also configure any JBoss CLI reachable configuration, with the entire set of parameters. This allows you to configure any parameter supported by JBoss.

Take a look. We will be happy to receive your feedback.
### Got questions?

We will be happy to receive your feedback. Ask as about everything releated to this module on [Gitter.im chat](https://gitter.im/coi-gov-pl/puppet-jboss?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)!

## Setup

Expand Down Expand Up @@ -419,8 +421,8 @@ This module is explicitly tested on:
With servers:

* JBoss AS 7.1
* JBoss EAP 6.1 - 6.4,
* WildFly 8.x
* JBoss EAP 6.1 - 6.4, 7.0
* WildFly 8.x, 9.x

Should be fully compatible with those operating systems:

Expand Down
9 changes: 7 additions & 2 deletions Rakefile
Expand Up @@ -10,7 +10,12 @@ rescue LoadError
end

PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
PuppetLint.configuration.ignore_paths = [
"spec/**/*.pp",
"pkg/**/*.pp",
"tests/**/*.pp",
"vendor/**/*.pp"
]
PuppetLint.configuration.fail_on_warnings = true

desc "Validate manifests, templates, and ruby files"
Expand Down Expand Up @@ -65,7 +70,7 @@ end

desc "Run syntax, lint, and spec tests."
task :test => [
:metadata,
:metadata_lint,
:lint,
:validate,
:clean_fixtures,
Expand Down
4 changes: 3 additions & 1 deletion files/jbxml.aug
Expand Up @@ -2,6 +2,8 @@
Author: Francis Giraldeau <francis.giraldeau@usherbrooke.ca>

Reference: http://www.w3.org/TR/2006/REC-xml11-20060816/

This file is based on xml.aug lens from augeas v0.10.0
*)

module JBXml =
Expand Down Expand Up @@ -92,7 +94,7 @@ let doctype = decl_def /!DOCTYPE/ (decl_outer|id_def)
let attributes = [ label "#attribute" .
[ sep_spc . key nmtoken . sep_eq . sto_dquote ]+ ]
let attributes_sq = [ label "#attribute" .
[ sep_spc . key nmtoken . sep_eq . sto_squote ]+ ]
[ sep_spc . key nmtoken . sep_eq . (sto_dquote|sto_squote) ]+ ]


let prolog = [ label "#declaration" .
Expand Down
36 changes: 36 additions & 0 deletions gemfiles/Gemfile18.facter16
@@ -0,0 +1,36 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'rake', '~> 10.0.0', :require => false unless dependencies.map {|dep| dep.name}.include?('rake')
# TODO: Remove this explicitly pinned version by the time ticket gh-org/puppet-jboss#84 is closed.
gem 'rspec-puppet', '2.3.2', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'metadata-json-lint', :require => false
# This package drops support for 1.8
gem 'json', '1.8.3', :require => false
gem 'os', :require => false
gem 'specinfra', '2.59.0', :require => false
gem 'net-ssh', '2.9.4', :require => false
# This package drops support for 1.8
gem 'json_pure', '1.8.3', :require => false
gem 'rspec-its', :require => false
gem 'rspec', '~> 3.1.0', :require => false

gem 'tins', '~> 1.6.0', :require => false

gem 'facter', '~> 1.6.18', :require => false
gem 'puppet', '~> 2.7.0', :require => false
gem 'hiera-puppet', :require => false

gem 'ruby-augeas', :require => false
gem 'augeas', :require => false
end

group :development do
gem 'inch', :require => false
gem 'vagrant-wrapper', :require => false
gem 'pry', '~> 0.9.12.0', :require => false
end

# vim:ft=ruby

0 comments on commit bca56c2

Please sign in to comment.