lib/kpm/killbill_server_artifact.rb in kpm-0.7.2 vs lib/kpm/killbill_server_artifact.rb in kpm-0.8.0

@@ -1,28 +1,31 @@
+# frozen_string_literal: true
+
 require 'rexml/document'
 require 'set'
 
 module KPM
   class KillbillServerArtifact < BaseArtifact
     class << self
-      def versions(artifact_id, packaging=KPM::BaseArtifact::KILLBILL_PACKAGING, classifier=KPM::BaseArtifact::KILLBILL_CLASSIFIER, overrides={}, ssl_verify=true)
-        coordinate_map = {:group_id => KPM::BaseArtifact::KILLBILL_GROUP_ID, :artifact_id => artifact_id, :packaging => packaging, :classifier => classifier}
+      def versions(artifact_id, packaging = KPM::BaseArtifact::KILLBILL_PACKAGING, classifier = KPM::BaseArtifact::KILLBILL_CLASSIFIER, overrides = {}, ssl_verify = true)
+        coordinate_map = { group_id: KPM::BaseArtifact::KILLBILL_GROUP_ID, artifact_id: artifact_id, packaging: packaging, classifier: classifier }
         coordinates = KPM::Coordinates.build_coordinates(coordinate_map)
         response    = REXML::Document.new nexus_remote(overrides, ssl_verify).search_for_artifacts(coordinates)
         versions    = SortedSet.new
         response.elements.each('searchNGResponse/data/artifact/version') { |element| versions << element.text }
         versions
       end
 
-      def info(version='LATEST', sha1_file=nil, force_download=false, verify_sha1=true, overrides={}, ssl_verify=true)
+      def info(version = 'LATEST', sha1_file = nil, force_download = false, verify_sha1 = true, overrides = {}, ssl_verify = true)
         logger = Logger.new(STDOUT)
         logger.level = Logger::ERROR
 
-        version = KPM::Installer.get_kb_latest_stable_version if version == 'LATEST'
-
+        # Initialize as early as possible (used in rescue block below)
         sha1_checker = sha1_file ? Sha1Checker.from_file(sha1_file) : nil
 
+        version = KPM::Installer.get_kb_latest_stable_version if version == 'LATEST'
+
         versions = {}
         Dir.mktmpdir do |dir|
           # Retrieve the main Kill Bill pom
           kb_pom_info = pull(logger,
                              KPM::BaseArtifact::KILLBILL_GROUP_ID,
@@ -59,25 +62,23 @@
                               overrides,
                               ssl_verify)
 
           pom = REXML::Document.new(File.new(oss_pom_info[:file_path]))
           properties_element = pom.root.elements['properties']
-          %w(killbill-api killbill-plugin-api killbill-commons killbill-platform).each do |property|
+          %w[killbill-api killbill-plugin-api killbill-commons killbill-platform].each do |property|
             versions[property] = properties_element.elements["#{property}.version"].text
           end
 
           sha1_checker.cache_killbill_info(version, versions) if sha1_checker
         end
         versions
       rescue StandardError => e
         # Network down? Hopefully, we have something in the cache
         cached_version = sha1_checker ? sha1_checker.killbill_info(version) : nil
-        if force_download || !cached_version
-          raise e
-        else
-          # Use the cache
-          return cached_version
-        end
+        raise e if force_download || !cached_version
+
+        # Use the cache
+        cached_version
       end
     end
   end
 end