localhost 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2af90326b97a7ed35c40f67354cd551fc7f7087b3988752be1ce84346b5d33
-  data.tar.gz: 7d3e6cfe20a573d193ab7d54128af846481287423f058705ec1c7e7267d2093d
+  metadata.gz: f89b94a723b8a61b6643315b8e80d1c41e8bbba1e40b4ef717712a27f6b9c99e
+  data.tar.gz: 17a0be5aa542d32276375451ed5f3a29a83f838a9a9905a3e451477c8aa45d8c
 SHA512:
-  metadata.gz: 8c6c85bff1973b4637c03031a73f4f0a77974eb7f9def2db89b7213586ff051f2c3d4d214732a052d6334f6253b9c54282427bf99c321d3a8c125f02bae07493
-  data.tar.gz: e35941e8efbae8f94b00f2738b7425cfbc4046dca06971c9a970747146e5eef22de7e17e41a185cd15cae9f44f602e5dccee705d01da19508292511f872d1d1b
+  metadata.gz: fe38188f3a314ad69e4c7bcc03092cf9e2e1efa98570879aef8d52a94d851f310d8884b767aff64a6642b40d4ca04e0dec54ee2e1c75d1158ec6d514cc09e103
+  data.tar.gz: ce8a85d130b0c828170105f177b189fb5417abd1b9b7c00079eb7951fd6c1a82767d74609ccd3fa2fa3b7b5b665eca98feab3aaffb922cc083f560777786357d

data/bake/localhost.rb

@@ -13,13 +13,7 @@ end
 #
 # @returns [Array(Hash)] The certificate and key paths, and the expiry date.
 def list
-	Localhost::Authority.list.map do |authority|
-		{
-			certificate_path: authority.certificate_path,
-			key_path: authority.key_path,
-			expires_at: authority.certificate.not_after,
-		}
-	end
+	Localhost::Authority.list.map(&:to_h)
 end
 
 # Fetch a local authority by hostname. If the authority does not exist, it will be created.
@@ -27,21 +21,25 @@ end
 # @parameter hostname [String] The hostname to fetch.
 # @returns [Hash] The certificate and key paths, and the expiry date.
 def fetch(hostname)
-	if authority = Localhost::Authority.fetch(hostname)
-		return {
-			certificate_path: authority.certificate_path,
-			key_path: authority.key_path,
-			expires_at: authority.certificate.not_after,
-		}
-	end
+	Localhost::Authority.fetch(hostname)
 end
 
+# Install a certificate into the system trust store.
+# @parameter name [String] The name of the issuer to install, or nil for the default issuer.
 def install(name: nil)
 	issuer = Localhost::Issuer.fetch(name)
 	
+	$stderr.puts "Installing certificate for #{issuer.subject}..."
 	Localhost::System.current.install(issuer.certificate_path)
+	
+	return nil
 end
 
+# Delete all local authorities.
 def purge
+	$stderr.puts "Purging localhost state..."
+	
 	Localhost::State.purge
+	
+	return nil
 end

data/lib/localhost/authority.rb

@@ -242,5 +242,23 @@ module Localhost
 			
 			return true
 		end
+		
+		# @returns A hash representation of the authority's certificate details.
+		def to_h
+			{
+				hostname: @hostname,
+				certificate_path: certificate_path,
+				key_path: key_path,
+				expires_at: certificate.not_after,
+			}
+		end
+		
+		def as_json(...)
+			self.to_h
+		end
+		
+		def to_json(...)
+			self.as_json.to_json(...)
+		end
 	end
 end

data/lib/localhost/state.rb

@@ -32,7 +32,7 @@ module Localhost
 		def self.purge(env = ENV)
 			path = self.path(env)
 			
-			FileUtils.rm_rf(path)
-		end	
+			return FileUtils.rm_rf(path)
+		end
 	end
 end

data/lib/localhost/system/darwin.rb

@@ -13,13 +13,21 @@ module Localhost
 			def self.install(certificate)
 				login_keychain = File.expand_path("~/Library/Keychains/login.keychain-db")
 				
-				system(
+				success = system(
 					"security", "add-trusted-cert",
 					"-d", "-r", "trustRoot",
 					"-k", login_keychain,
 					certificate
 				)
+				
+				if success
+					$stderr.puts "Installed certificate to #{login_keychain}"
+					
+					return true
+				else
+					raise "Failed to install certificate: #{certificate}"
+				end
 			end
 		end
 	end
-end
+end

data/lib/localhost/system/linux.rb

@@ -7,16 +7,44 @@ module Localhost
 	module System
 		# Linux specific system operations.
 		module Linux
+			# This appears to be the standard path for the system trust store on many Linux distributions.
+			ANCHORS_PATH = "/etc/ca-certificates/trust-source/anchors/"
+			UPDATE_CA_TRUST = "update-ca-trust"
+			
+			# This is an older method for systems that do not use `update-ca-trust`.
+			LOCAL_CERTIFICATES_PATH = "/usr/local/share/ca-certificates/"
+			UPDATE_CA_CERTIFICATES = "update-ca-certificates"
+			
 			# Install a certificate into the system trust store.
 			#
 			# @parameter certificate [String] The path to the certificate file.
 			def self.install(certificate)
 				filename = File.basename(certificate)
-				destination = "/usr/local/share/ca-certificates/localhost-#{filename}"
+				command = nil
 				
-				system("sudo", "cp", certificate, destination)
-				system("sudo", "update-ca-certificates")
+				if File.exist?(ANCHORS_PATH)
+					# For systems using `update-ca-trust`.
+					destination = File.join(ANCHORS_PATH, filename)
+					command = UPDATE_CA_TRUST
+				elsif File.exist?(LOCAL_CERTIFICATES_PATH)
+					# For systems using `update-ca-certificates`.
+					destination = File.join(LOCAL_CERTIFICATES_PATH, filename)
+					command = UPDATE_CA_CERTIFICATES
+				else
+					raise "No known system trust store found. Please install the certificate manually."
+				end
+				
+				success = system("sudo", "cp", certificate, destination)
+				success &= system("sudo", command)
+				
+				if success
+					$stderr.puts "Installed certificate to #{destination}"
+					
+					return true
+				else
+					raise "Failed to install certificate: #{certificate}"
+				end
 			end
 		end
 	end
-end
+end

data/lib/localhost/version.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2018-2025, by Samuel Williams.
 
 module Localhost
-	VERSION = "1.5.0"
+	VERSION = "1.6.0"
 end

data/readme.md

@@ -22,6 +22,11 @@ Please see the [project documentation](https://socketry.github.io/localhost/) fo
 
 Please see the [project releases](https://socketry.github.io/localhost/releases/index) for all releases.
 
+### v1.6.0
+
+  - Add support for `update-ca-trust` on Linux sytems.
+  - Better command output.
+
 ### v1.4.0
 
   - Add `localhost:purge` to delete all certificates.

data/releases.md

@@ -1,5 +1,10 @@
 # Releases
 
+## v1.6.0
+
+  - Add support for `update-ca-trust` on Linux sytems.
+  - Better command output.
+
 ## v1.4.0
 
   - Add `localhost:purge` to delete all certificates.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localhost
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -46,7 +46,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2025-04-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 executables: []
 extensions: []
@@ -77,14 +77,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Manage a local certificate authority for self-signed localhost development
   servers.