diff --git a/.fixtures.yml b/.fixtures.yml index 5ea5ca0..10f4251 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,13 +1,13 @@ fixtures: repositories: - "stdlib": - repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git" - ref: "3.0.0" - "wget": - repo: "git://github.com/maestrodev/puppet-wget.git" - ref: "v1.2.2" - "logrotate": - repo: "git://github.com/rodjek/puppet-logrotate.git" - ref: "1.1.1" + stdlib: + repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git' + ref: '4.2.0' + wget: + repo: 'git://github.com/maestrodev/puppet-wget.git' + ref: 'v1.2.2' + logrotate: + repo: 'git://github.com/rodjek/puppet-logrotate.git' + ref: '1.1.1' symlinks: - "selenium": "#{source_dir}" + selenium: "#{source_dir}" diff --git a/CHANGELOG.md b/CHANGELOG.md index f248c5f..949ff3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,41 @@ #### [Current] - * [6c79540](../../commit/6c79540) - __(Joshua Hoblitt)__ bump version to v0.2.3 + * [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 + * [4d50d4a](../../commit/4d50d4a) - __(Joshua Hoblitt)__ Merge pull request [#31](../../issues/31) from jhoblitt/feature/jar_2.44.0 + +Feature/jar 2.44.0 + * [1b74629](../../commit/1b74629) - __(Joshua Hoblitt)__ update beaker nodesets from puppet-module_skel + * [85a9295](../../commit/85a9295) - __(Joshua Hoblitt)__ update default selenium jar version to 2.44.0 + * [e28b863](../../commit/e28b863) - __(Joshua Hoblitt)__ Merge pull request [#30](../../issues/30) from jhoblitt/feature/travis_1.8.7 + +fix travis ruby 1.8.7 runs + * [b5a9110](../../commit/b5a9110) - __(Joshua Hoblitt)__ enable travis container based builds + * [6b8949f](../../commit/6b8949f) - __(Joshua Hoblitt)__ fix travis ruby 1.8.7 runs + +By excluding beaker related gems that pull in deps now incompatible with +1.8.7. + + * [6310705](../../commit/6310705) - __(Joshua Hoblitt)__ Merge pull request [#28](../../issues/28) from tayzlor/future-parser-fixes + +Fixes required for compatibility with 3.7.x puppet and future parser + * [b0b38f1](../../commit/b0b38f1) - __(Graham Taylor)__ Fixes required for compatibility with 3.7.x puppet and future parser + * [62f74d6](../../commit/62f74d6) - __(Joshua Hoblitt)__ Merge pull request [#22](../../issues/22) from jhoblitt/feature/future_parser + +add future parser to travis matrix + * [37d72d4](../../commit/37d72d4) - __(Joshua Hoblitt)__ add future parser to travis matrix + * [aaa9adc](../../commit/aaa9adc) - __(Joshua Hoblitt)__ Merge pull request [#18](../../issues/18) from jhoblitt/feature/beaker_update + +Feature/beaker update + * [0e51725](../../commit/0e51725) - __(Joshua Hoblitt)__ ignore puppet warnings during acceptance tests + * [cd44a66](../../commit/cd44a66) - __(Joshua Hoblitt)__ ignore beaker log dir + +#### v0.2.3 + * [889e77c](../../commit/889e77c) - __(Joshua Hoblitt)__ Merge pull request [#16](../../issues/16) from jhoblitt/feature/v0.2.3 + +Feature/v0.2.3 + * [3be4bcc](../../commit/3be4bcc) - __(Joshua Hoblitt)__ bump version to v0.2.3 * [e12054a](../../commit/e12054a) - __(Joshua Hoblitt)__ remove all in class/define parameter docs Replace with URLs to section anchors in README diff --git a/Gemfile b/Gemfile index 73a4ba6..d65b689 100644 --- a/Gemfile +++ b/Gemfile @@ -6,22 +6,22 @@ else gem 'puppet', :require => false end -group :development do - gem 'rake', :require => false - gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', :require => false - gem 'puppet-syntax', :require => false +group :development, :test do + gem 'rake', :require => false + gem 'puppetlabs_spec_helper', :require => false + gem 'puppet-lint', '>= 1.1.0', :require => false + gem 'puppet-syntax', :require => false gem 'rspec-puppet', - :git => 'https://github.com/rodjek/rspec-puppet.git', - :ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5', + :git => 'https://github.com/rodjek/rspec-puppet.git', + :ref => 'v2.0.0', :require => false - # rspec 3 spews warnings with rspec-puppet 1.0.1 - # gem 'rspec-core', '~> 2.0', :require => false - gem 'pry', :require => false end group :beaker do + gem 'serverspec', :require => false gem 'beaker', :require => false gem 'beaker-rspec', :require => false - gem 'serverspec', :require => false + gem 'pry', :require => false end + +# vim:ft=ruby diff --git a/Modulefile b/Modulefile deleted file mode 100644 index 6499576..0000000 --- a/Modulefile +++ /dev/null @@ -1,12 +0,0 @@ -name 'jhoblitt-selenium' -version '0.2.3' - -author 'Joshua Hoblitt ' -license 'Apache' -project_page 'https://github.com/jhoblitt/puppet-selenium' -source 'https://github.com/jhoblitt/puppet-selenium.git' -summary 'Manages Selenium Server 2 - Standalone and Grid' -description 'Manages Selenium Server 2 - Standalone and Grid' -dependency 'puppetlabs/stdlib', '>= 3.0.0' -dependency 'maestrodev/wget', '>= 1.2.2' -dependency 'rodjek/logrotate', '>= 1.1.1' diff --git a/metadata.json b/metadata.json new file mode 100644 index 0000000..7021560 --- /dev/null +++ b/metadata.json @@ -0,0 +1,20 @@ +{ + "name": "jhoblitt-selenium", + "version": "0.3.0", + "author": "Joshua Hoblitt ", + "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" ] } + ], + "dependencies": [ + { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 < 5.0.0" }, + { "name": "maestrodev/wget", "version_requirement": ">= 1.2.2" }, + { "name": "rodjek/logrotate", "version_requirement": ">= 1.1.1" } + ] +}