u3d 0.9.3 → 0.9.4

data/lib/u3d/log_analyzer.rb

@@ -24,6 +24,7 @@ require 'json'
 
 module U3d
   # Analyzes log by filtering output along a set of rules
+  # rubocop:disable ClassLength, PerceivedComplexity, BlockNesting
   class LogAnalyzer
     RULES_PATH = File.expand_path('../../../config/log_rules.json', __FILE__)
     MEMORY_SIZE = 10
@@ -227,4 +228,5 @@ module U3d
       true
     end
   end
+  # rubocop:enable ClassLength, PerceivedComplexity, BlockNesting
 end

data/lib/u3d/unity_project.rb

@@ -0,0 +1,45 @@
+## --- BEGIN LICENSE BLOCK ---
+# Copyright (c) 2016-present WeWantToKnow AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+## --- END LICENSE BLOCK ---
+
+require 'u3d_core/helper'
+
+module U3d
+  class UnityProject
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def exist?
+      Dir.exist?("#{@path}/Assets") && Dir.exist?("#{@path}/ProjectSettings")
+    end
+
+    def editor_version
+      require 'yaml'
+      yaml = YAML.safe_load(File.read("#{@path}/ProjectSettings/ProjectVersion.txt"))
+      version = yaml['m_EditorVersion']
+      version.gsub!(/(\d+\.\d+\.\d+)(?:x)?(\w\d+)(?:Linux)?/, '\1\2') if Helper.linux?
+      version
+    end
+  end
+end

data/lib/u3d/unity_runner.rb

@@ -28,16 +28,7 @@ module U3d
   # Launches Unity with given arguments
   class Runner
     def run(installation, args, raw_logs: false)
-      log_file = find_logFile_in_args(args)
-
-      if log_file # we wouldn't want to do that for the default log file.
-        File.delete(log_file) if File.file?(log_file) # We only delete real files
-      else
-        log_file = installation.default_log_file
-      end
-
-      Utils.ensure_dir File.dirname(log_file)
-      FileUtils.touch(log_file) unless File.exist? log_file
+      log_file = find_and_prepare_logfile(installation, args)
 
       tail_thread = Thread.new do
         begin
@@ -64,7 +55,7 @@ module U3d
         else
           args.map!(&:shellescape)
         end
-        
+
         U3dCore::CommandExecutor.execute(command: args, print_all: true)
       ensure
         sleep 1
@@ -72,20 +63,38 @@ module U3d
       end
     end
 
-    def find_logFile_in_args(args)
-      find_arg_in_args('-logFile', args)
-    end
+    def find_and_prepare_logfile(installation, args)
+      log_file = Runner.find_logFile_in_args(args)
+
+      if log_file # we wouldn't want to do that for the default log file.
+        File.delete(log_file) if File.file?(log_file) # We only delete real files
+      else
+        log_file = installation.default_log_file
+      end
 
-    def find_projectpath_in_args(args)
-      find_arg_in_args('-projectpath', args)
+      Utils.ensure_dir File.dirname(log_file)
+      FileUtils.touch(log_file) unless File.exist? log_file
+      log_file
     end
 
-    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
+    class << self
+      # rubocop:disable MethodName
+      def find_logFile_in_args(args)
+        # rubocop:enable MethodName
+        find_arg_in_args('-logFile', args)
+      end
+
+      def find_projectpath_in_args(args)
+        find_arg_in_args('-projectpath', args)
+      end
+
+      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
+        nil
       end
-      nil
     end
 
     private

data/lib/u3d/unity_version_definition.rb

@@ -0,0 +1,60 @@
+## --- BEGIN LICENSE BLOCK ---
+# Copyright (c) 2016-present WeWantToKnow AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+## --- END LICENSE BLOCK ---
+
+require 'u3d/iniparser'
+
+module U3d
+  class UnityVersionDefinition
+    attr_accessor :version, :os, :url, :ini
+
+    def initialize(version, os, cached_versions)
+      @version = version
+      @os = os
+      # Cache is assumed to be correct
+      @url = cached_versions ? cached_versions[version] : nil
+      begin
+        @ini = INIparser.load_ini(version, cached_versions, os: os)
+      rescue => e
+        UI.error "Could not load INI file for version #{@version} on #{@os}: #{e}"
+        @ini = nil
+      end
+    end
+
+    def available_packages
+      @ini.keys
+    end
+
+    def [](key)
+      return nil unless @ini
+      @ini[key]
+    end
+
+    def size_in_kb(package)
+      return -1 unless @ini[package] && @ini[package]['size']
+      @os == :win ? @ini[package]['size'] * 1024 : @ini[package]['size']
+    end
+
+    def self.create_fake(version, size, url)
+      INIparser.create_linux_ini(version, size, url)
+    end
+  end
+end

data/lib/u3d/unity_versions.rb

@@ -20,7 +20,7 @@
 # SOFTWARE.
 ## --- END LICENSE BLOCK ---
 
-require 'u3d/iniparser'
+require 'u3d/unity_version_definition'
 require 'u3d_core/helper'
 require 'net/http'
 
@@ -91,7 +91,52 @@ module U3d
       class << self
         def list_available
           UI.message 'Loading Unity releases'
-          request = nil
+
+          data = linux_forum_page_content
+
+          versions = {}
+          results = data.scan(LINUX_DOWNLOAD_DATED)
+          results.each do |capt|
+            save_package_size(capt[1], capt[0])
+            versions[capt[1]] = capt[0]
+          end
+
+          response = nil
+          results = data.scan(LINUX_DOWNLOAD_RECENT_PAGE)
+          results.each do |page|
+            response = linux_forum_version_page_content(page[0])
+            if response.is_a? Net::HTTPSuccess
+              capt = response.body.match(LINUX_DOWNLOAD_RECENT_FILE)
+              if capt && capt[1] && capt[2]
+                ver = capt[2].delete('x')
+                UI.important "Version #{ver} does not match standard Unity versions" unless ver =~ Utils::UNITY_VERSION_REGEX
+                save_package_size(ver, capt[1])
+                versions[ver] = capt[1]
+              else
+                UI.error("Could not retrieve a fitting file from #{url}")
+              end
+            else
+              UI.error("Could not access #{url}")
+            end
+          end
+          if versions.count.zero?
+            UI.important 'Found no releases'
+          else
+            UI.success "Found #{versions.count} releases."
+          end
+          versions
+        end
+
+        def save_package_size(version, url)
+          size = Utils.get_url_content_length(url)
+          if size
+            UnityVersionDefinition.create_fake(version, size, url)
+          else
+            UI.important "u3d tried to get the size of the installer for version #{version}, but wasn't able to"
+          end
+        end
+
+        def linux_forum_page_content
           response = nil
           data = ''
           uri = URI(UNITY_LINUX_DOWNLOADS)
@@ -148,38 +193,15 @@ module U3d
             else raise "Request failed with status #{response.code}"
             end
           end
-          data.gsub(/[ \t]+/, '').each_line { |l| puts l if /<a href=/ =~ l }
-          versions = {}
-          results = data.scan(LINUX_DOWNLOAD_DATED)
-          results.each do |capt|
-            versions[capt[1]] = capt[0]
-          end
+          data
+        end
 
-          results = data.scan(LINUX_DOWNLOAD_RECENT_PAGE)
-          results.each do |page|
-            url = page[0]
-            uri = URI(url)
-            Net::HTTP.start(uri.host, uri.port) do |http|
-              request = Net::HTTP::Get.new uri
-              response = http.request request
-            end
-            if response.kind_of? Net::HTTPSuccess
-              capt = response.body.match(LINUX_DOWNLOAD_RECENT_FILE)
-              if capt && capt[1] && capt[2]
-                versions[capt[2].delete('x')] = capt[1]
-              else
-                UI.error("Could not retrieve a fitting file from #{url}")
-              end
-            else
-              UI.error("Could not access #{url}")
-            end
-          end
-          if versions.count.zero?
-            UI.important 'Found no releases'
-          else
-            UI.success "Found #{versions.count} releases."
+        def linux_forum_version_page_content(url)
+          uri = URI(url)
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            request = Net::HTTP::Get.new uri
+            return http.request request
           end
-          versions
         end
       end
     end

data/lib/u3d/utils.rb

@@ -58,6 +58,16 @@ module U3d
         end
       end
 
+      def get_url_content_length(url)
+        uri = URI(url)
+        size = nil
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          response = http.request_head url
+          size = Integer(response['Content-Length'])
+        end
+        size
+      end
+
       def hashfile(file_path, blocksize: 65_536)
         require 'digest'
         raise ArgumentError, 'Not a file' unless File.file?(file_path)

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '0.9.3'.freeze
+  VERSION = '0.9.4'.freeze
   DESCRIPTION = 'Provides numerous tools for installing, managing and running the Unity3D game engine from command line.'.freeze
   UNITY_VERSIONS_NOTE = "Unity3d uses the following version formatting: 0.0.0x0. The \'x\' can takes different values:\n"\
   "\t. 'f' are the main release candidates for Unity3d\n"\

data/lib/u3d_core/command_executor.rb

@@ -61,23 +61,19 @@ module U3dCore
         print_all = true if U3dCore::Globals.verbose?
         prefix ||= {}
 
-        output = []
         command = command.join(' ') if command.is_a?(Array)
         UI.command(command) if print_command
 
         # this is only used to show the "Loading text"...
         UI.command_output(loading) if print_all && loading
 
-        if admin
-          cred = U3dCore::Credentials.new(user: ENV['USER'])
-          if Helper.windows?
-            raise CredentialsError, "The command \'#{command}\' must be run in administrative shell" unless has_admin_privileges?
-          else
-            command = "sudo -k && echo #{cred.password.shellescape} | sudo -S bash -c \"#{command}\""
-          end
-          UI.verbose 'Admin privileges granted for command execution'
-        end
+        command = grant_admin_privileges(command) if admin
 
+        execute_command(command: command, print_all: print_all, error: error, prefix: prefix)
+      end
+
+      def execute_command(command: nil, print_all: nil, error: nil, prefix: nil)
+        output = []
         begin
           status = U3dCore::Runner.run(command) do |stdin, _stdout, _pid|
             stdin.each do |l|
@@ -109,7 +105,9 @@ module U3dCore
         return output.join("\n")
       end
 
+      # rubocop:disable PredicateName
       def has_admin_privileges?
+        # rubocop:enable PredicateName
         if Helper.windows?
           begin
             result = system('reg query HKU\\S-1-5-19', out: File::NULL, err: File::NULL)
@@ -120,8 +118,8 @@ module U3dCore
           credentials = U3dCore::Credentials.new(user: ENV['USER'])
           begin
             result = system("sudo -k && echo #{credentials.password.shellescape} | sudo -S /usr/bin/whoami",
-              out: File::NULL,
-              err: File::NULL)
+                            out: File::NULL,
+                            err: File::NULL)
           rescue
             result = false
           end
@@ -130,6 +128,19 @@ module U3dCore
         # returns false if result is nil (command execution fail)
         return (result ? true : false)
       end
+
+      def grant_admin_privileges(command)
+        cred = U3dCore::Credentials.new(user: ENV['USER'])
+        if Helper.windows?
+          raise CredentialsError, "The command \'#{command}\' must be run in administrative shell" unless has_admin_privileges?
+        else
+          command = "sudo -k && echo #{cred.password.shellescape} | sudo -S bash -c \"#{command}\""
+        end
+        UI.verbose 'Admin privileges granted for command execution'
+        command
+      end
     end
+
+    private_class_method :execute_command
   end
 end

data/lib/u3d_core/command_runner.rb

@@ -21,6 +21,8 @@
 # SOFTWARE.
 ## --- END LICENSE BLOCK ---
 
+require 'English'
+
 module U3dCore
   # this module is meant to be private to this lib
   module Runner
@@ -60,17 +62,21 @@ module U3dCore
           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
         end
       end
-      $?.exitstatus
+      $CHILD_STATUS.exitstatus
     end
   end
 

data/lib/u3d_core/credentials.rb

@@ -105,8 +105,8 @@ module U3dCore
           UI.message 'Deleting credentials from the keychain'
           Security::InternetPassword.delete(server: MAC_U3D_SERVER)
         end
-      else
-        UI.verbose 'Keychain may store invalid credentials for u3d' if Helper.mac?
+      elsif Helper.mac?
+        UI.verbose 'Keychain may store invalid credentials for u3d'
       end
     end
   end

data/lib/u3d_core/globals.rb

@@ -33,7 +33,7 @@ module U3dCore
       attr_writer :verbose, :log_timestamps, :use_keychain, :do_not_login
 
       def attributes
-        @attributes ||= ((methods - public_instance_methods).grep(/=$/) - [:<=, :>=]).map do |s|
+        @attributes ||= ((methods - public_instance_methods).grep(/=$/) - %i[<= >=]).map do |s|
           a = s.to_s
           a[0..(a.length - 2)] # remove the '='
         end
@@ -69,7 +69,8 @@ module U3dCore
         end
       end
 
-      def respond_to?(method_sym, include_private = false)
+      def respond_to_missing?(method_sym, include_private = false)
+        # rubocop:disable GuardClause
         if method_sym.to_s =~ /^with_(.*)$/
           return attributes.include? Regexp.last_match(1)
         elsif method_sym.to_s =~ /^(.*)\?$/
@@ -77,6 +78,7 @@ module U3dCore
         else
           super
         end
+        # rubocop:enable GuardClause
       end
     end
     private_class_method :is?, :with, :attributes