From ef016a339e6f74cb1e847d966fed2317a7a758a5 Mon Sep 17 00:00:00 2001 From: Jesse Shawl Date: Mon, 19 Feb 2024 08:50:52 -0600 Subject: [PATCH] format --- bin/minisign | 8 +++---- lib/minisign.rb | 6 +++--- lib/minisign/nacl.rb | 51 ++++++++++++++++++++++++-------------------- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/bin/minisign b/bin/minisign index 0452b35..a4bb038 100755 --- a/bin/minisign +++ b/bin/minisign @@ -31,11 +31,9 @@ rescue OptionParser::InvalidOption exit 1 end -if options[:G] || options[:R] || options[:G] || options[:S] - unless defined? RbNaCl::Hash - STDERR.puts "Error: libsodium is not installed!" - exit 1 - end +if (options[:G] || options[:R] || options[:G] || options[:S]) && !defined? RbNaCl::Hash + warn 'Error: libsodium is not installed!' + exit 1 end Minisign::CLI.generate(options) if options[:G] diff --git a/lib/minisign.rb b/lib/minisign.rb index d93999a..2f1aa51 100644 --- a/lib/minisign.rb +++ b/lib/minisign.rb @@ -4,9 +4,9 @@ require 'base64' require 'openssl' begin - require 'rbnacl' -rescue LoadError => e - # errors handled when invoked (see Minisign::NaCl) + require 'rbnacl' +rescue LoadError + # errors handled when invoked (see Minisign::NaCl) end require 'minisign/cli' diff --git a/lib/minisign/nacl.rb b/lib/minisign/nacl.rb index bd49659..4c86fa0 100644 --- a/lib/minisign/nacl.rb +++ b/lib/minisign/nacl.rb @@ -1,27 +1,32 @@ +# frozen_string_literal: true + module Minisign - module NaCl - def self.safely - begin - yield - rescue NameError - raise Minisign::LibSodiumDependencyError, 'libsodium is not installed!' - end - end - module Hash - module Blake2b - def self.digest(*args) - NaCl::safely do - RbNaCl::Hash::Blake2b.digest(*args) - end - end - end + # A module that invokes RbNaCl with user-focused actionable error messages. + module NaCl + def self.safely + yield + rescue NameError + raise Minisign::LibSodiumDependencyError, 'libsodium is not installed!' + end + + module Hash + # see RbNaCl::Hash::Blake2b + module Blake2b + def self.digest(*args) + NaCl.safely do + RbNaCl::Hash::Blake2b.digest(*args) + end end - module PasswordHash - def self.scrypt(*args) - NaCl::safely do - RbNaCl::PasswordHash.scrypt(*args) - end - end + end + end + + # see RbNaCl::PasswordHash + module PasswordHash + def self.scrypt(*args) + NaCl.safely do + RbNaCl::PasswordHash.scrypt(*args) end + end end -end \ No newline at end of file + end +end