rh_entitlement 0.4.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/rh-entitlement +6 -3
- data/lib/rh_entitlement/lookup.rb +14 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0ca9a25083a74145ccb2e8c6eb5a2ba837202479
|
|
4
|
+
data.tar.gz: 23d6c753767ef1a5773d785cb9ddf37249bf1c65
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 22d2df733637590e9a26dd8838b9c03d89225f07b9fde46c5767e924107f3631f16b94980e835b1a9d9625c128c5a270c237b2cc2d1b363d5d6b0e1eaf6da59e
|
|
7
|
+
data.tar.gz: 0ecdd0df61100fbd296fa5cdc653609f6c94ea679da8229ab0b3202ca5112efa4906d5133d761ba9b9a7f8eb5312a1be1d71f8e33addbda250356cfe5d82e7da
|
data/bin/rh-entitlement
CHANGED
|
@@ -60,11 +60,14 @@ when 'find'
|
|
|
60
60
|
cert_files = opts
|
|
61
61
|
end
|
|
62
62
|
|
|
63
|
+
urls = RhEntitlement::Lookup.make_url_variants(repo_url)
|
|
63
64
|
cert_files.each do |file|
|
|
64
65
|
cert = RhEntitlement::Certificate.new(File.read(file))
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
urls.each do |url|
|
|
67
|
+
if cert.urls.has? url
|
|
68
|
+
puts file
|
|
69
|
+
exit 0
|
|
70
|
+
end
|
|
68
71
|
end
|
|
69
72
|
end
|
|
70
73
|
|
|
@@ -34,13 +34,26 @@ module RhEntitlement
|
|
|
34
34
|
end
|
|
35
35
|
|
|
36
36
|
def find_url(url)
|
|
37
|
+
urls = self.make_url_variants(url)
|
|
37
38
|
entitlements.each do |key, entitlement|
|
|
38
|
-
|
|
39
|
+
urls.each do |search|
|
|
40
|
+
return key if entitlement.urls.has?(search)
|
|
41
|
+
end
|
|
39
42
|
end
|
|
40
43
|
|
|
41
44
|
nil
|
|
42
45
|
end
|
|
43
46
|
|
|
47
|
+
def self.make_url_variants(url)
|
|
48
|
+
urls = [url]
|
|
49
|
+
if url.match(/\dServer/)
|
|
50
|
+
urls.push(url.gsub(/\dServer/, '$releasever'))
|
|
51
|
+
else
|
|
52
|
+
urls.push(url.gsub('$releasever', '6Server'))
|
|
53
|
+
urls.push(url.gsub('$releasever', '7Server'))
|
|
54
|
+
end
|
|
55
|
+
end
|
|
56
|
+
|
|
44
57
|
def self.instance
|
|
45
58
|
@@instance ||= new
|
|
46
59
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rh_entitlement
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.5.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Thomas Gelf
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-
|
|
11
|
+
date: 2018-07-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies: []
|
|
13
13
|
description: Helper library allowing one to deal with RH entitlement certs
|
|
14
14
|
email: thomas@gelf.net
|