metadata_json_deps 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad36d083ab748b459c19147bfb54634e0ecda3cf515613324b5f52ac8c4e38c
-  data.tar.gz: 27ea83a79f0eba6c97da1f34262121a2999b31902b7e937ed1980430a7a1bc59
+  metadata.gz: 2bcbe32a5563efc72e3d20dca1bde1f7b6fd04daed604ac244b1b7b3a5248c0f
+  data.tar.gz: fdae66bfdaebacb7e019ccb762b63c85bce412f2b5b24e45319a241bd7321b35
 SHA512:
-  metadata.gz: 5e64aee7f01a1e0ad65094162d4c0931b100211f466c69b12ef2a352e14af9bab3cb164c7d6aa0061bb0d112c889cf9a2d6b0bb0fa4fc72ffc788081f1c7adec
-  data.tar.gz: 2425a29efaf143c10e8a573d038319fa1a2888096f94daa378581222c135479998dffcfe53a120c8012aa0c4c5f936d08cc69cf7d8435be64424a9e683f59ead
+  metadata.gz: 69e42cca04c2f04382d09f3e387684624395e5ebace94842fe721ae56fbdfc13a8609e8b82ccfc9388fbc7d1da8d218808a3ff760b5ddcc7c64bb088b55790f2
+  data.tar.gz: 0f354fcca5932a92401c14615de0a8b62bfdd91008719cb5e53bb64a8cf0a6b063244d77dfce02de39210558e42e2abc0ea8d30bfaddcf6d90a25520e1d9ec04

data/README.md

@@ -4,7 +4,7 @@ The metadata-json-deps tool validates dependencies in `metadata.json` files in P
 
 ## Compatibility
 
-metadata-json-deps is compatible with Ruby versions 2.0.0 and newer.
+metadata-json-deps is compatible with Ruby versions 2.4.0 and newer.
 
 ## Installation
 
@@ -44,6 +44,6 @@ require 'metadata_json_deps'
 desc 'Run metadata-json-deps'
 task :metadata_deps do
   files = FileList['modules/*/metadata.json']
-  MetadataJsonDeps::Runner.run(files)
+  MetadataJsonDeps::run(files)
 end
 ```

data/bin/metadata-json-deps

@@ -10,4 +10,4 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-MetadataJsonDeps::Runner.run(ARGV, options[:verbose])
+MetadataJsonDeps.run(ARGV, options[:verbose])

data/lib/metadata_json_deps.rb

@@ -1,5 +1,37 @@
+require 'puppet_forge'
+require 'puppet_metadata'
+
 module MetadataJsonDeps
-  autoload :ForgeVersions, 'metadata_json_deps/forge_versions'
-  autoload :MetadataChecker, 'metadata_json_deps/metadata_checker'
-  autoload :Runner, 'metadata_json_deps/runner'
+  class ForgeVersions
+    def initialize(cache = {})
+      @cache = cache
+    end
+
+    def get_current_version(name)
+      name = name.sub('/', '-')
+      @cache[name] ||= PuppetForge::Module.find(name).current_release.version
+    end
+  end
+
+  def self.run(filenames, verbose = false)
+    forge = ForgeVersions.new
+
+    filenames.each do |filename|
+      puts "Checking #{filename}"
+      metadata = PuppetMetadata.read(filename)
+
+      metadata.dependencies.map do |dependency, constraint|
+        current = forge.get_current_version(dependency)
+
+        if metadata.satisfies_dependency?(dependency, current)
+          if verbose
+            puts "  #{dependency} (#{constraint}) matches #{current}"
+          end
+        else
+          puts "  #{dependency} (#{constraint}) doesn't match #{current}"
+        end
+      end
+    end
+  rescue Interrupt
+  end
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: metadata_json_deps
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ewoud Kohl van Wijngaarden
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: semantic_puppet
+  name: puppet_metadata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.0
 description: Verify all your dependencies allow the latest versions on Puppet Forge
 email: ewoud+rubygems@kohlvanwijngaarden.nl
 executables:
@@ -49,15 +55,12 @@ files:
 - README.md
 - bin/metadata-json-deps
 - lib/metadata_json_deps.rb
-- lib/metadata_json_deps/forge_versions.rb
-- lib/metadata_json_deps/metadata_checker.rb
-- lib/metadata_json_deps/runner.rb
 homepage: https://github.com/ekohl/metadata_json_deps
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/ekohl/metadata_json_deps
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,16 +68,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Check your Puppet metadata dependencies
 test_files: []

data/lib/metadata_json_deps/forge_versions.rb

@@ -1,31 +0,0 @@
-require 'puppet_forge'
-require 'semantic_puppet'
-
-module MetadataJsonDeps
-  class ForgeVersions
-    def initialize(cache = {})
-      @cache = cache
-    end
-
-    def get_current_version(name)
-      name = name.sub('/', '-')
-      version = @cache[name]
-
-      unless version
-        @cache[name] = version = get_version(get_mod(name))
-      end
-
-      version
-    end
-
-    private
-
-    def get_mod(name)
-      PuppetForge::Module.find(name)
-    end
-
-    def get_version(mod)
-      SemanticPuppet::Version.parse(mod.current_release.version)
-    end
-  end
-end

data/lib/metadata_json_deps/metadata_checker.rb

@@ -1,26 +0,0 @@
-require 'semantic_puppet'
-
-module MetadataJsonDeps
-  class MetadataChecker
-    def initialize(metadata, forge)
-      @metadata = metadata
-      @forge = forge
-    end
-
-    def module_dependencies
-      return [] unless @metadata['dependencies']
-
-      @metadata['dependencies'].map do |dep|
-        constraint = dep['version_requirement'] || '>= 0'
-        [dep['name'], SemanticPuppet::VersionRange.parse(constraint)]
-      end
-    end
-
-    def dependencies
-      module_dependencies.map do |dependency, constraint|
-        current = @forge.get_current_version(dependency)
-        [dependency, constraint, current, constraint.include?(current)]
-      end
-    end
-  end
-end

data/lib/metadata_json_deps/runner.rb

@@ -1,32 +0,0 @@
-require 'json'
-
-module MetadataJsonDeps
-  class Runner
-    def initialize(filenames, verbose)
-      @filenames = filenames
-      @verbose = verbose
-      @forge = MetadataJsonDeps::ForgeVersions.new
-    end
-
-    def run
-      @filenames.each do |filename|
-        puts "Checking #{filename}"
-        checker = MetadataJsonDeps::MetadataChecker.new(JSON.parse(File.read(filename)), @forge)
-        checker.dependencies.each do |dependency, constraint, current, satisfied|
-          if satisfied
-            if @verbose
-              puts "  #{dependency} (#{constraint}) matches #{current}"
-            end
-          else
-            puts "  #{dependency} (#{constraint}) doesn't match #{current}"
-          end
-        end
-      end
-    rescue Interrupt
-    end
-
-    def self.run(filenames, verbose = false)
-      self.new(filenames, verbose).run
-    end
-  end
-end