u3d 1.2.2 → 1.3.1

data/lib/u3d/unity_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -45,6 +47,7 @@ module U3d
       if log_file
         tail_thread = start_tail_thread(log_file, output_callback)
         return unless tail_thread.status
+
         tail_thread.run
       end
 
@@ -78,9 +81,9 @@ module U3d
     end
 
     class << self
-      # rubocop:disable MethodName
+      # rubocop:disable Naming/MethodName
       def find_logFile_in_args(args)
-        # rubocop:enable MethodName
+        # rubocop:enable Naming/MethodName
         find_arg_in_args('-logFile', args)
       end
 
@@ -90,6 +93,7 @@ module U3d
 
       def find_arg_in_args(arg_to_find, args)
         raise 'Only arguments of type array supported right now' unless args.is_a?(Array)
+
         args.each_with_index do |arg, index|
           return args[index + 1] if arg == arg_to_find && index < args.count - 1
         end
@@ -101,12 +105,10 @@ module U3d
 
     def start_tail_thread(log_file, output_callback)
       tail_thread = Thread.new do
-        begin
-          pipe(log_file) { |line| output_callback.call(line) }
-        rescue StandardError => e
-          UI.error "Failure while trying to pipe #{log_file}: #{e.message}"
-          e.backtrace.each { |l| UI.error "  #{l}" }
-        end
+        pipe(log_file) { |line| output_callback.call(line) }
+      rescue StandardError => e
+        UI.error "Failure while trying to pipe #{log_file}: #{e.message}"
+        e.backtrace.each { |l| UI.error "  #{l}" }
       end
 
       # Wait for tail_thread setup to be complete
@@ -114,14 +116,14 @@ module U3d
       tail_thread
     end
 
-    def pipe(file)
+    def pipe(file, &block)
       File.open(file, 'r') do |f|
         f.extend File::Tail
         f.interval = 0.1
         f.max_interval = 0.4
         f.backward 0
         Thread.stop
-        f.tail { |l| yield l }
+        f.tail(&block)
       end
     end
   end

data/lib/u3d/unity_version_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -51,6 +53,7 @@ module U3d
 
     def [](package)
       return nil unless available_package? package
+
       @packages.find { |pack| pack.id == package.downcase }
     end
 

data/lib/u3d/unity_version_number.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -24,14 +26,14 @@ require 'u3d/utils'
 
 module U3d
   class UnityVersionNumber
-    attr_reader :unity_version
-    attr_reader :parts
+    attr_reader :unity_version, :parts
 
     def initialize(version)
       @unity_version = version
       parsed = Utils.parse_unity_version(@unity_version)
       parsed.each_with_index do |val, index|
         next if val.nil? || (index == 3)
+
         parsed[index] = val.to_i
       end
       @parts = parsed
@@ -52,12 +54,16 @@ module U3d
     def <=>(other)
       comp = @version.parts[0] <=> other.version.parts[0]
       return comp if comp.nonzero?
+
       comp = @version.parts[1] <=> other.version.parts[1]
       return comp if comp.nonzero?
+
       comp = @version.parts[2] <=> other.version.parts[2]
       return comp if comp.nonzero?
+
       comp = RELEASE_LETTER_STRENGTH[@version.parts[3].to_sym] <=> RELEASE_LETTER_STRENGTH[other.version.parts[3].to_sym]
       return comp if comp.nonzero?
+
       return @version.parts[4] <=> other.version.parts[4]
     end
 

data/lib/u3d/unity_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -47,6 +49,7 @@ module U3d
     def fetch_cookie
       UI.verbose "FetchCookie? #{@cookie}"
       return @cookie if @cookie
+
       cookie_str = ''
       url = 'https://forum.unity.com/forums/linux-editor.93/' # a page that triggers cookies
       uri = URI(url)
@@ -56,15 +59,15 @@ module U3d
         response = http.request request
 
         case response
-        when Net::HTTPSuccess then
+        when Net::HTTPSuccess
           UI.verbose "unexpected result"
-        when Net::HTTPRedirection then
+        when Net::HTTPRedirection
           # A session must be opened with the server before accessing forum
           res = nil
           cookie_str = ''
           # Store the name and value of the cookies returned by the server
           response['set-cookie'].gsub(/\s+/, '').split(',').each do |c|
-            cookie_str << c.split(';', 2)[0] + '; '
+            cookie_str << ("#{c.split(';', 2)[0]}; ")
           end
           cookie_str.chomp!('; ')
 
@@ -78,6 +81,7 @@ module U3d
           end
 
           raise 'Unexpected result' unless res.is_a? Net::HTTPRedirection
+
           # It should be a redirection to the forum to perform authentication
           uri = URI(res['location'])
           UI.verbose "Redirecting to #{uri}"
@@ -90,50 +94,51 @@ module U3d
           raise 'Unable to establish a session with Unity forum' unless res.is_a? Net::HTTPRedirection
 
           UI.verbose "Found cookie_str #{cookie_str}"
-          cookie_str << '; ' + res['set-cookie'].gsub(/\s+/, '').split(';', 2)[0]
+          cookie_str << ("; #{res['set-cookie'].gsub(/\s+/, '').split(';', 2)[0]}")
         end
       end
       UI.verbose "Found @cookie #{cookie_str}"
       @cookie = cookie_str
     end
   end
+
   # Takes care of fectching versions and version list
   module UnityVersions
     #####################################################
     # @!group URLS: Locations to fetch information from
     #####################################################
     # URL for the forum thread listing all the Linux releases
-    UNITY_LINUX_DOWNLOADS = 'https://forum.unity.com/threads/unity-on-linux-release-notes-and-known-issues.350256/'.freeze
+    UNITY_LINUX_DOWNLOADS = 'https://forum.unity.com/threads/unity-on-linux-release-notes-and-known-issues.350256/'
     # URL for the main releases for Windows and Macintosh
-    UNITY_DOWNLOADS = 'https://unity3d.com/get-unity/download/archive'.freeze
+    UNITY_DOWNLOADS = 'https://unity3d.com/get-unity/download/archive'
     # URL for the LTS releases for Windows and Macintosh
-    UNITY_LTSES = 'https://unity3d.com/unity/qa/lts-releases'.freeze
+    UNITY_LTSES = 'https://unity3d.com/unity/qa/lts-releases'
     # URL for the patch releases for Windows and Macintosh
-    UNITY_PATCHES = 'https://unity3d.com/unity/qa/patch-releases'.freeze
+    UNITY_PATCHES = 'https://unity3d.com/unity/qa/patch-releases'
     # URL for the beta releases list, they need to be accessed after
-    UNITY_BETAS = 'https://unity3d.com/unity/beta/archive'.freeze
+    UNITY_BETAS = 'https://unity3d.com/unity/beta/archive'
     # URL for a specific beta, takes into parameter a version string (%s)
-    UNITY_BETA_URL = 'https://unity3d.com/unity/beta/unity%<version>s'.freeze
+    UNITY_BETA_URL = 'https://unity3d.com/unity/beta/unity%<version>s'
     # URL for latest releases listing (since Unity 2017.1.5f1), takes into parameter os (windows => win32, mac => darwin)
-    UNITY_LATEST_JSON_URL = 'https://public-cdn.cloud.unity3d.com/hub/prod/releases-%<os>s.json'.freeze
+    UNITY_LATEST_JSON_URL = 'https://public-cdn.cloud.unity3d.com/hub/prod/releases-%<os>s.json'
 
     #####################################################
     # @!group REGEX: expressions to interpret data
     #####################################################
     # Captures a version and its base url
-    LINUX_DOWNLOAD = %r{['"](https?:\/\/[\w/\.-]+/[0-9a-f\+]{12,13}\/)(.\/)?UnitySetup-(\d+\.\d+\.\d+\w\d+)['"]}
+    LINUX_DOWNLOAD = %r{['"](https?://[\w/.-]+/[0-9a-f+]{12,13}/)(./)?UnitySetup-(\d+\.\d+\.\d+\w\d+)['"]}.freeze
 
-    MAC_WIN_SHADERS = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)builtin_shaders-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
-    LINUX_INSTALLER = %r{(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)LinuxEditorInstaller/Unity.tar.xz}
+    MAC_WIN_SHADERS = %r{"(https?://[\w/.-]+/[0-9a-f+]{12,13}/)builtin_shaders-(\d+\.\d+\.\d+\w\d+)\.?\w+"}.freeze
+    LINUX_INSTALLER = %r{(https?://[\w/.-]+/[0-9a-f+]{12,13}/)LinuxEditorInstaller/Unity.tar.xz}.freeze
 
-    LINUX_DOWNLOAD_DATED = %r{"(https?://[\w/\._-]+/unity\-editor\-installer\-(\d+\.\d+\.\d+\w\d+).*\.sh)"}
-    LINUX_DOWNLOAD_RECENT_PAGE = %r{"(https?://beta\.unity3d\.com/download/[a-zA-Z0-9/\.\+]+/public_download\.html)"}
-    LINUX_DOWNLOAD_RECENT_FILE = %r{'(https?://beta\.unity3d\.com/download/[a-zA-Z0-9/\.\+]+/unity\-editor\-installer\-(\d+\.\d+\.\d+(?:x)?\w\d+).*\.sh)'}
+    LINUX_DOWNLOAD_DATED = %r{"(https?://[\w/._-]+/unity-editor-installer-(\d+\.\d+\.\d+\w\d+).*\.sh)"}.freeze
+    LINUX_DOWNLOAD_RECENT_PAGE = %r{"(https?://beta\.unity3d\.com/download/[a-zA-Z0-9/.+]+/public_download\.html)"}.freeze
+    LINUX_DOWNLOAD_RECENT_FILE = %r{'(https?://beta\.unity3d\.com/download/[a-zA-Z0-9/.+]+/unity-editor-installer-(\d+\.\d+\.\d+(?:x)?\w\d+).*\.sh)'}.freeze
     # Captures a beta version in html page
-    UNITY_BETAVERSION_REGEX = %r{\/unity\/beta\/unity(\d+\.\d+\.\d+\w\d+)"}
-    UNITY_EXTRA_DOWNLOAD_REGEX = %r{"(https?:\/\/[\w\/.-]+\.unity3d\.com\/(\w+))\/[a-zA-Z\/.-]+\/download.html"}
+    UNITY_BETAVERSION_REGEX = %r{/unity/beta/unity(\d+\.\d+\.\d+\w\d+)"}.freeze
+    UNITY_EXTRA_DOWNLOAD_REGEX = %r{"(https?://[\w/.-]+\.unity3d\.com/(\w+))/[a-zA-Z/.-]+/download.html"}.freeze
     # For the latest releases fetched from json
-    UNITY_LATEST_JSON = %r{(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)}
+    UNITY_LATEST_JSON = %r{(https?://[\w/.-]+/[0-9a-f+]{12,13}/)}.freeze
 
     class << self
       def list_available(os: nil)
@@ -191,7 +196,7 @@ module U3d
     end
 
     class LinuxVersions
-      JSON_OS = 'linux'.freeze
+      JSON_OS = 'linux'
 
       @unity_forums = U3d::UnityForums.new
       class << self
@@ -300,7 +305,7 @@ module U3d
     end
 
     class MacVersions
-      JSON_OS = 'darwin'.freeze
+      JSON_OS = 'darwin'
 
       class << self
         def list_available
@@ -312,7 +317,7 @@ module U3d
     end
 
     class WindowsVersions
-      JSON_OS = 'win32'.freeze
+      JSON_OS = 'win32'
 
       class << self
         def list_available

data/lib/u3d/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -27,11 +29,11 @@ require 'u3d_core/helper'
 
 module U3d
   # Several different utility methods
-  # rubocop:disable ModuleLength
+  # rubocop:disable Metrics/ModuleLength
   module Utils
     # Regex to capture each part of a version string (0.0.0x0)
     CSIDL_LOCAL_APPDATA = 0x001c
-    UNITY_VERSION_REGEX = /(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:(\w)(?:(\d+))?)?/
+    UNITY_VERSION_REGEX = /(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:(\w)(?:(\d+))?)?/.freeze
 
     class << self
       def final_url(url, redirect_limit: 10)
@@ -53,6 +55,7 @@ module U3d
 
       def follow_redirects(url, redirect_limit: 10, http_method: :get, request_headers: {}, &block)
         raise 'Too many redirections' if redirect_limit.zero?
+
         response = nil
         request = nil
         uri = URI(url)
@@ -65,15 +68,15 @@ module U3d
             end
             response = http.request request
           end
-        rescue OpenSSL::OpenSSLError => ssl_error
+        rescue OpenSSL::OpenSSLError => e
           UI.error 'SSL has faced an error, you may want to check our README to fix it'
-          raise ssl_error
+          raise e
         end
 
         case response
-        when Net::HTTPSuccess then
+        when Net::HTTPSuccess
           yield(request, response)
-        when Net::HTTPRedirection then
+        when Net::HTTPRedirection
           UI.verbose "Redirected to #{response['location']}"
           follow_redirects(response['location'], redirect_limit: redirect_limit - 1, http_method: http_method, request_headers: request_headers, &block)
         else raise "Request failed with status #{response.code}"
@@ -83,6 +86,7 @@ module U3d
       def http_request_class(method, uri)
         return Net::HTTP::Get.new uri if method == :get
         return Net::HTTP::Head.new uri if method == :head
+
         raise "Unknown method #{method}"
       end
 
@@ -111,10 +115,12 @@ module U3d
                 # FIXME revisits, this slows down download on fast network
                 # sleep 0.08 # adjust to reduce CPU
                 next unless print_progress
+
                 print_progress_now = Time.now.to_f - last_print_update > 0.5
                 # force printing when done downloading
                 print_progress_now = true if !print_progress_now && size && current >= size
                 next unless print_progress_now
+
                 last_print_update = Time.now.to_f
                 Utils.print_progress(current, size, started_at)
                 print "\n" unless UI.interactive?
@@ -140,6 +146,7 @@ module U3d
       def hashfile(file_path, blocksize: 65_536)
         require 'digest'
         raise ArgumentError, 'Not a file' unless File.file?(file_path)
+
         md5 = Digest::MD5.new
         File.open(file_path, 'r') do |f|
           md5 << f.read(blocksize) until f.eof?
@@ -155,9 +162,10 @@ module U3d
         if U3dCore::Helper.operating_system == :win
           yield
         else
-          stat_command = if U3dCore::Helper.operating_system == :linux
+          stat_command = case U3dCore::Helper.operating_system
+                         when :linux
                            "stat -c \"%U,%a\" #{dir}"
-                         elsif U3dCore::Helper.operating_system == :mac
+                         when :mac
                            "stat -f \"%Su,%A\" #{dir}"
                          end
           owner, access = U3dCore::CommandExecutor.execute(command: stat_command, admin: false).strip.split(',')
@@ -199,29 +207,87 @@ module U3d
         ver = UNITY_VERSION_REGEX.match(version)
         if ver.nil?
           raise ArgumentError, "Version (#{version}) does not match the Unity "\
-          'version format 0.0.0x0'
+                               'version format 0.0.0x0'
         end
         [ver[1], ver[2], ver[3], ver[4], ver[5]]
       end
 
       def windows_local_appdata
-        require 'win32api'
+        require "fiddle"
 
+        shell32 = Fiddle.dlopen('shell32')
+        getdir = Fiddle::Function.new(shell32['SHGetFolderPath'], [Fiddle::TYPE_LONG, Fiddle::TYPE_LONG, Fiddle::TYPE_LONG, Fiddle::TYPE_LONG, Fiddle::TYPE_VOIDP], Fiddle::TYPE_LONG)
         windir = ' ' * 261
-
-        getdir = Win32API.new('shell32', 'SHGetFolderPath', 'LLLLP', 'L')
         result = getdir.call(0, CSIDL_LOCAL_APPDATA, 0, 0, windir)
+
         raise "Unable to get Local Appdata directory, returned with value #{result}" unless result.zero?
+
         windir.rstrip!
         windir = windir.encode("UTF-8", Encoding.find('filesystem'))
         windir = File.expand_path(windir.rstrip)
 
         return windir if Dir.exist? windir
+
         raise "Local Appdata retrieved (#{windir}) is not correct"
       end
 
+      def windows_fileversion(info_key, path)
+        require "fiddle"
+        version_dll = Fiddle.dlopen('version.dll')
+        kernel32 = Fiddle.dlopen('kernel32.dll')
+
+        get_file_version_info_size = Fiddle::Function.new(version_dll['GetFileVersionInfoSize'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP], Fiddle::TYPE_LONG)
+        get_file_version_info = Fiddle::Function.new(version_dll['GetFileVersionInfo'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT) # FIXME: TYPE_INT => TYPE_LONG??
+        ver_query_value = Fiddle::Function.new(version_dll['VerQueryValue'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+        rtl_move_memory = Fiddle::Function.new(kernel32['RtlMoveMemory'], [Fiddle::TYPE_VOIDP, Fiddle::TYPE_LONG, Fiddle::TYPE_LONG], Fiddle::TYPE_INT)
+
+        file = "#{path.tr('/', '\\')}\u0000"
+
+        s = [0].pack('L')
+        version_size = get_file_version_info_size.call(file, s)
+        raise StandardError if version_size.zero?
+
+        version_info = ' ' * version_size
+        version_ok = get_file_version_info.call(file, 0, version_size, version_info)
+        raise StandardError if version_ok.zero? # TODO: use GetLastError
+
+        # hack, giving up using VerQueryValue for now.
+        rstring = version_info.unpack('v*').map { |c| c.chr if c < 256 } * ''
+        r = /#{info_key}..(.*?)\000/.match(rstring)
+        # puts "#{info_key} = #{r ? r[1] : '??'}"
+        return r ? r[1] : nil
+
+        # rubocop:disable Lint/UnreachableCode
+        # hardcoding lang codepage
+        struct_path = "\\StringFileInfo\\040904b0\\#{info_key}"
+
+        addr = [0].pack('L')
+        size = [0].pack('L')
+        query_ok = ver_query_value.call(version_info, "#{struct_path}\u0000", addr, size)
+        raise StandardError if query_ok.zero?
+
+        raddr = addr.unpack1('L')
+        rsize = size.unpack1('L')
+
+        # this is not working right now, getting seg faults and other low level issues
+        puts "Size: #{raddr} #{rsize}"
+        fixed_info = Array.new(rsize, 0).pack('L*')
+        query_ok = rtl_move_memory.call(fixed_info, raddr, fixed_info.length)
+        raise StandardError if query_ok.zero?
+
+        info = fixed_info.unpack('L*')
+        file_version = [info[4], info[3], info[6], info[5]]
+        product_version = [info[8], info[7], info[10], info[9]]
+        [file_version, product_version]
+        # rubocop:enable Lint/UnreachableCode
+      rescue StandardError => e
+        UI.error("Failure to find '#{info_key}' under '#{path}': #{e}")
+        UI.error(e.backtrace)
+        nil
+      end
+
       def pretty_filesize(filesize)
-        Filesize.from(filesize.round.to_s + ' B').pretty
+        Filesize.from("#{filesize.round} B").pretty
       end
 
       def windows_path(path)
@@ -249,14 +315,19 @@ module U3d
         end
       end
 
+      def file_exists_not_empty?(path)
+        File.file?(path) && File.size(path).positive?
+      end
+
       private
 
       def http_max_retries
-        ENV['U3D_HTTP_MAX_RETRIES'].to_i if ENV['U3D_HTTP_MAX_RETRIES']
+        ENV.fetch('U3D_HTTP_MAX_RETRIES', nil)&.to_i
       end
 
       def http_read_timeout
         return ENV['U3D_HTTP_READ_TIMEOUT'].to_i if ENV['U3D_HTTP_READ_TIMEOUT']
+
         300
       end
 
@@ -270,5 +341,5 @@ module U3d
       end
     end
   end
-  # rubocop:enable ModuleLength
+  # rubocop:enable Metrics/ModuleLength
 end

data/lib/u3d/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -21,11 +23,11 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.2.2'.freeze
-  DESCRIPTION = 'Provides numerous tools for installing, managing and running the Unity game engine from command line.'.freeze
+  VERSION = '1.3.1'
+  DESCRIPTION = 'Provides numerous tools for installing, managing and running the Unity game engine from command line.'
   UNITY_VERSIONS_NOTE = "Unity uses the following version formatting: 0.0.0x0. The \'x\' can takes different values:\n"\
-  "\t. 'f' are the main release candidates for Unity\n"\
-  "\t. 'p' are patches fixing those releases\n"\
-  "\t. 'b' are the beta releases\n"\
-  "\t. 'a' are the alpha releases (not currently discovered)\n".freeze
+                        "\t. 'f' are the main release candidates for Unity\n"\
+                        "\t. 'p' are patches fixing those releases\n"\
+                        "\t. 'b' are the beta releases\n"\
+                        "\t. 'a' are the alpha releases (not currently discovered)\n"
 end

data/lib/u3d.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #
@@ -48,4 +50,15 @@ require 'u3d/unity_versions'
 module U3d
   Helper = U3dCore::Helper
   UI = U3dCore::UI
+
+  def self.const_missing(const_name)
+    deprecated = {
+      PlaybackEngineUtils: IvyPlaybackEngineUtils,
+      INIParser: INIModulesParser
+    }
+    super unless deprecated.keys.include? const_name
+    replacement = deprecated[const_name]
+    UI.deprecated "DEPRECATION WARNING: the class U3d::#{const_name} is deprecated. Use #{replacement} instead."
+    replacement
+  end
 end

data/lib/u3d_core/admin_tools.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Original work Copyright (c) 2015-present the fastlane authors
 # Modified work Copyright 2016-present WeWantToKnow AS

data/lib/u3d_core/command_executor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Original work Copyright (c) 2015-present the fastlane authors
 # Modified work Copyright 2016-present WeWantToKnow AS
@@ -65,7 +67,7 @@ module U3dCore
           output_callback = proc do |line|
             # Prefix the current line with a string
             prefix.each do |element|
-              line = element[:prefix] + line if element[:block] && element[:block].call(line)
+              line = element[:prefix] + line if element[:block]&.call(line)
             end
             UI.command_output(line)
           end
@@ -97,27 +99,28 @@ module U3dCore
               line = l.strip # strip so that \n gets removed
               output << line
 
-              output_callback.call(l) if output_callback
+              output_callback&.call(l)
             end
           end
           raise "Exit status: #{status}".red if !status.nil? && status.nonzero?
-        rescue StandardError => ex
+        rescue StandardError => e
           # This could happen
           # * if the status is failed
           # * when the environment is wrong:
           # > invalid byte sequence in US-ASCII (ArgumentError)
-          output << ex.to_s
+          output << e.to_s
           o = output.join("\n")
           UI.verbose o
-          raise ex unless error_callback
+          raise e unless error_callback
+
           error_callback.call(o, nil)
         end
         return output.join("\n")
       end
 
-      # rubocop:disable PredicateName,PerceivedComplexity
+      # rubocop:disable Naming/PredicateName
       def has_admin_privileges?(retry_count: 2)
-        # rubocop:enable PredicateName,PerceivedComplexity
+        # rubocop:enable Naming/PredicateName
         if Helper.windows?
           begin
             result = system_no_output('reg query HKU\\S-1-5-19')
@@ -152,6 +155,7 @@ module U3dCore
           unless env_username == "root"
             cred = U3dCore::Credentials.new(user: env_username)
             raise CredentialsError, "The command \'#{command}\' must be run with admin privileges" unless has_admin_privileges?
+
             command = "sudo -k && echo #{cred.password.shellescape} | sudo -S bash -c \"#{command}\""
           end
         end

data/lib/u3d_core/command_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Original work Copyright (c) 2015-present the fastlane authors
 # Modified work Copyright 2016-present WeWantToKnow AS
@@ -36,6 +38,7 @@ module U3dCore
       def select_runner_impl
         # disable PTY by setting env variable
         return U3dCore::SafePopen.method(:spawn) unless ENV['U3D_NO_TTY'].nil?
+
         begin
           require 'pty'
           return U3dCore::SafePty.method(:spawn)
@@ -55,25 +58,20 @@ module U3dCore
     def self.spawn(command, &_block)
       require 'pty'
       PTY.spawn(command) do |r, w, p|
+        trap('INT') do
+          Process.kill("INT", p)
+        end
+        yield r, w, p
+      # if the process has closed, ruby might raise an exception if we try
+      # to do I/O on a closed stream. This behavior is platform specific
+      rescue Errno::EIO
+      ensure
         begin
-          trap('INT') do
-            Process.kill("INT", p)
-          end
-          yield r, w, p
-        # if the process has closed, ruby might raise an exception if we try
-        # to do I/O on a closed stream. This behavior is platform specific
-        # rubocop:disable HandleExceptions
-        rescue Errno::EIO
-        # rubocop:enable HandleExceptions
-        ensure
-          begin
-            Process.wait p
-          # The process might have exited.
-          # This behavior is also ruby version dependent.
-          # rubocop:disable HandleExceptions
-          rescue Errno::ECHILD, PTY::ChildExited
-          end
-          # rubocop:enable HandleExceptions
+          Process.wait p
+        # The process might have exited.
+        # This behavior is also ruby version dependent.
+        rescue Errno::ECHILD, PTY::ChildExited
+          # do nothing
         end
       end
       $CHILD_STATUS.exitstatus
@@ -88,7 +86,7 @@ module U3dCore
     def self.spawn(command, &_block)
       require 'open3'
       Open3.popen2e(command) do |r, w, p|
-        yield w, r, p.value.pid # note the inversion
+        yield w, r, p.value.pid # NOTE: the inversion
 
         r.close
         w.close

data/lib/u3d_core/core_ext/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2017-present WeWantToKnow AS
 #

data/lib/u3d_core/core_ext/operating_system_symbol.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2017-present WeWantToKnow AS
 #
@@ -26,6 +28,7 @@ module CoreExtensions
         return 'Windows' if self == :win
         return 'Mac OSX' if self == :mac
         return 'Linux' if self == :linux
+
         raise "Not a known operating system symbol #{self}"
       end
     end

data/lib/u3d_core/core_ext/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ## --- BEGIN LICENSE BLOCK ---
 # Copyright (c) 2016-present WeWantToKnow AS
 #