debian_codename 0.2.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b5e4e8d7b141d02e8986d7c7f6ced3a07a1c9dd8bd8f6fe75dcb96e892f74d
-  data.tar.gz: c7cc6214ce8b243c32dfb2a1251b0a2497a03b754743858dee2271847cd69e37
+  metadata.gz: c363a439873bce2913c1a7612cd3163044671a5b511f05000d899a54049babc4
+  data.tar.gz: 9cff5cd8b29cc2065001ee8bbfbd1fc7aff2d751c75470cc67f6f8792912051e
 SHA512:
-  metadata.gz: d3dcb7ebd8093be1954581c4c1c261cc2f069f2f919faa92d401e26935f74125c24aa33d292c0eb9459bd1e30fe4d2dddfee48714c2fcad81324b44afd523152
-  data.tar.gz: cbb9184b43e25989750f542692e027037ab087250b269e58d9825e6d6a98627ca9a133bef8ebc078ec91b9b4a9b70041cda66a68397f170b1c8116dfd9531269
+  metadata.gz: 6c9bfc361fddd81f609896772407e780a6374bd0587c9f6bfdda4002a0e19f0523983514eac16b176fd3039772681482ceff4d115e0ac4f21bb320dd863e7a44
+  data.tar.gz: 13d9c211b2bc1e0d7bae669f3f4de4801e58a5b8bdbff328f0d2578b881e5e99cf9e4417c4f3cf78406fbe1cb1c53da29f9613271877e51a1029ac1e949bc8c4

data/lib/debian_codename.rb

@@ -7,6 +7,7 @@ module DebianCodename
 
   # https://wiki.debian.org/DebianReleases#Production_Releases
   DEBIAN_CODENAMES = {
+    '@distribution' => 'debian',
     '14' => %w[forky],
     '13' => %w[trixie],
     '12' => %w[bookworm],
@@ -33,6 +34,7 @@ module DebianCodename
   # Codename nouns ignored here at the moment but kept for consistency and possible future
   # improvements
   UBUNTU_CODENAMES = {
+    '@distribution' => 'ubuntu',
     '23.04' => %w[lunar lobster],
     '22.10' => %w[kinetic kudu],
     '22.04' => %w[jammy jellyfish],
@@ -73,18 +75,51 @@ module DebianCodename
 
   module_function
 
-  # Whether version number or codename is the user_search_string, return the matching
-  # item.
+  # Convert from version string to codename and vice versa
   def fast_find(user_search_string)
     search_string = user_search_string.downcase
 
     [DEBIAN_CODENAMES, UBUNTU_CODENAMES].each do |code_catalog|
-      return code_catalog[search_string][0] if code_catalog.key?(search_string)
+      return codename(code_catalog, search_string) if code_catalog.key?(search_string)
 
-      key = code_catalog.find { |_key, value| value[0] == search_string }
-      return key.first unless key.nil?
+      version_found = code_catalog.find { |_, value| value[0] == search_string }
+      return version_found.first unless version_found.nil?
     end
 
     raise DebianCodenameError, "No match for #{user_search_string}"
   end
+
+  # Return a canonical form (Hash with ':version', ':codename', and ':distribution' keys)
+  def find(user_search_string)
+    search_string = user_search_string.downcase
+
+    [DEBIAN_CODENAMES, UBUNTU_CODENAMES].each do |code_catalog|
+      if code_catalog.key?(search_string)
+        return {
+          version: search_string,
+          codename: codename(code_catalog, search_string),
+          distribution: distribution(code_catalog)
+        }
+      end
+
+      version_found = code_catalog.find { |_, value| value[0] == search_string }
+      unless version_found.nil?
+        return {
+          version: version_found.first,
+          codename: search_string,
+          distribution: distribution(code_catalog)
+        }
+      end
+    end
+
+    raise DebianCodenameError, 'No match'
+  end
+
+  def codename(code_catalog, version_string)
+    code_catalog[version_string][0]
+  end
+
+  def distribution(code_catalog)
+    code_catalog['@distribution']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debian_codename
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Puppet Release Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies: []
 description: Convert Debian/Ubuntu codenames to version numbers and vice-versa
 email: