metadata-json-lint 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656d4c9a85eceaa230fe84711819956a3d746a71
-  data.tar.gz: 69c06229897d87ec0a65115b28b01eec85dfa5b2
+  metadata.gz: 14659a2f1f2f0cdbc342929c70ebe0e808cb01d1
+  data.tar.gz: 7dac64b05c3f98bd37b69982a73178c5cfa436eb
 SHA512:
-  metadata.gz: 36c139d8de7c19a488b0e73ed06f2461e6a177c65c62abc548b58ce36a715e3b574d08edb62c765c357fccb35a8754972eca0a411ccff303e5b58aef38599de7
-  data.tar.gz: 79a89a232bdae551740952c7827ebac93568006cce890f63eb913b5e3bf4fb111729a06bbfff4042659581ae0d11d390d30a399433c8b1d89d2e6a44fb6e8c3c
+  metadata.gz: a84b3571e974ecdfb133532eedcdbbcea5c4afb483f029ee2e0850b8605bb73acfbdb2af973f4b542a5ba131c05c902083f690f99c1a38889c5419b13ca12f19
+  data.tar.gz: 838914c262be020a5dd3df0837d404068be3eead05c973094bf938efaa7bb78c0c4a6494c323ca6368887250b196e9afdb787eb79aa8891d4db7253fe3be37db

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 /.bundle
 /vendor
 tests/*/last_*output
+.idea/

data/.travis.yml

@@ -10,6 +10,7 @@ rvm:
   - 2.0.0
   - 2.1.9
   - 2.3.1
+  - 2.4.1
 
 deploy:
   provider: rubygems

data/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.1
+
+### Changes
+* Puppet 4.9.0 and newer uses the vendored `semantic_puppet` packaged with Puppet.
+* If using Puppet 4.8.x and earlier, adding `semantic_puppet` to your Gemfile is required
+as the vendored `semantic_puppet` was not packaged with Puppet prior to `4.9.0`
+* Add test environment for Ruby 2.4.1 
+
 ## 2.0.0
 
 ### Changes

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
-group :test do
-  gem 'semantic_puppet'
-end
-
 gemspec

data/README.md

@@ -7,12 +7,9 @@ The metadata-json-lint tool validates and lints `metadata.json` files in Puppet
 metadata-json-lint is compatible with Ruby versions 2.0.0, 2.1.9, 2.3.1, and 2.4.1.
 
 ## Installation
-**NOTE: `metadata-json-lint` has a dependency on the `semantic_puppet` gem if you're on 
-Puppet 4 or earlier. This dependency was removed from the gemspec file due to a conflict 
-in Puppet 5 where the `semantic_puppet` ruby gem conflicts with a version of 
-`semantic_puppet` bundled with the core Puppet 5 code.**
 
-### Puppet 5
+Puppet 4.9.0 and newer:
+
 via `gem` command:
 ``` shell
 gem install metadata-json-lint
@@ -23,7 +20,8 @@ via Gemfile:
 gem 'metadata-json-lint'
 ```
 
-### Puppet 4 and earlier
+**Puppet 4.8.x and older:**
+
 via `gem` command:
 ``` shell
 gem install metadata-json-lint semantic_puppet
@@ -32,7 +30,7 @@ gem install metadata-json-lint semantic_puppet
 via Gemfile:
 ``` ruby
 gem 'metadata-json-lint'
-gem 'semantic_puppet'
+gem 'semantic_puppet
 ```
 
 ## Usage

data/lib/metadata-json-lint/version_requirement.rb

@@ -1,4 +1,5 @@
-require 'semantic_puppet'
+require 'puppet'
+require 'semantic_puppet' unless Puppet.version >= '4.9.0'
 
 module MetadataJsonLint
   # Parses a string module version requirement with semantic_puppet and

data/metadata-json-lint.gemspec

@@ -2,7 +2,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'metadata-json-lint'
-  s.version     = '2.0.0'
+  s.version     = '2.0.1'
   s.date        = Date.today.to_s
   s.summary     = 'metadata-json-lint /path/to/metadata.json'
   s.description = 'Utility to verify Puppet metadata.json files'
@@ -19,16 +19,14 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
   s.add_runtime_dependency 'spdx-licenses', '~> 1.0'
   s.add_runtime_dependency 'json-schema', '~> 2.8'
+  s.add_runtime_dependency 'puppet', '>= 4.7.0', '< 6.0.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop'
-  s.requirements << 'semantic_puppet >= 0.1.2 < 2.0.0'
-  s.post_install_message = <<-EOS
-  -------------------------------------------------------------------
-      If your puppet is <= 4.x, then the semantic_puppet gem MUST
-      be in your Gemfile!!
-
-      On puppet >= 5.x, semantic_puppet will break functionality!
-  -------------------------------------------------------------------
-  EOS
+  s.post_install_message = '
+  -------------------------------------------------
+      semantic_puppet must be installed within
+      your Gemfile if you use Puppet <= 4.8.x!!
+  -------------------------------------------------
+  '
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metadata-json-lint
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -169,13 +189,9 @@ homepage: http://github.com/voxpupuli/metadata-json-lint
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: |2
-    -------------------------------------------------------------------
-        If your puppet is <= 4.x, then the semantic_puppet gem MUST
-        be in your Gemfile!!
-
-        On puppet >= 5.x, semantic_puppet will break functionality!
-    -------------------------------------------------------------------
+post_install_message: "\n  -------------------------------------------------\n      semantic_puppet
+  must be installed within\n      your Gemfile if you use Puppet <= 4.8.x!!\n  -------------------------------------------------\n
+  \ "
 rdoc_options: []
 require_paths:
 - lib
@@ -189,8 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- semantic_puppet >= 0.1.2 < 2.0.0
+requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: