Merge pull request #51 from nwops/1.0-release

Prep for 1.0.0 release

Author: logicminds

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Augosign changelog
 
 ## Unreleased
+
+## 1.0.0
+Released May 19, 2020 
+
 * (maint) print config in yaml format
 * (maint) Fix a cache bug where the settings were loaded multiple times
 * (maint) Fix a bug where the config overwrites settings

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    autosign (0.1.4)
+    autosign (1.0.0)
       deep_merge (~> 1.2)
       gli (~> 2)
       iniparse (~> 1)
@@ -12,17 +12,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.14.12)
+    aruba (0.14.14)
       childprocess (>= 0.6.3, < 4.0.0)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
       ffi (~> 1.9)
       rspec-expectations (>= 2.99)
-      thor (~> 0.19)
+      thor (>= 0.19, < 2.0)
     ast (2.4.0)
-    builder (3.2.3)
+    builder (3.2.4)
     childprocess (3.0.0)
     coderay (1.1.2)
+    concurrent-ruby (1.1.6)
     contracts (0.16.0)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -44,33 +45,46 @@ GEM
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docile (1.3.2)
-    facter (2.5.6)
-    ffi (1.11.2)
+    facter (4.0.21)
+      hocon (~> 1.3)
+      thor (>= 1.0.1, < 2.0)
+    fast_gettext (1.8.0)
+    ffi (1.12.2)
     gherkin (4.1.3)
     gli (2.19.0)
-    hiera (1.3.4)
-      json_pure
+    hiera (3.6.0)
+    hocon (1.3.0)
+    httpclient (2.8.3)
     iniparse (1.5.0)
-    json (2.2.0)
-    json_pure (2.2.0)
+    json (2.3.0)
     jwt (1.5.6)
     little-plugger (1.1.4)
+    locale (2.1.3)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.9.2)
+    method_source (1.0.0)
     multi_json (1.14.1)
     multi_test (0.1.2)
     parallel (1.19.1)
     parser (2.7.1.2)
       ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    puppet (3.8.7)
-      facter (> 1.6, < 3)
-      hiera (~> 1.0)
-      json_pure
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    puppet (6.15.0)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (~> 1.1)
+      hiera (>= 3.2.1, < 4)
+      httpclient (~> 2.8)
+      locale (~> 2.1)
+      multi_json (~> 1.10)
+      puppet-resource_api (~> 1.5)
+      semantic_puppet (~> 1.0)
+    puppet-resource_api (1.8.13)
+      hocon (>= 1.0)
     rainbow (3.0.0)
     rake (13.0.1)
     rdoc (4.3.0)
@@ -79,15 +93,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.3)
     rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
@@ -96,33 +110,37 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
+    semantic_puppet (1.0.2)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.20.3)
-    tins (1.22.2)
+    thor (1.0.1)
+    tins (1.25.0)
+      sync
     unicode-display_width (1.7.0)
-    yard (0.9.20)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aruba (~> 0.6)
   autosign!
+  bundler (~> 2.0)
   coveralls
   cucumber (~> 2)
   pry (~> 0.10)
-  puppet (~> 3)
+  puppet (~> 6)
   rake (~> 13)
   rdoc (~> 4)
   rspec (~> 3)
   rubocop (~> 0.83.0)
   yard (~> 0.9.11)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

README.md

@@ -90,7 +90,7 @@ By default the validation runs the following validators in order:
 
 The first validator to succeed wins and short circuits the validaiton process.
 
-You can completely customize the list and how they are ordered via the configuration file.
+You can completely customize the list and how they are ordered via the configuration file.  Or even remove some entirely.
 
 ```
 ---
@@ -116,6 +116,8 @@ be important if you wanted to only use special validators or remove unwanted val
 Please note, the name of the validator which is speficed by the `NAME` constant in the validator code must match
 the list you specify otherwise it will not be part of the validation process.
 
+**NOTE** To use this feature you must have deep_merge 1.2.1+ installed which is now a requirement of this gem.
+
 ### Troubleshooting
 If you're having problems, try the following:
 
@@ -124,6 +126,7 @@ If you're having problems, try the following:
 - you can manually trigger the autosigning script with something like `cat the_csr.csr | autosign-validator certname.example.com`
 - If you run the puppet master foregrounded, you'll see quite a bit of autosign script output if autosign loglevel is set to debug.
 
+Starting with the 1.0.0 release the autosign gem requires ruby 2.4.  If you can't upgrade just yet you can continue to use the older 0.1.4 release.
 
 ### Further Reading
 

Rakefile

@@ -1,26 +1,26 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
 require 'rubygems'
-begin
-  require 'rspec/core/rake_task'
-  require 'cucumber'
-  require 'cucumber/rake/task'
-  require 'rdoc/task'
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.rspec_opts = '--format documentation'
-  end
-rescue LoadError
-end
+require 'bundler'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'rspec/core/rake_task'
+require 'cucumber'
+require 'cucumber/rake/task'
+require 'rdoc/task'
 require 'rake/clean'
-require 'rubygems/package_task'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--format documentation'
+end
+
 Rake::RDocTask.new do |rd|
   rd.main = 'README.rdoc'
   rd.rdoc_files.include('README.rdoc', 'lib/**/*.rb', 'bin/**/*')
-  rd.title = 'Your application title'
+  rd.title = 'Autosign'
 end
 
-spec = eval(File.read('autosign.gemspec'))
-
-Gem::PackageTask.new(spec) do |pkg|
-end
 CUKE_RESULTS = 'results.html'.freeze
 CLEAN << CUKE_RESULTS
 desc 'Run features'

autosign.gemspec

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Ensure we require the local version and not one we might have installed already
-require File.join([File.dirname(__FILE__), 'lib', 'autosign', 'version.rb'])
+require File.join([__dir__, 'lib', 'autosign', 'version.rb'])
 spec = Gem::Specification.new do |s|
   s.name = 'autosign'
   s.version = Autosign::VERSION
@@ -11,6 +11,7 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = 'Tooling to make puppet autosigning easy, secure, and extensible'
   s.files   = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec|features|fixtures)/}) }
+  s.required_ruby_version = '>= 2.4'
   s.require_paths << 'lib'
   s.extra_rdoc_files = [
     'CHANGELOG.md',
@@ -23,12 +24,13 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('coveralls')
   s.add_development_dependency('cucumber', '~> 2')
   s.add_development_dependency('pry', '~> 0.10')
-  s.add_development_dependency('puppet', '~> 3')
+  s.add_development_dependency('puppet', '~> 6')
   s.add_development_dependency('rake', '~> 13')
   s.add_development_dependency('rdoc', '~> 4')
   s.add_development_dependency('rspec', '~> 3')
   s.add_development_dependency('rubocop', '~> 0.83.0')
   s.add_development_dependency('yard', '~> 0.9.11')
+  s.add_development_dependency('bundler', '~> 2.0')
   s.add_runtime_dependency('deep_merge', '~> 1.2')
   s.add_runtime_dependency('gli', '~> 2')
   s.add_runtime_dependency('iniparse', '~> 1')

lib/autosign/version.rb

@@ -1,3 +1,3 @@
 module Autosign
-  VERSION = '0.1.4'
+  VERSION = '1.0.0'
 end