Skip to content

Commit

Permalink
Merge pull request #44 from jhoblitt/feature/v1.0.0
Browse files Browse the repository at this point in the history
Feature/v1.0.0
  • Loading branch information
Joshua Hoblitt committed May 25, 2015
2 parents 54bccb7 + cc7128f commit e2ed805
Show file tree
Hide file tree
Showing 5 changed files with 191 additions and 27 deletions.
109 changes: 109 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,114 @@

#### [Current]
* [3e5db68](../../commit/3e5db68) - __(Joshua Hoblitt)__ add travis_lint rake target
* [d162ebe](../../commit/d162ebe) - __(Joshua Hoblitt)__ update operatingsystem support list include Debian
* [f6d8406](../../commit/f6d8406) - __(Joshua Hoblitt)__ add Puppet Version Compatibility subsection to README
* [c17c100](../../commit/c17c100) - __(Joshua Hoblitt)__ refresh selenium class API description in README
* [415b08b](../../commit/415b08b) - __(Joshua Hoblitt)__ fix typos in README
* [ba7bf9d](../../commit/ba7bf9d) - __(Joshua Hoblitt)__ add Contributing section to README
* [54bccb7](../../commit/54bccb7) - __(Joshua Hoblitt)__ Merge pull request [#43](../../issues/43) from jhoblitt/feature/jar_2.45.0

update default selenium jar version to 2.45.0
* [47ed216](../../commit/47ed216) - __(Joshua Hoblitt)__ Merge pull request [#42](../../issues/42) from jhoblitt/jshholland-debian-support

Jshholland debian support
* [f1784fc](../../commit/f1784fc) - __(Joshua Hoblitt)__ update default selenium jar version to 2.45.0
* [3c1962b](../../commit/3c1962b) - __(Joshua Hoblitt)__ fix linter errors
* [4e11d86](../../commit/4e11d86) - __(Joshua Hoblitt)__ fix whitespace errors
* [c08252d](../../commit/c08252d) - __(Joshua Hoblitt)__ add debian 7.8 nodeset
* [bc82b72](../../commit/bc82b72) - __(Josh Holland)__ Fix acceptance tests for Ubuntu
* [8288b64](../../commit/8288b64) - __(Josh Holland)__ Fix test failures
* [eec17bf](../../commit/eec17bf) - __(Doug Fitzmaurice)__ Resource ordering and lint fixes

Added ensure_package call, and explicit ordering to ensure it runs
before the init script is generated.

Added a default block to the switch.

* [a6c688e](../../commit/a6c688e) - __(Markus Rekkenbeil)__ Fix debian init.d template

To avoid errors with update-rc.d / insserv and a grid + node setup
* [4456cf6](../../commit/4456cf6) - __(Doug Fitzmaurice)__ Test fixes for OS support
* [b0b97a0](../../commit/b0b97a0) - __(Doug Fitzmaurice)__ Preliminary Debian support

Added a new init.d file for Debian, which requires the "daemon" package.T
This will be automatically required on Debian systems.

* [ed0e4dc](../../commit/ed0e4dc) - __(Joshua Hoblitt)__ Merge pull request [#40](../../issues/40) from tphoney/certificate_readme

Add a small note to highlight certificate errors
* [bc1e3ba](../../commit/bc1e3ba) - __(tphoney)__ Add a small note to highlight certificate errors

small ammendment

typo

* [c467278](../../commit/c467278) - __(Joshua Hoblitt)__ add ruby 2.2 to travis matrix
* [6521084](../../commit/6521084) - __(Joshua Hoblitt)__ Merge pull request [#39](../../issues/39) from jhoblitt/feature/puppet-4.0

Feature/puppet 4.0
* [4c04106](../../commit/4c04106) - __(Joshua Hoblitt)__ pull fixtures repos via https
* [18c08a5](../../commit/18c08a5) - __(Joshua Hoblitt)__ add :validate to default rake target list
* [773e16b](../../commit/773e16b) - __(Joshua Hoblitt)__ add metadata-json-lint gem

Needed by rake metadata.json validation target.

* [349df92](../../commit/349df92) - __(Joshua Hoblitt)__ set stdlib requirement to 4.6.0
* [8422351](../../commit/8422351) - __(Joshua Hoblitt)__ Merge pull request [#38](../../issues/38) from jhoblitt/feature/puppet-4.0

Feature/puppet 4.0
* [e9a3823](../../commit/e9a3823) - __(Joshua Hoblitt)__ update travis matrix puppet 3.x minimum version to 3.7
* [e8c9607](../../commit/e8c9607) - __(Joshua Hoblitt)__ update rspec-puppet gem version to ~> 2.1.0

For compatibility with puppet 4.0.0

* [d351157](../../commit/d351157) - __(Joshua Hoblitt)__ add puppet 4.0 to travis matrix
* [d4a870f](../../commit/d4a870f) - __(Joshua Hoblitt)__ remove puppet 2.7 from travis matrix

4.0.0 has been released; support major release -1

* [456cf28](../../commit/456cf28) - __(Joshua Hoblitt)__ Merge pull request [#37](../../issues/37) from jhoblitt/maint/test_infra

Maint/test infra
* [f7638c3](../../commit/f7638c3) - __(Joshua Hoblitt)__ update logrotate fixture ref to fix future parser compatibility

The current forge release (1.1.1) of logrotate is not compatible with the
future parser. See: https://github.com/rodjek/puppet-logrotate/pull/39

* [b347154](../../commit/b347154) - __(Joshua Hoblitt)__ add junit/ to .gitiginore

Generated by beaker 5

* [9b43c9c](../../commit/9b43c9c) - __(Joshua Hoblitt)__ update LICENSE -<year> to 2015
* [9376db4](../../commit/9376db4) - __(Joshua Hoblitt)__ update Rakefile to latest boilerplate
* [5e0b5ba](../../commit/5e0b5ba) - __(Joshua Hoblitt)__ update spec_helper_acceptance.rb to latest boilerplate
* [9e307e1](../../commit/9e307e1) - __(Joshua Hoblitt)__ update beaker nodesets to use current chef/bento boxes
* [0293a55](../../commit/0293a55) - __(Joshua Hoblitt)__ update .travis.yml to latest boilerplate
* [c519431](../../commit/c519431) - __(Joshua Hoblitt)__ update .gitignore to latest boilerplate
* [9879dc0](../../commit/9879dc0) - __(Joshua Hoblitt)__ pin rspec on Ruby 1.8.7 (rspec/rspec-core[#1864](../../issues/1864))
* [43f085a](../../commit/43f085a) - __(Joshua Hoblitt)__ use rspec-puppet 2.0.0 from gems instead of git
* [153115f](../../commit/153115f) - __(Joshua Hoblitt)__ add FACTER_GEM_VERSION to Gemfile
* [1dee44e](../../commit/1dee44e) - __(Joshua Hoblitt)__ Merge pull request [#34](../../issues/34) from Super-Visions/feature/optional_user_management

Make user management optional if user is already managed elsewhere
* [183368e](../../commit/183368e) - __(Thomas Casteleyn)__ Added new options documentation to README file
* [ba8450a](../../commit/ba8450a) - __(Joshua Hoblitt)__ Merge pull request [#35](../../issues/35) from Super-Visions/feature/fix_java_path

Use SLNM_JAVA variable
* [2911fa6](../../commit/2911fa6) - __(Thomas Casteleyn)__ Make user management optional if user is already managed elsewhere
* [d423106](../../commit/d423106) - __(Thomas Casteleyn)__ Use SLNM_JAVA variable
* [1c6a1b0](../../commit/1c6a1b0) - __(Joshua Hoblitt)__ Merge pull request [#27](../../issues/27) from zivan/master

fixed issue [#19](../../issues/19) SSL error with wget
* [c5b1dd2](../../commit/c5b1dd2) - __(zivan)__ add unit test for the param nocheckcertificate
* [de88fd8](../../commit/de88fd8) - __(zivan)__ update order params
* [f75685c](../../commit/f75685c) - __(zverev)__ fixed issue [#19](../../issues/19) SSL error with wget

#### v0.3.0
* [0426075](../../commit/0426075) - __(Joshua Hoblitt)__ Merge pull request [#32](../../issues/32) from jhoblitt/feature/v0.3.0

Feature/v0.3.0
* [6215f01](../../commit/6215f01) - __(Joshua Hoblitt)__ bump version to v0.3.0
* [6090f31](../../commit/6090f31) - __(Joshua Hoblitt)__ update fixtures stdlib to 4.2.0
* [1260914](../../commit/1260914) - __(Joshua Hoblitt)__ replace Modulefile vs metadata.json
* [eb0f399](../../commit/eb0f399) - __(Joshua Hoblitt)__ update rspec-puppet to v2.0.0
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ group :beaker do
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'pry', :require => false
gem 'travis-lint', :require => false
end

# vim:ft=ruby
88 changes: 68 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ Puppet selenium Module
4. [Why Another Module?](#why-another-module)
5. [Limitations](#limitations)
* [Tested Platforms](#tested-platforms)
* [Puppet Version Compatibility](#puppet-version-compatibility)
* [Certificate Errors](#certificate-errors)
6. [Versioning](#versioning)
7. [Support](#support)
8. [See Also](#see-also)
8. [Contributing](#contributing)
9. [See Also](#see-also)


Overview
Expand All @@ -48,7 +51,7 @@ Usage
The `selenium::server` class is used to setup a `standalone` Selenium instance
to allow the use of a single server as a test node. The `selenium::hub` class
acts as a proxy in front of one or more `selenium::node` instances. A hub +
node(s) setup is refered to as a `Selenium grid`. Running `selenium::server` is
node(s) setup is referred to as a `Selenium grid`. Running `selenium::server` is
similar to creating a `Selenium grid` by declaring `selenium::hub` and
`selenium::node` on the same host.

Expand Down Expand Up @@ -190,13 +193,16 @@ override the default values.
```puppet
# defaults
class { 'selenium':
user => 'selenium',
group => 'selenium',
install_root => '/opt/selenium',
java => 'java',
version => '2.45.0',
url => undef,
download_timeout => '90',
user => 'selenium',
manage_user => true,
group => 'selenium',
manage_group => true,
install_root => '/opt/selenium',
java => 'java',
version => '2.45.0',
url => undef,
download_timeout => '90',
nocheckcertificate => false,
}
```

Expand All @@ -211,7 +217,7 @@ will have ownership of files.

`Boolean` defaults to: `true`

Wether or not this module should manage the system role account to execute the server process under.
Whether or not this module should manage the system role account to execute the server process under.

##### `group`

Expand All @@ -223,7 +229,7 @@ The group/gid of the system role account and group ownership of files.

`Boolean` defaults to: `true`

Wether or not this module should manage the group of the system role account.
Weather or not this module should manage the group of the system role account.

##### `install_root`

Expand Down Expand Up @@ -260,6 +266,15 @@ be be automatically parsed from the `url` in a later release).

Timeout to download of the package.

##### `nocheckcertificate`

`Boolean` defaults to: `false`

Disables validation of the x509 certificate the Selenium jar file is retrieved
from.

See [Certificate Errors](#certificate-errors)

#### `selenium::server`

```puppet
Expand Down Expand Up @@ -367,18 +382,31 @@ The modules that were identified were:
Limitations
-----------

At present, only support for `$::osfamily == 'RedHat'` has been implemented.
Adding other Linux distributions will required the addition of platform
specific init scripts.

When running this module you may encounter "certificate validation errors".
This suggests that the certifcates for that operating systems are out of date.
This does not occur on default nodeset for acceptance tests. $nocheckcertificate
can be set to avoid the error.

### Tested Platforms

* el6.x
* el7.x
* Debian 7
* Ubuntu 12.04
* Ubuntu 14.04

### Puppet Version Compatibility

Versions | Puppet 2.7 | Puppet 3.x | Puppet 4.x
:--------|:----------:|:----------:|:----------:
**0.x** | **yes** | **yes** | no
**1.x** | no | **yes** | **yes**

### Certificate Errors

A number of users have reported "certificate validation errors" when this
module downloads the Selenium jar file. The most likely explanation is that
the CA certificates on that node are out of date. _It may also be an
indication of a MITM attack on the TLS connection._ Certificate validation
errors do not occur on the nodesets used for acceptance tests. The
[`nocheckcertificate`](#nocheckcertificate) param may be set to `true` to
bypass this error but be sure the security implications of this setting are
well understood before enabling it.


Versioning
Expand All @@ -395,6 +423,26 @@ Please log tickets and issues at
[github](https://github.com/jhoblitt/puppet-selenium/issues)


Contributing
------------

1. Fork it on github
2. Make a local clone of your fork
3. Create a topic branch. Eg, `feature/mousetrap`
4. Make/commit changes
* Commit messages should be in [imperative tense](http://git-scm.com/book/ch5-2.html)
* Check that linter warnings or errors are not introduced - `bundle exec rake lint`
* Check that `Rspec-puppet` unit tests are not broken and coverage is added for new
features - `bundle exec rake spec`
* Documentation of API/features is updated as appropriate in the README
* If present, `beaker` acceptance tests should be run and potentially
updated - `bundle exec rake beaker`
5. When the feature is complete, rebase / squash the branch history as
necessary to remove "fix typo", "oops", "whitespace" and other trivial commits
6. Push the topic branch to github
7. Open a Pull Request (PR) from the *topic branch* onto parent repo's `master` branch


See Also
--------

Expand Down
4 changes: 4 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ PuppetLint::RakeTask.new :lint do |config|
config.fail_on_warnings = true
end

task :travis_lint do
sh "travis-lint"
end

task :default => [
:validate,
:lint,
Expand Down
16 changes: 9 additions & 7 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
{
"name": "jhoblitt-selenium",
"version": "0.3.0",
"version": "1.0.0",
"author": "Joshua Hoblitt <[email protected]>",
"summary": "Manages Selenium Server 2 - Standalone and Grid",
"license": "Apache-2.0",
"source": "https://github.com/jhoblitt/puppet-selenium.git",
"project_page": "https://github.com/jhoblitt/puppet-selenium",
"issues_url": "https://github.com/jhoblitt/puppet-selenium/issues",
"operatingsystem_support": [
{ "operatingsystem": "RedHat", "operatingsystemrelease": [ "5", "6", "7" ] },
{ "operatingsystem": "CentOS", "operatingsystemrelease": [ "5", "6", "7" ] },
{ "operatingsystem": "Scientific", "operatingsystemrelease": [ "5", "6", "7" ] }
{ "operatingsystem": "RedHat", "operatingsystemrelease": [ "6", "7" ] },
{ "operatingsystem": "CentOS", "operatingsystemrelease": [ "6", "7" ] },
{ "operatingsystem": "Scientific", "operatingsystemrelease": [ "6", "7" ] },
{ "operatingsystem": "Debian", "operatingsystemrelease": [ "7" ] },
{ "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "12.04", "14.04" ] }
],
"dependencies": [
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.6.0 < 5.0.0" },
{ "name": "maestrodev/wget", "version_requirement": ">= 1.2.2" },
{ "name": "rodjek/logrotate", "version_requirement": ">= 1.1.1" }
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.6.0 <5.0.0" },
{ "name": "maestrodev/wget", "version_requirement": ">= 1.2.2 <2.0.0" },
{ "name": "rodjek/logrotate", "version_requirement": ">= 1.1.1 <2.0.0" }
]
}

0 comments on commit e2ed805

Please sign in to comment.