puppetfile-resolver 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2fd19452a49b252e661370a59303f2fe7875d199252fd020dd96381f69bc50
-  data.tar.gz: 8b21cf227604cc8108b8c38fc78e1e2597d6e66cb41465576d0cb2346a8e650f
+  metadata.gz: d7673218a6f7c10c7e28ae17d8bc7ebbe7da5d820ae31c4aa10781710aa26c12
+  data.tar.gz: a5bdc145cd5bc3233f031617e281d9a0f6927a80057a1a1ea32300cef8ea1004
 SHA512:
-  metadata.gz: d00c160ba1f5a6ebd9f62ff4c2a9a45c3d8d931b5d08740d373c3ef4ecea722e6ae2d5d4a366ca5129d13f21016b273ef8e9d6266dc5b6c333067cf0028940b6
-  data.tar.gz: 44e83526b762ca879863d78e57bf2d56375540e04be507e60561b5d06a3872c4b8a694373215390b6788f2000fb88fa2f27e7313bb34a02fdfeace4dc0152819
+  metadata.gz: 8aaeacdba844e37b2090585eaa922352520384271703f06007ce6f658e06e2cb44132ad730d1663060f28376f5018086fcff4b9a6a93363b8e3486c03929ed48
+  data.tar.gz: 7c7a6804f9bb7fa4404a50d087f5b931db6cbf31b021cc4bf3c2124489b9b738e65f61887352f0fb531267dfd81a3f54514e67f8e35f39f8457d6676014f984b

data/README.md

@@ -1,5 +1,5 @@
-[![CI for Puppetfile Resolver](https://github.com/glennsarti/puppetfile-resolver/workflows/CI%20for%20Puppetfile%20Resolver/badge.svg)](https://github.com/glennsarti/puppetfile-resolver/actions?query=workflow%3A%22CI+for+Puppetfile+Resolver%22)
-[![Gem Version](https://img.shields.io/gem/v/puppetfile-resolver)](https://rubygems.org/gems/puppetfile-resolver)
+[![ci](https://github.com/puppetlabs/puppetfile-resolver/actions/workflows/ci.yml/badge.svg)](https://github.com/puppetlabs/puppetfile-resolver/actions/workflows/ci.yml) 
+[![Gem Version](https://badge.fury.io/rb/puppetfile-resolver.svg)](https://badge.fury.io/rb/puppetfile-resolver)
 
 # Puppetfile Resolver
 

data/lib/puppetfile-resolver/cache/persistent.rb

@@ -43,7 +43,7 @@ module PuppetfileResolver
       private
 
       def to_cache_name(name)
-        ::Digest::SHA256.hexdigest(name) + '.txt'
+        "#{::Digest::SHA256.hexdigest(name)}.txt"
       end
     end
   end

data/lib/puppetfile-resolver/models/module_dependency.rb

@@ -3,9 +3,7 @@
 module PuppetfileResolver
   module Models
     class ModuleDependency
-      attr_accessor :name
-      attr_accessor :owner
-      attr_accessor :version_requirement
+      attr_accessor :name, :owner, :version_requirement
 
       def initialize(options = {})
         # Munge the name

data/lib/puppetfile-resolver/models/module_specification.rb

@@ -7,11 +7,7 @@ require 'puppetfile-resolver/puppetfile'
 module PuppetfileResolver
   module Models
     class ModuleSpecification
-      attr_accessor :name
-      attr_accessor :owner
-      attr_accessor :version
-      attr_accessor :origin # Same as R10K module :type
-      attr_accessor :resolver_flags
+      attr_accessor :name, :owner, :version, :origin, :resolver_flags # origin attr same as R10K module :type
 
       def initialize(options = {})
         require 'semantic_puppet'

data/lib/puppetfile-resolver/puppetfile/document.rb

@@ -5,16 +5,12 @@ require 'puppetfile-resolver/puppetfile/invalid_module'
 module PuppetfileResolver
   module Puppetfile
     class DocumentLocation
-      attr_accessor :start_line # Base 0
-      attr_accessor :start_char # Base 0
-      attr_accessor :end_line # Base 0
-      attr_accessor :end_char # Base 0
+      attr_accessor :start_line, :start_char, :end_line, :end_char # Base 0 # Base 0 # Base 0 # Base 0
     end
 
     class Document
-      attr_accessor :forge_uri
+      attr_accessor :forge_uri, :content
       attr_reader   :modules
-      attr_accessor :content
 
       def initialize(puppetfile_content)
         @content = puppetfile_content

data/lib/puppetfile-resolver/puppetfile/git_module.rb

@@ -5,10 +5,7 @@ require 'puppetfile-resolver/puppetfile/base_module'
 module PuppetfileResolver
   module Puppetfile
     class GitModule < BaseModule
-      attr_accessor :remote
-      attr_accessor :ref
-      attr_accessor :commit
-      attr_accessor :tag
+      attr_accessor :remote, :ref, :commit, :tag
 
       def initialize(title)
         super

data/lib/puppetfile-resolver/puppetfile/parser/r10k_eval/dsl.rb

@@ -41,7 +41,7 @@ module PuppetfileResolver
 
           def find_load_line_number
             loc = Kernel.caller_locations
-                        .find { |call_loc| call_loc.absolute_path == ::PuppetfileResolver::Puppetfile::Parser::R10KEval::PUPPETFILE_MONIKER }
+                        .find { |call_loc| call_loc.path == ::PuppetfileResolver::Puppetfile::Parser::R10KEval::PUPPETFILE_MONIKER }
             loc.nil? ? 0 : loc.lineno - 1 # Line numbers from ruby are base 1
           end
         end

data/lib/puppetfile-resolver/puppetfile/parser/r10k_eval/module/local.rb

@@ -15,8 +15,7 @@ module PuppetfileResolver
             end
 
             def self.to_document_module(title, _args)
-              mod = ::PuppetfileResolver::Puppetfile::LocalModule.new(title)
-              mod
+              ::PuppetfileResolver::Puppetfile::LocalModule.new(title)
             end
           end
         end

data/lib/puppetfile-resolver/puppetfile/parser/r10k_eval.rb

@@ -21,7 +21,7 @@ module PuppetfileResolver
           rescue StandardError, LoadError => e
             # Find the originating error from within the puppetfile
             loc = e.backtrace_locations
-                   .select { |item| item.absolute_path == PUPPETFILE_MONIKER }
+                   .select { |item| item.path == PUPPETFILE_MONIKER }
                    .first
             start_line_number = loc.nil? ? 0 : loc.lineno - 1 # Line numbers from ruby are base 1
             end_line_number = loc.nil? ? puppetfile_contents.lines.count - 1 : loc.lineno - 1 # Line numbers from ruby are base 1
@@ -65,19 +65,19 @@ module PuppetfileResolver
         def self.post_process_flags!(document)
           flag_ranges = {}
           document.content.lines.each_with_index do |line, index|
-            if (matches = line.match(%r{^\s*# resolver:disable ([A-Za-z\/,]+)(?:\s|$)}))
+            if (matches = line.match(%r{^\s*# resolver:disable ([A-Za-z/,]+)(?:\s|$)}))
               flags_from_line(matches[1]).each do |flag|
                 # Start a flag range if there isn't already one going
                 next unless flag_ranges[flag].nil?
                 flag_ranges[flag] = index
               end
-            elsif (matches = line.match(%r{# resolver:disable ([A-Za-z\/,]+)(?:\s|$)}))
+            elsif (matches = line.match(%r{# resolver:disable ([A-Za-z/,]+)(?:\s|$)}))
               flags_from_line(matches[1]).each do |flag|
                 # Assert the flag if we're not already within a range
                 next unless flag_ranges[flag].nil?
                 assert_resolver_flag(document, flag, index, index)
               end
-            elsif (matches = line.match(%r{^\s*# resolver:enable ([A-Za-z\/,]+)(?:\s|$)}))
+            elsif (matches = line.match(%r{^\s*# resolver:enable ([A-Za-z/,]+)(?:\s|$)}))
               flags_from_line(matches[1]).each do |flag|
                 # End a flag range if there isn't already one going
                 next if flag_ranges[flag].nil?
@@ -122,8 +122,8 @@ module PuppetfileResolver
             next if mod.location.start_line.nil? || mod.location.end_line.nil?
 
             # If the module doesn't span the range we're looking for (from_line --> to_line) ignore it
-            next unless mod.location.start_line >= from_line && mod.location.start_line <= to_line ||
-                        mod.location.end_line >= from_line && mod.location.end_line <= to_line
+            next unless (mod.location.start_line >= from_line && mod.location.start_line <= to_line) ||
+                        (mod.location.end_line >= from_line && mod.location.end_line <= to_line)
             mod.resolver_flags << flag unless mod.resolver_flags.include?(flag)
           end
           nil

data/lib/puppetfile-resolver/puppetfile/validation_errors.rb

@@ -3,8 +3,7 @@
 module PuppetfileResolver
   module Puppetfile
     class DocumentValidationErrorBase
-      attr_accessor :message
-      attr_accessor :puppet_module
+      attr_accessor :message, :puppet_module
 
       def initialize(message, puppet_module)
         @message = message
@@ -79,8 +78,7 @@ module PuppetfileResolver
     # Resolution Validation Error classes for validating
     # a valid Puppetfile against a dependency resolution
     class DocumentResolutionErrorBase < DocumentValidationErrorBase
-      attr_accessor :puppet_module
-      attr_accessor :module_specification
+      attr_accessor :puppet_module, :module_specification
 
       def initialize(message, puppet_module, module_specification)
         super(message, puppet_module)

data/lib/puppetfile-resolver/resolver.rb

@@ -7,8 +7,7 @@ require 'puppetfile-resolver/models'
 
 module PuppetfileResolver
   class Resolver
-    attr_reader :puppetfile
-    attr_reader :dependencies_to_resolve
+    attr_reader :puppetfile, :dependencies_to_resolve
 
     def initialize(puppetfile_document, puppet_version = nil)
       @puppetfile = puppetfile_document

data/lib/puppetfile-resolver/spec_searchers/configuration.rb

@@ -7,9 +7,7 @@ require 'puppetfile-resolver/spec_searchers/local_configuration'
 module PuppetfileResolver
   module SpecSearchers
     class Configuration
-      attr_reader :local
-      attr_reader :forge
-      attr_reader :git
+      attr_reader :local, :forge, :git
 
       def initialize
         @local = LocalConfiguration.new

data/lib/puppetfile-resolver/spec_searchers/git/gclone.rb

@@ -5,7 +5,6 @@ require 'English'
 require 'puppetfile-resolver/util'
 require 'puppetfile-resolver/spec_searchers/common'
 require 'puppetfile-resolver/spec_searchers/git_configuration'
-require 'puppetfile-resolver/util'
 require 'uri'
 
 module PuppetfileResolver

data/lib/puppetfile-resolver/spec_searchers/git/github.rb

@@ -19,11 +19,11 @@ module PuppetfileResolver
           end
           return nil if repo_url.nil?
 
-          metadata_url = 'https://raw.githubusercontent.com/' + repo_url + '/'
+          metadata_url = "https://raw.githubusercontent.com/#{repo_url}/"
           if puppetfile_module.ref
-            metadata_url += puppetfile_module.ref + '/'
+            metadata_url += "#{puppetfile_module.ref}/"
           elsif puppetfile_module.tag
-            metadata_url += puppetfile_module.tag + '/'
+            metadata_url += "#{puppetfile_module.tag}/"
           else
             # Default to master. Should it raise?
             metadata_url += 'master/'

data/lib/puppetfile-resolver/spec_searchers/git/gitlab.rb

@@ -21,11 +21,11 @@ module PuppetfileResolver
 
           # Example URL
           # https://gitlab.com/simp/pupmod-simp-crypto_policy/-/raw/0.1.4/metadata.json
-          metadata_url = 'https://gitlab.com/' + repo_url + '/-/raw/'
+          metadata_url = "https://gitlab.com/#{repo_url}/-/raw/"
           if puppetfile_module.ref
-            metadata_url += puppetfile_module.ref + '/'
+            metadata_url += "#{puppetfile_module.ref}/"
           elsif puppetfile_module.tag
-            metadata_url += puppetfile_module.tag + '/'
+            metadata_url += "#{puppetfile_module.tag}/"
           else
             # Default to master. Should it raise?
             metadata_url += 'master/'

data/lib/puppetfile-resolver/util.rb

@@ -29,7 +29,7 @@ module PuppetfileResolver
     def self.net_http_get(uri, proxy = nil)
       uri = URI.parse(uri) unless uri.is_a?(URI)
 
-      http_options = { :use_ssl => uri.class == URI::HTTPS }
+      http_options = { :use_ssl => uri.instance_of?(URI::HTTPS) }
       # Because on Windows Ruby doesn't use the Windows certificate store which has up-to date
       # CA certs, we can't depend on someone setting the environment variable correctly. So use our
       # static CA PEM file if SSL_CERT_FILE is not set.

data/lib/puppetfile-resolver/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetfileResolver
-  VERSION ||= '0.6.2'
+  VERSION ||= '0.6.3'
 end

data/puppetfile-cli.rb

@@ -72,9 +72,9 @@ else
 end
 
 # Parse the Puppetfile into an object model
-content = File.open(options[:path], 'rb') { |f| f.read }
+content = File.binread(options[:path])
 require 'puppetfile-resolver/puppetfile/parser/r10k_eval'
-puppetfile = ::PuppetfileResolver::Puppetfile::Parser::R10KEval.parse(content)
+puppetfile = PuppetfileResolver::Puppetfile::Parser::R10KEval.parse(content)
 
 # Make sure the Puppetfile is valid
 unless puppetfile.valid?

data/spec/spec_helper.rb

@@ -1,5 +1,31 @@
 # frozen_string_literal: true
 
+if ENV['COVERAGE'] == 'yes'
+  begin
+    require 'simplecov'
+    require 'simplecov-console'
+
+    SimpleCov.formatters = [
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::Console,
+    ]
+
+    SimpleCov.start do
+      track_files 'lib/**/*.rb'
+      add_filter '/spec'
+      add_filter 'lib/puppetfile-resolver/version.rb'
+
+      add_filter '/docs'
+
+      # do not track vendored files
+      add_filter '/vendor'
+      add_filter '/.vendor'
+    end
+  rescue LoadError
+    raise 'Add the simplecov & simplecov-console gems to Gemfile to enable this task'
+  end
+end
+
 root = File.join(__dir__,'..',)
 # Add the language server into the load path
 $LOAD_PATH.unshift(File.join(root,'lib'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile-resolver
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Glenn Sarti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: molinillo
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: Resolves the Puppet Modules in a Puppetfile with a full dependency graph,
   including Puppet version checks.
 email:
@@ -126,19 +140,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Dependency resolver for Puppetfiles
 test_files:
-- spec/unit/puppetfile-resolver/spec_searchers/git/gclone_spec.rb
+- spec/fixtures/proxy.rb
+- spec/fixtures/modulepath/test_module/README.md
+- spec/fixtures/modulepath/test_module/metadata.json
+- spec/spec_helper.rb
+- spec/integration/deprecation_spec.rb
+- spec/integration/kitchensink_spec.rb
+- spec/integration/proxy_spec.rb
 - spec/unit/puppetfile-resolver/puppetfile/document_spec.rb
 - spec/unit/puppetfile-resolver/puppetfile/parser/r10k_eval_spec.rb
+- spec/unit/puppetfile-resolver/spec_searchers/git/gclone_spec.rb
 - spec/unit/puppetfile-resolver/resolver_spec.rb
-- spec/integration/proxy_spec.rb
-- spec/integration/kitchensink_spec.rb
-- spec/integration/deprecation_spec.rb
-- spec/spec_helper.rb
-- spec/fixtures/modulepath/test_module/metadata.json
-- spec/fixtures/modulepath/test_module/README.md
-- spec/fixtures/proxy.rb