diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index ed69bba..0000000 --- a/.rubocop.yml +++ /dev/null @@ -1,48 +0,0 @@ -# RuboCop config file -# Configure cops -# https://github.com/bbatsov/rubocop -# https://github.com/bbatsov/rubocop/blob/master/config/default.yml -# https://github.com/bbatsov/ruby-style-guide -# - -AllCops: - Include: - - '**/*.gemspec' - - '**/*.rake' - - '**/Gemfile' - - '**/Puppetfile' - - '**/Rakefile' - - '**/Guardfile' - Exclude: - - 'modules/**/*' - - 'pkg/**/*' - - 'spec/fixtures/**/*' - - 'vendor/**/*' - DisplayCopNames: true - -Rails: - Enabled: false - -Metrics/LineLength: - Enabled: false - -Metrics/BlockLength: - Enabled: false - -# Workaround until https://github.com/bbatsov/rubocop/issues/3752 is resolved -Bundler/DuplicatedGem: - Enabled: false - -# Cop supports --auto-correct. -# Configuration parameters: SupportedStyles. -# Support ruby 1.8.7 -Style/HashSyntax: - EnforcedStyle: hash_rockets - -# The shebang stuff at the top triggers this -Style/LeadingCommentSpace: - Exclude: - - Puppetfile - -Style/TrailingCommaInLiteral: - Enabled: false diff --git a/.travis.yml b/.travis.yml index 8d7b0db..df10c63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ env: - PUPPET_GEM_VERSION="~> 4.8.0" CHECK=test - PUPPET_GEM_VERSION="~> 4.9.0" CHECK=test - PUPPET_GEM_VERSION="~> 4" CHECK=test - - PUPPET_GEM_VERSION="~> 4" CHECK=rubocop sudo: false @@ -37,8 +36,6 @@ bundler_args: '--without system_tests development' script: 'SPEC_OPTS="--format documentation" bundle exec rake $CHECK' -# only do rubocop tests with the newest version of ruby so that we are -# following the most up to date style requirements. matrix: fast_finish: true exclude: @@ -56,10 +53,6 @@ matrix: env: PUPPET_GEM_VERSION="~> 4.9.0" CHECK=test - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 4" CHECK=test - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 4" CHECK=rubocop - - rvm: 2.1.0 - env: PUPPET_GEM_VERSION="~> 4" CHECK=rubocop - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 3.1.0" CHECK=test - rvm: 2.3.1 diff --git a/CHANGELOG b/CHANGELOG index 7aa9655..ab85237 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,41 +1,44 @@ +2017-05-09 (1.0.0) + * Release the module as v1.0.0 (Garrett Honeycutt) + 2017-01-24 (0.4.1) - * Fix service restart issue #30 (Gjermund Jensvoll) - * Fix messagebus service related error #29 (Gjermund Jensvoll) + * Fix service restart issue #30 (Gjermund Jensvoll) + * Fix messagebus service related error #29 (Gjermund Jensvoll) 2016-11-12 (0.4.0) - * Add support for Ruby 2.3.1 #27 (Garrett Honeycutt) - * Add ensure_resources and ensure_packages to avoid collisions #26 (Daniel James Goulder) - * Add sssd_package_ensure parameter #24 (Taylan Develioglu) + * Add support for Ruby 2.3.1 #27 (Garrett Honeycutt) + * Add ensure_resources and ensure_packages to avoid collisions #26 (Daniel James Goulder) + * Add sssd_package_ensure parameter #24 (Taylan Develioglu) 2016-08-24 (0.3.1) - * Fix Service[oddjobd] failing to start #22 (Jeff McCune) - * Fix newline under each section in sssd.conf #18 (Gjermund Jensvoll) + * Fix Service[oddjobd] failing to start #22 (Jeff McCune) + * Fix newline under each section in sssd.conf #18 (Gjermund Jensvoll) 2016-02-01 (0.3.0) - * Stop sorting config keys for newer ruby versions #13 (Brad Cowie) - * Ensure sssd.conf consistency during first Puppet run #11 (Nemanja Delic) + * Stop sorting config keys for newer ruby versions #13 (Brad Cowie) + * Ensure sssd.conf consistency during first Puppet run #11 (Nemanja Delic) 2015-12-30 (0.2.1) - * Update testing, linting and syntax suites #7 (Chris Edester) - * RedHat 5 authconfig needs to be latest #7 (Chris Edester) - * service_ensure option #6 (Robert Bruce) - * Licence info #5 (Gjermund Jensvoll) + * Update testing, linting and syntax suites #7 (Chris Edester) + * RedHat 5 authconfig needs to be latest #7 (Chris Edester) + * service_ensure option #6 (Robert Bruce) + * Licence info #5 (Gjermund Jensvoll) 2015-07-21 (0.2.0) - * RedHat 5 support #3 (Chris Edester) - * Mkhomedir cmd #2 (Chris Edester) + * RedHat 5 support #3 (Chris Edester) + * Mkhomedir cmd #2 (Chris Edester) 2015-07-20 (0.1.4) - * Anchor pattern, private class and spec tests #1 (Chris Edester) + * Anchor pattern, private class and spec tests #1 (Chris Edester) 2015-07-06 (0.1.3) - * Added missing file pam_mkhomedir (Gjermund Jensvoll) + * Added missing file pam_mkhomedir (Gjermund Jensvoll) 2015-07-06 (0.1.2) - * Fixed metadata.json syntax errors (Gjermund Jensvoll) + * Fixed metadata.json syntax errors (Gjermund Jensvoll) 2015-07-04 (0.1.1) - * Added compatability data for Puppet forge (Gjermund Jensvoll) + * Added compatability data for Puppet forge (Gjermund Jensvoll) 2015-07-04 (0.1.0) - * First release (Gjermund Jensvoll) + * First release (Gjermund Jensvoll) diff --git a/Gemfile b/Gemfile index 35546b2..e5227bb 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,6 @@ group :unit_tests do gem 'puppet-lint-version_comparison-check', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'rspec-puppet-facts', :require => false - gem 'rubocop', :require => false if RUBY_VERSION >= '2.0.0' end gem 'json', '<= 1.8', :require => false if RUBY_VERSION < '2.0.0' diff --git a/README.md b/README.md index 561122b..8d5a0a4 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,10 @@ Tested on: * (RHEL|CentOS|OracleLinux) 5,6,7 * Ubuntu 14.04 +## Versioning +The v1 series of this module will support both Puppet v3 and v4. The v2 +series of this module will drop support for Puppet v3. + ## Credits * sssd.conf template from [walkamongus-sssd][2] by Chadwick Banning diff --git a/Rakefile b/Rakefile index a93c96e..7d99d7c 100644 --- a/Rakefile +++ b/Rakefile @@ -3,11 +3,6 @@ require 'puppet-lint/tasks/puppet-lint' require 'puppet-syntax/tasks/puppet-syntax' require 'metadata-json-lint/rake_task' -if RUBY_VERSION >= '2.0' - require 'rubocop/rake_task' - RuboCop::RakeTask.new -end - exclude_paths = [ 'modules/**/*', 'pkg/**/*', @@ -30,11 +25,6 @@ RSpec::Core::RakeTask.new(:acceptance) do |t| t.pattern = 'spec/acceptance' end -desc 'Run RuboCop' -task :rubocop do - sh 'rubocop' -end - desc 'Clean up modules / pkg' task :clean do sh 'rm -rf modules pkg spec/fixtures' diff --git a/metadata.json b/metadata.json index 9eec498..51dfce3 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "sgnl05-sssd", - "version": "0.4.1", + "version": "1.0.0", "author": "sgnl05", "summary": "Install and configure SSSD", "license": "GPL-3.0+",