puppetfile-resolver 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda8bcaca5b127580d43f08c2a2952238cc9ffee2944676b7391ff185a0841c6
-  data.tar.gz: 472cb9b9cb4d0ada8fc04fb510f66a830f70a5c5153a9ce527f211c2b87b1ed3
+  metadata.gz: d7673218a6f7c10c7e28ae17d8bc7ebbe7da5d820ae31c4aa10781710aa26c12
+  data.tar.gz: a5bdc145cd5bc3233f031617e281d9a0f6927a80057a1a1ea32300cef8ea1004
 SHA512:
-  metadata.gz: 0dbfe8585196e016d6d45d48768bb6b5a838c32367d69df1cd0a8849a9a94a8d96e06a9965789b4d1c154acfa501e4bfb7fd122493f450b0bc6d9f46924b7871
-  data.tar.gz: 1d89877b4c34563262ee8d1da85a7221c6d049bf8d4e99c8d7f87f9b18b4d03a6f7ddd857e93e5cff3eb988bdbb3a845d17ab2020ee8f829d95a9b02f91db502
+  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/data/ruby_ca_certs.pem

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue Apr 26 03:12:05 2022 GMT
+## Certificate data from Mozilla as of: Tue Jul 19 03:12:06 2022 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 34a54d5191775c1bd37be6cfd3f09e831e072555dc3a2e51f4a2c4b0f8ada5cc
+## SHA256: 9bf3799611fb58197f61d45e71ce3dc19f30e7dd73731915872ce5108a7bb066
 ##
 
 
@@ -993,30 +993,6 @@ tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
 mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
 -----END CERTIFICATE-----
 
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
 Actalis Authentication Root CA
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -3345,3 +3321,140 @@ PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
 AwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CAy/m0sRtW9XLS/BnR
 AjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJbgfM0agPnIjhQW+0ZT0MW
 -----END CERTIFICATE-----
+
+DigiCert TLS ECC P384 Root G5
+=============================
+-----BEGIN CERTIFICATE-----
+MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURpZ2lDZXJ0IFRMUyBFQ0MgUDM4
+NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQg
+Um9vdCBHNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1Tzvd
+lHJS7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp0zVozptj
+n4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICISB4CIfBFqMA4GA1UdDwEB
+/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQCJao1H5+z8blUD2Wds
+Jk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQLgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIx
+AJSdYsiJvRmEFOml+wG4DXZDjC5Ty3zfDBeWUA==
+-----END CERTIFICATE-----
+
+DigiCert TLS RSA4096 Root G5
+============================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBNMQswCQYDVQQG
+EwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0
+MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcNNDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2
+IFJvb3QgRzUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS8
+7IE+ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG02C+JFvuU
+AT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgpwgscONyfMXdcvyej/Ces
+tyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZMpG2T6T867jp8nVid9E6P/DsjyG244gXa
+zOvswzH016cpVIDPRFtMbzCe88zdH5RDnU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnV
+DdXifBBiqmvwPXbzP6PosMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9q
+TXeXAaDxZre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cdLvvy
+z6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvXKyY//SovcfXWJL5/
+MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNeXoVPzthwiHvOAbWWl9fNff2C+MIk
+wcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPLtgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4E
+FgQUUTMc7TZArxfTJc1paPKvTiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw
+GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7HPNtQOa27PShN
+lnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLFO4uJ+DQtpBflF+aZfTCIITfN
+MBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQREtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/
+u4cnYiWB39yhL/btp/96j1EuMPikAdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9G
+OUrYU9DzLjtxpdRv/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh
+47a+p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilwMUc/dNAU
+FvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WFqUITVuwhd4GTWgzqltlJ
+yqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCKovfepEWFJqgejF0pW8hL2JpqA15w8oVP
+bEtoL8pU9ozaMv7Da4M/OMZ+
+-----END CERTIFICATE-----
+
+Certainly Root R1
+=================
+-----BEGIN CERTIFICATE-----
+MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAwPTELMAkGA1UE
+BhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2VydGFpbmx5IFJvb3QgUjEwHhcN
+MjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2Vy
+dGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBANA21B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O
+5MQTvqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbedaFySpvXl
+8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b01C7jcvk2xusVtyWMOvwl
+DbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGI
+XsXwClTNSaa/ApzSRKft43jvRl5tcdF5cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkN
+KPl6I7ENPT2a/Z2B7yyQwHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQ
+AjeZjOVJ6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA2Cnb
+rlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyHWyf5QBGenDPBt+U1
+VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMReiFPCyEQtkA6qyI6BJyLm4SGcprS
+p6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBTgqj8ljZ9EXME66C6ud0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAsz
+HQNTVfSVcOQrPbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d
+8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi1wrykXprOQ4v
+MMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrdrRT90+7iIgXr0PK3aBLXWopB
+GsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9ditaY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+
+gjwN/KUD+nsa2UUeYNrEjvn8K8l7lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgH
+JBu6haEaBQmAupVjyTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7
+fpYnKx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLyyCwzk5Iw
+x06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5nwXARPbv0+Em34yaXOp/S
+X3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6OV+KmalBWQewLK8=
+-----END CERTIFICATE-----
+
+Certainly Root E1
+=================
+-----BEGIN CERTIFICATE-----
+MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBFMTAeFw0yMTA0
+MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlu
+bHkxGjAYBgNVBAMTEUNlcnRhaW5seSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4
+fxzf7flHh4axpMCK+IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9
+YBk2QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4hevIIgcwCgYIKoZIzj0E
+AwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozmut6Dacpps6kFtZaSF4fC0urQe87YQVt8
+rgIwRt7qy12a7DLCZRawTDBcMPPaTnOGBtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
+-----END CERTIFICATE-----
+
+E-Tugra Global Root CA RSA v3
+=============================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+E-Tugra Global Root CA ECC v3
+=============================
+-----BEGIN CERTIFICATE-----
+MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMwgYAxCzAJBgNV
+BAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVncmEgRUJHIEEuUy4xHTAbBgNV
+BAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYDVQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENB
+IEVDQyB2MzAeFw0yMDAzMTgwOTQ2NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBxMGQW5rYXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1
+Z3JhIFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBFQ0MgdjMw
+djAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQKczLWYHMjLiSF4mDKpL2
+w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YKfWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31
+Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQ
+zPUwHQYDVR0OBBYEFP+CMXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
+PQQDAwNpADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/67W4W
+Aie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFxvmjkI6TZraE3
+-----END CERTIFICATE-----

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,13 +5,14 @@ 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
   module SpecSearchers
     module Git
       module GClone
+        METADATA_FILE = 'metadata.json'
+
         # @summary clones the remote url and reads the metadata file
         # @returns [String] the content of the metadata file
         def self.metadata(puppetfile_module, resolver_ui, config)
@@ -25,8 +26,6 @@ module PuppetfileResolver
           return nil if repo_url.nil?
           return nil unless valid_http_url?(repo_url)
 
-          metadata_file = 'metadata.json'
-
           ref = puppetfile_module.ref ||
                 puppetfile_module.tag ||
                 puppetfile_module.commit ||
@@ -35,7 +34,7 @@ module PuppetfileResolver
 
           resolver_ui.debug { "Querying git repository #{repo_url}" }
 
-          clone_and_read_file(repo_url, ref, metadata_file, config)
+          clone_and_read_file(repo_url, ref, config)
         end
 
         # @summary clones the git url and reads the file at the given ref
@@ -44,24 +43,37 @@ module PuppetfileResolver
         # @param ref [String] the git ref, branch, commit, tag
         # @param file [String] the file you wish to read
         # @returns [String] the content of the file
-        def self.clone_and_read_file(url, ref, file, config)
-          clone_cmd = ['git', 'clone', '--bare', '--depth=1', '--single-branch']
-          err_msg = ''
-          if config.proxy
-            err_msg += " with proxy #{config.proxy}: "
-            proxy = "--config \"http.proxy=#{config.proxy}\" --config \"https.proxy=#{config.proxy}\""
-            clone_cmd.push(proxy)
-          end
-
+        def self.clone_and_read_file(url, ref, config)
           Dir.mktmpdir(nil, config.clone_dir) do |dir|
-            clone_cmd.push("--branch=#{ref}") if ref != 'HEAD'
-            clone_cmd.push(url, dir)
-            out, err_out, process = ::PuppetfileResolver::Util.run_command(clone_cmd)
-            err_msg += out
-            raise err_msg unless process.success?
+            clone = ['git', 'clone', url, dir]
+            clone += ['--config', "http.proxy=#{config.proxy}", '--config', "https.proxy=#{config.proxy}"] if config.proxy
+
+            bare_clone = clone + ['--bare', '--depth=1']
+            bare_clone.push("--branch=#{ref}") unless ref == 'HEAD'
+
+            # Try to clone a bare repository. If that fails, fall back to a full clone.
+            # Cloning might fail because the repo does not exist or is otherwise
+            # inaccessible, but it can also fail because cloning a bare repository from
+            # a commit/SHA1 fails. Falling back to a full clone ensures that we support
+            # commits/SHA1s like Puppetfile does.
+            _stdout, _stderr, process = ::PuppetfileResolver::Util.run_command(bare_clone)
+
+            unless process.success?
+              _stdout, stderr, process = ::PuppetfileResolver::Util.run_command(clone)
+
+              unless process.success?
+                msg = if config.proxy
+                        "Cloning #{url} with proxy #{config.proxy} failed: #{stderr}"
+                      else
+                        "Cloning #{url} failed: #{stderr}"
+                      end
+                raise msg
+              end
+            end
+
             Dir.chdir(dir) do
-              content, err_out, process = ::PuppetfileResolver::Util.run_command(['git', 'show', "#{ref}:#{file}"])
-              raise 'InvalidContent' unless process.success? && content.length > 2
+              content, stderr, process = ::PuppetfileResolver::Util.run_command(['git', 'show', "#{ref}:#{METADATA_FILE}"])
+              raise "Could not find #{METADATA_FILE} for ref #{ref} at #{url}: #{stderr}" unless process.success?
               return content
             end
           end

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.1'
+  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'))

data/spec/unit/puppetfile-resolver/spec_searchers/git/gclone_spec.rb

@@ -23,8 +23,7 @@ describe PuppetfileResolver::SpecSearchers::Git::GClone do
       expect(JSON.parse(content)['name']).to eq('puppetlabs-powershell')
     end
 
-    context 'with ref' do
-
+    context 'with tag' do
       let(:puppetfile_module) do
         PuppetfileModule.new(remote: url, ref: '2.1.2')
       end
@@ -34,6 +33,29 @@ describe PuppetfileResolver::SpecSearchers::Git::GClone do
         expect(JSON.parse(content)['name']).to eq('puppetlabs-powershell')
       end
     end
+
+    context 'with commit' do
+      let(:puppetfile_module) do
+        PuppetfileModule.new(remote: url, ref: '9276de695798097e8471b877a18df27f764eecda')
+      end
+
+      it 'reads metadata' do
+        content = subject.metadata(puppetfile_module, Logger.new(STDERR), config)
+        expect(JSON.parse(content)['name']).to eq('puppetlabs-powershell')
+      end
+    end
+
+    context 'with invalid ref' do
+      let(:puppetfile_module) do
+        PuppetfileModule.new(remote: url, ref: '8f7d5ea3ef49dadc5e166d5d802d091abc4b02bc')
+      end
+
+      it 'errors gracefully' do
+        expect { subject.metadata(puppetfile_module, Logger.new(STDERR), config) }.to raise_error(
+          /Could not find metadata\.json for ref .* at .*/
+        )
+      end
+    end
   end
 
   context 'invalid url' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfile-resolver
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Glenn Sarti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 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,7 +140,7 @@ 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
@@ -134,11 +148,11 @@ test_files:
 - spec/fixtures/proxy.rb
 - spec/fixtures/modulepath/test_module/README.md
 - spec/fixtures/modulepath/test_module/metadata.json
-- spec/unit/puppetfile-resolver/puppetfile/parser/r10k_eval_spec.rb
-- spec/unit/puppetfile-resolver/puppetfile/document_spec.rb
-- spec/unit/puppetfile-resolver/resolver_spec.rb
-- spec/unit/puppetfile-resolver/spec_searchers/git/gclone_spec.rb
 - spec/spec_helper.rb
-- spec/integration/proxy_spec.rb
-- spec/integration/kitchensink_spec.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