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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'uri'
 
 module KPM
   class TomcatManager
-
     DOWNLOAD_URL = 'https://s3.amazonaws.com/kb-binaries/apache-tomcat-7.0.42.tar.gz'
 
     def initialize(tomcat_dir, logger)
       @tomcat_dir = Pathname.new(tomcat_dir)
       @logger = logger
@@ -17,14 +18,14 @@
       path = nil
       Dir.mktmpdir do |dir|
         file = Pathname.new(dir).join('tomcat.tar.gz')
 
         @logger.info "Starting download of #{DOWNLOAD_URL} to #{file}"
-        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-          File.open(file, 'wb+') do |file|
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+          File.open(file, 'wb+') do |f|
             http.get(uri.path) do |body|
-              file.write(body)
+              f.write(body)
             end
           end
         end
 
         path = Utils.unpack_tgz(file.to_s, @tomcat_dir, true)
@@ -34,11 +35,11 @@
       path
     end
 
     def setup
       # Remove default webapps
-      %w(ROOT docs examples host-manager manager).each do |webapp|
+      %w[ROOT docs examples host-manager manager].each do |webapp|
         FileUtils.rm_rf(@tomcat_dir.join('webapps').join(webapp))
       end
 
       # Update Root.xml
       root_xml_dir = @tomcat_dir.join('conf').join('Catalina').join('localhost')
@@ -53,12 +54,12 @@
       @tomcat_dir.join('webapps').join('ROOT.war').to_s
     end
 
     def help
       "Tomcat installed at #{@tomcat_dir}
-Start script: #{@tomcat_dir.join('bin').join('startup.sh').to_s}
-Stop script: #{@tomcat_dir.join('bin').join('shutdown.sh').to_s}
-Logs: #{@tomcat_dir.join('logs').to_s}"
+Start script: #{@tomcat_dir.join('bin').join('startup.sh')}
+Stop script: #{@tomcat_dir.join('bin').join('shutdown.sh')}
+Logs: #{@tomcat_dir.join('logs')}"
     end
 
     private
 
     def default_java_properties