From e8fa6f9ad198f3746aaa86512708b95ea0c49d39 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sat, 23 Dec 2017 16:52:50 +0000
Subject: [PATCH] gpg: cleanup and simplify.

---
 Library/Homebrew/gpg.rb | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/Library/Homebrew/gpg.rb b/Library/Homebrew/gpg.rb
index 83b525b444..f1b989a165 100644
--- a/Library/Homebrew/gpg.rb
+++ b/Library/Homebrew/gpg.rb
@@ -1,29 +1,17 @@
 require "utils"
 
 class Gpg
-  def self.find_gpg(executable)
-    which_all(executable).detect do |gpg|
-      gpg_short_version = Utils.popen_read(gpg, "--version")[/\d\.\d/, 0]
-      next unless gpg_short_version
-      gpg_version = Version.create(gpg_short_version.to_s)
-      @version = gpg_version
-      gpg_version >= Version.create("2.0")
-    end
+  module_function
+
+  def executable
+    which "gpg"
   end
 
-  def self.executable
-    find_gpg("gpg") || find_gpg("gpg2")
-  end
-
-  def self.available?
+  def available?
     File.executable?(executable.to_s)
   end
 
-  def self.version
-    @version if available?
-  end
-
-  def self.create_test_key(path)
+  def create_test_key(path)
     odie "No GPG present to test against!" unless available?
 
     (path/"batch.gpg").write <<~EOS
@@ -40,8 +28,9 @@ class Gpg
     system executable, "--batch", "--gen-key", "batch.gpg"
   end
 
-  def self.cleanup_test_processes!
+  def cleanup_test_processes!
     odie "No GPG present to test against!" unless available?
+
     gpgconf = Pathname.new(executable).parent/"gpgconf"
 
     system gpgconf, "--kill", "gpg-agent"
@@ -49,7 +38,7 @@ class Gpg
                                  "gpg-agent"
   end
 
-  def self.test(path)
+  def test(path)
     create_test_key(path)
     begin
       yield