Cask: split quarantine/release functions

Library/Homebrew/cask/download.rb

@@ -49,7 +49,11 @@ module Cask
       return if @quarantine.nil?
       return unless Quarantine.available?
 
-      Quarantine.cask!(cask: @cask, download_path: @downloaded_path, action: @quarantine)
+      if @quarantine
+        Quarantine.cask!(cask: @cask, download_path: @downloaded_path)
+      else
+        Quarantine.release!(download_path: @downloaded_path)
+      end
     end
   end
 end

Library/Homebrew/cask/quarantine.rb

@@ -67,10 +67,27 @@ module Cask
       fields.join(";")
     end
 
+    def release!(download_path: nil)
+      return unless detect(download_path)
+
+      odebug "Releasing #{download_path} from quarantine"
+
+      quarantiner = system_command("/usr/bin/xattr",
+                                  args: [
+                                    "-d",
+                                    QUARANTINE_ATTRIBUTE,
+                                    download_path,
+                                  ],
+                                  print_stderr: false)
+
+      return if quarantiner.success?
+
+      raise CaskQuarantineReleaseError.new(download_path, quarantiner.stderr)
+    end
+
     def cask!(cask: nil, download_path: nil, action: true)
       return if cask.nil? || download_path.nil?
 
-      if action
       return if detect(download_path)
 
       odebug "Quarantining #{download_path}"
@@ -91,23 +108,6 @@ module Cask
       else
         raise CaskQuarantineError.new(download_path, quarantiner.stderr)
       end
-      else
-        return unless detect(download_path)
-
-        odebug "Releasing #{download_path} from quarantine"
-
-        quarantiner = system_command("/usr/bin/xattr",
-                                    args: [
-                                      "-d",
-                                      QUARANTINE_ATTRIBUTE,
-                                      download_path,
-                                    ],
-                                    print_stderr: false)
-
-        return if quarantiner.success?
-
-        raise CaskQuarantineReleaseError.new(download_path, quarantiner.stderr)
-      end
     end
 
     def propagate(from: nil, to: nil)