u3d 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b306e92ddd2d1534178423f1ee3bc5f2b9dfcfea
-  data.tar.gz: '082a3ba8cb66d0d150c368627664dee8e08867e7'
+  metadata.gz: d9c9db8b88f9c7f182b88f35bc6679cc6834ebbe
+  data.tar.gz: 7adc661141c3939a5ad6a336a67d6f485982350f
 SHA512:
-  metadata.gz: 345bbce18f4aa6f1c04ed2ead7d09b7a5e74e81235423aaf0edb99249e8dfffe7b1339ae2b21bf4344b052d6d3ce8071d1fca9e5b6d004a5c206d5b566a44253
-  data.tar.gz: 3bca903f54a03114c2172d2af8f9d33caf822f407aeb1e75d2f94637917849ef51167d84623cf8e20d776cea8f40be23565bdb9d5ecad364e0c4ae1e0808452e
+  metadata.gz: 817e030bd2287a8584006bfac86d9651f9b75d62fb3c98959cbd91a5bd6c5b606867111a41f84c4c4f4a395caaaa3cec07fbd8869a035b6e095b5bf74b8faea1
+  data.tar.gz: 7a95301d40fb53e6409c6aca3866a855c986bbdb7ed85cc972b6ff0e98254bcffa2d2bf47843598a61c19f5a7f122af1f7f98330c692a77e0e0a5022168329b3

data/.github_changelog_generator

@@ -1,4 +1,4 @@
-future-release=v1.0.1
+future-release=v1.0.2
 since-tag=v0.9
 exclude_tags_regex=v0\.[0-8]\..*
 exclude-labels=nochangelog

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Change Log
 
+## [v1.0.2](https://github.com/DragonBox/u3d/tree/v1.0.2) (2017-09-05)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.1...v1.0.2)
+
+**Implemented enhancements:**
+
+- u3d/prettify: catch missing dependencies errors on Linux [\#123](https://github.com/DragonBox/u3d/issues/123)
+- Prettifyer not plugged when using -logFile /dev/stdout [\#18](https://github.com/DragonBox/u3d/issues/18)
+- u3d/prettify: modify compiler rule parsing for 2017+ [\#121](https://github.com/DragonBox/u3d/pull/121) ([niezbop](https://github.com/niezbop))
+- ud3/prettify: improve exception logging rules [\#118](https://github.com/DragonBox/u3d/pull/118) ([niezbop](https://github.com/niezbop))
+- u3d/available: linux: do not try to fetch package size if already cached [\#116](https://github.com/DragonBox/u3d/pull/116) ([lacostej](https://github.com/lacostej))
+- u3d/dependencies: add command to install Linux dependencies [\#25](https://github.com/DragonBox/u3d/pull/25) ([niezbop](https://github.com/niezbop))
+
+**Fixed bugs:**
+
+- u3d install updating cache even with --no-download option [\#104](https://github.com/DragonBox/u3d/issues/104)
+
+**Merged pull requests:**
+
+- u3d/prettify: add rule to catch library loading errors [\#124](https://github.com/DragonBox/u3d/pull/124) ([niezbop](https://github.com/niezbop))
+- u3d/prettify: also plug log analyzer on stdout \(Fixes \#18 \#43\) [\#122](https://github.com/DragonBox/u3d/pull/122) ([lacostej](https://github.com/lacostej))
+- u3d/install: do not refresh cache when download disabled \(Fixes \#104\) [\#120](https://github.com/DragonBox/u3d/pull/120) ([lacostej](https://github.com/lacostej))
+
+## [v1.0.1](https://github.com/DragonBox/u3d/tree/v1.0.1) (2017-08-31)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.0...v1.0.1)
+
+**Merged pull requests:**
+
+- u3d/downloader: use\_ssl should be set dynamically to download from https [\#113](https://github.com/DragonBox/u3d/pull/113) ([lacostej](https://github.com/lacostej))
+
+## [v1.0.0](https://github.com/DragonBox/u3d/tree/v1.0.0) (2017-08-31)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.0.rc1...v1.0.0)
+
 ## [v1.0.0.rc1](https://github.com/DragonBox/u3d/tree/v1.0.0.rc1) (2017-08-30)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v0.9.4...v1.0.0.rc1)
 
@@ -20,6 +52,7 @@
 
 **Merged pull requests:**
 
+- u3d: prepare for 1.0.0.rc1 release [\#111](https://github.com/DragonBox/u3d/pull/111) ([lacostej](https://github.com/lacostej))
 - fastlane-plugin-u3d: allow to depend on coming 1.0.0 version [\#109](https://github.com/DragonBox/u3d/pull/109) ([lacostej](https://github.com/lacostej))
 - u3d/run allow to configure the rules.json location using U3D\_RULES\_PATH env variable [\#108](https://github.com/DragonBox/u3d/pull/108) ([lacostej](https://github.com/lacostej))
 - u3d/run: if thread exits abnormally, don't wait for it and return [\#107](https://github.com/DragonBox/u3d/pull/107) ([lacostej](https://github.com/lacostej))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.0.1)
+    u3d (1.0.2)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)

data/LOG_RULES.md

@@ -1,6 +1,11 @@
 # Log Analyzer rules
 
-The Log Prettifier processes both Unity output and existing log files thanks to a set of JSON rules. These rules are under ./config/log_rules.json. They are meant to be customizable to fit as best as possible your logging specifications.
+The Log Prettifier processes both Unity output and existing log files thanks to a set of JSON rules. They are meant to be customizable to fit as best as possible your logging specifications. The default rules config found under [config/log_rules.json](https://github.com/DragonBox/u3d/blob/master/config/log_rules.json) is packaged with u3d. To use a custom ruleset set the `U3D_RULES_PATH` environment variable to point to the path of the overriding config.
+```
+U3D_RULES_PATH=./my_custom_rules.json u3d prettify ...
+[...]
+Using ./my_custom_rules.json for prettify rules path
+```
 
 This document explains how to customize the ruleset.
 

data/README.md

@@ -43,6 +43,8 @@ The prettifyer is on by default but can be turned off to get Unity3d's raw outpu
 
   [Information on how `prettify` works](https://github.com/DragonBox/u3d/blob/master/LOG_RULES.md)
 
+* `u3d dependencies`: [Linux] Install dependencies that Unity don't install by default on Linux.
+
 ## Installation
 
 ```shell
@@ -89,7 +91,7 @@ When referencing to a version on the CLI, u3d sanitizes these weird versions. Fo
 
 When you install Unity with this tool, you will have to grant it higher privileges so it can perform the installation. It means that under MacOS and Linux, you will be asked for your `sudo` password.
 
-On Windows, you must launch a administrative command interface to be able to run `local_install` and `install` (only if you install for the latter).
+On Windows, you must launch an administrative command interface to be able to run `install` without the `--no-install` option. Same goes for any kind of sanitization where u3d would move files around.
 
 ## Examples
 
@@ -117,7 +119,7 @@ u3d install 5.6.0f3 -p Unity,Documentation,WebPlayer
 u3d install 5.6.0f3 --no-install
 ```
 
-* Install version 5.6.0f3 of Unity without downloading it:
+* Install previously downloaded version 5.6.0f3:
 
 ```shell
 u3d install 5.6.0f3 --no-download
@@ -141,9 +143,10 @@ You can get further information on how to use U3d by running `u3d --help` (or `u
 
 If you face an issue similar to this one
 
-    SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed
-
-your ruby setup to work with OpenSSL may want to be fixed.
+```shell
+SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed
+```
+your ruby setup to work with OpenSSL probably needs to be fixed.
 
  * __On MacOS:__
 

data/config/log_rules.json

@@ -24,10 +24,10 @@
       },
       "exception": {
         "active": true,
-        "start_pattern": "[eE]xception.*: (?<message>.*)\\n",
-        "end_pattern": "Filename: (?:[\\w/:]+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
+        "start_pattern": "[eE]xception\\w*: (?<message>.*)\\n",
+        "end_pattern": "(?:Filename: (?:[\\w/:]+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)|(?<fileunknown>filename unknown)>:(?<lineunknown>-?\\d+))",
         "start_message": false,
-        "end_message": "%{file}(line %{line}): %{message}",
+        "end_message": "%{file}%{fileunknown}(line %{line}%{lineunknown}): %{message}",
         "store_lines": false,
         "ignore_lines": [
           "UnityEditor",
@@ -45,6 +45,12 @@
         "store_lines": false,
         "type": "error"
       },
+      "error_shared_library": {
+        "active": true,
+        "start_pattern": "error while loading shared libraries: (?<message>.*)\\n",
+        "start_message": "Error while loading shared libraries: %{message}",
+        "type": "error"
+      },
       "log": {
         "active": true,
         "start_pattern": "UnityEngine\\.Debug:Log\\(Object\\)",
@@ -185,13 +191,13 @@
     "active": true,
     "silent": false,
     "comment": "Compiling phase",
-    "phase_start_pattern": "- starting compile",
+    "phase_start_pattern": "- [sS]tarting compile",
     "phase_end_pattern": "- Finished compile",
     "rules": {
       "target": {
         "active": true,
-        "start_pattern": "- starting compile (?<path>.+), for buildtarget (?<target>.+)",
-        "start_message": "Target: %{path} (buildtarget %{target})"
+        "start_pattern": "- [sS]tarting compile (?<path>.+)(?<target>, for buildtarget .+)?",
+        "start_message": "Starting compile: %{path} %{target}"
       },
       "finished": {
         "active": true,

data/examples/Example1/Gemfile.lock

@@ -7,7 +7,7 @@ PATH
 PATH
   remote: /Users/lacostej/Code/OSS/u3d
   specs:
-    u3d (1.0.0.rc1)
+    u3d (1.0.1)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)

data/lib/u3d/cache.rb

@@ -51,13 +51,18 @@ module U3d
       @cache[key]
     end
 
-    def initialize(path: nil, force_os: nil, force_refresh: false)
+    def initialize(path: nil, force_os: nil, force_refresh: false, offline: false)
+      raise "Cache: cannot specify both offline and force_refresh" if offline && force_refresh
       @path = path || default_path
       @cache = {}
       os = force_os || U3dCore::Helper.operating_system
       Utils.ensure_dir(@path)
       file_path = File.expand_path(DEFAULT_NAME, @path)
       need_update, data = check_for_update(file_path, os)
+      if offline
+        UI.verbose("Cache outdated but we are working offline, so no updating it.")
+        need_update = false
+      end
       @cache = data
       overwrite_cache(file_path, os) if need_update || force_refresh
     end
@@ -67,7 +72,7 @@ module U3d
     # Checks if the cache needs updating
     def check_for_update(file_path, os)
       need_update = false
-      data = nil
+      data = {}
       if !File.file?(file_path)
         need_update = true
       else

data/lib/u3d/commands.rb

@@ -98,6 +98,13 @@ module U3d
         end
       end
 
+      def cache_versions(os, offline: false)
+        cache = Cache.new(force_os: os, offline: offline)
+        cache_os = cache[os.id2name] || {}
+        cache_versions = cache_os['versions'] || {}
+        cache_versions
+      end
+
       def install(args: [], options: {})
         version = specified_or_current_project_version(args[0])
 
@@ -105,8 +112,7 @@ module U3d
 
         packages = packages_with_unity_first(os, options)
 
-        cache = Cache.new(force_os: os)
-        cache_versions = cache[os.id2name]['versions']
+        cache_versions = cache_versions(os, offline: !options[:download])
         version = interpret_latest(version, cache_versions)
         unless cache_versions[version]
           UI.error "No version '#{version}' was found in cache. Either it doesn't exist or u3d doesn't know about it yet. Try refreshing with 'u3d available -f'"
@@ -129,6 +135,15 @@ module U3d
         Installer.install_modules(files, definition.version, installation_path: options[:installation_path])
       end
 
+      def install_dependencies
+        unless Helper.linux?
+          UI.important 'u3d dependencies is Linux-only, and not needed on other OS'
+          return
+        end
+
+        LinuxDependencies.install
+      end
+
       def run(options: {}, run_args: [])
         version = options[:unity_version]
 

data/lib/u3d/commands_generator.rb

@@ -148,6 +148,22 @@ This command allows you to either:
         end
       end
 
+      command :dependencies do |c|
+        c.syntax = 'u3d dependencies'
+        c.summary = 'Installs Unity dependencies. [Linux only]'
+        c.description = %(
+#{c.summary}
+
+Regarding the package manager: if dpkg is installed, u3d uses apt-get else if rpm is installed yum is used. If none of them is insalled, fails.
+
+Regarding the dependencies themselves: only dependencies for the editor are installed. WebGL, Android and Tizen require others that you will have to install manually.
+More on that: https://forum.unity3d.com/threads/unity-on-linux-release-notes-and-known-issues.350256/
+                  )
+        c.action do |_args, _options|
+          Commands.install_dependencies
+        end
+      end
+
       command :credentials do |c|
         c.syntax = "u3d credentials <#{Commands.credentials_actions.join(' | ')}>"
         c.description = 'Manages keychain credentials so u3d remembers them. [OSX only]'
@@ -158,7 +174,17 @@ This command allows you to either:
 
       command :prettify do |c|
         c.syntax = 'u3d prettify <logfile>'
-        c.description = 'Prettify a saved logfile'
+        c.summary = 'Prettify a saved logfile'
+        c.description = %(
+          #{c.summary}
+
+          The default prettifier rules file is packaged with u3d (#{U3d::LogAnalyzer::RULES_PATH}).
+          You may which to pass your own using the environment variable U3D_RULES_PATH.
+
+          E.g. U3D_RULES_PATH=my_rules.json u3d prettify ...
+
+          Fore more information about how the rules work, see https://github.com/DragonBox/u3d/blob/master/LOG_RULES.md
+                  )
         c.action do |args, _options|
           Commands.local_analyze(args: args)
         end

data/lib/u3d/downloader.rb

@@ -20,13 +20,11 @@
 # SOFTWARE.
 ## --- END LICENSE BLOCK ---
 
-require 'net/http'
 require 'u3d/utils'
 require 'u3d/download_validator'
 
 module U3d
   # Take care of downloading files and packages
-  # rubocop:disable ModuleLength
   module Downloader
     # Name of the directory for the package downloading
     DOWNLOAD_DIRECTORY = 'Unity_Packages'.freeze
@@ -115,7 +113,7 @@ module U3d
 
         UI.header "Downloading #{package} version #{definition.version}"
         UI.message 'Downloading from ' + url.to_s.cyan.underline
-        download_package(path, url, size: definition.size_in_kb(package))
+        download_package(path, url, size: definition.size_in_bytes(package))
 
         if validator.validate(package, path, definition)
           UI.success "Successfully downloaded #{package}."
@@ -126,38 +124,7 @@ module U3d
       end
 
       def download_package(path, url, size: nil)
-        File.open(path, 'wb') do |f|
-          uri = URI(url)
-          current = 0
-          last_print_update = 0
-          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
-            request = Net::HTTP::Get.new uri
-            http.request request do |response|
-              begin
-                size ||= Integer(response['Content-Length'])
-              rescue ArgumentError
-                UI.verbose 'Unable to get length of file in download'
-              end
-              started_at = Time.now.to_i - 1
-              response.read_body do |segment|
-                f.write(segment)
-                current += segment.length
-                # wait for Net::HTTP buffer on slow networks
-                # FIXME revisits, this slows down download on fast network
-                # sleep 0.08 # adjust to reduce CPU
-                next unless UI.interactive?
-                next unless Time.now.to_f - last_print_update > 0.5
-                last_print_update = Time.now.to_f
-                if size
-                  Utils.print_progress(current, size, started_at)
-                else
-                  Utils.print_progress_nosize(current, started_at)
-                end
-              end
-            end
-          end
-          print "\n" if UI.interactive?
-        end
+        Utils.download_file(path, url, size: size)
       rescue Interrupt => e
         # Ensure that the file is deleted if download is aborted
         File.delete path
@@ -207,5 +174,4 @@ module U3d
       end
     end
   end
-  # rubocop:enable ModuleLength
 end

data/lib/u3d/iniparser.rb

@@ -47,7 +47,7 @@ module U3d
         ini_path = File.expand_path(ini_name, default_ini_path)
         unless File.file?(ini_path)
           if os == 'linux'
-            UI.error "No INI file for version #{version}. Try discovering the available versions with 'u3d available -f'"
+            UI.error "No INI file for version #{version}. Try discovering the available versions with 'u3d available -f'" unless offline
             return nil
           end
           raise "INI file does not exist at #{ini_path}" if offline

data/lib/u3d/installer.rb

@@ -279,4 +279,63 @@ module U3d
       end
     end
   end
+
+  class LinuxDependencies
+    # see https://forum.unity3d.com/threads/unity-on-linux-release-notes-and-known-issues.350256/
+    DEPENDENCIES = [
+      'gconf-service',
+      'lib32gcc1',
+      'lib32stdc++6',
+      'libasound2',
+      'libc6',
+      'libc6-i386',
+      'libcairo2',
+      'libcap2',
+      'libcups2',
+      'libdbus-1-3',
+      'libexpat1',
+      'libfontconfig1',
+      'libfreetype6',
+      'libgcc1',
+      'libgconf-2-4',
+      'libgdk-pixbuf2.0-0',
+      'libgl1-mesa-glx',
+      'libglib2.0-0',
+      'libglu1-mesa',
+      'libgtk2.0-0',
+      'libnspr4',
+      'libnss3',
+      'libpango1.0-0',
+      'libstdc++6',
+      'libx11-6',
+      'libxcomposite1',
+      'libxcursor1',
+      'libxdamage1',
+      'libxext6',
+      'libxfixes3',
+      'libxi6',
+      'libxrandr2',
+      'libxrender1',
+      'libxtst6',
+      'zlib1g',
+      'debconf',
+      'npm',
+      'libpq5' # missing from original list
+    ].freeze
+
+    def self.install
+      if `which dpkg` != ''
+        prefix = 'apt-get -y install'
+      elsif `which rpm` != ''
+        prefix = 'yum -y install'
+      else
+        raise 'Cannot install dependencies on your Linux distribution'
+      end
+
+      if UI.interactive?
+        return unless UI.confirm "Install dependencies? (#{DEPENDENCIES.length} dependency(ies) to install)"
+      end
+      U3dCore::CommandExecutor.execute(command: "#{prefix} #{DEPENDENCIES.join(' ')}", admin: true)
+    end
+  end
 end

data/lib/u3d/log_analyzer.rb

@@ -78,15 +78,8 @@ module U3d
       @phases.each do |name, phase|
         next if name == @active_phase
         next unless line =~ phase['phase_start_pattern']
-        if @active_rule
-          # Active rule should be finished
-          # If it is still active during phase change, it means that something went wrong
-          UI.error("[#{@active_phase}] Could not finish active rule '#{@active_rule}'. Aborting it.")
-          @active_rule = nil
-        end
+        finish_phase
         @active_phase = name
-        @context.clear
-        @rule_lines_buffer.clear
         UI.verbose("--- Beginning #{name} phase ---")
         break
       end
@@ -189,12 +182,30 @@ module U3d
         end
       end
 
-      apply_ruleset.call(@phases[@active_phase]['rules'], @active_phase) if @active_phase
+      if @active_phase
+        apply_ruleset.call(@phases[@active_phase]['rules'], @active_phase)
+        if @phases[@active_phase]['phase_end_pattern'] && @phases[@active_phase]['phase_end_pattern'] =~ line
+          finish_phase
+        end
+      end
       apply_ruleset.call(@generic_rules, 'GENERAL')
     end
 
     private
 
+    def finish_phase
+      if @active_rule
+        # Active rule should be finished
+        # If it is still active during phase change, it means that something went wrong
+        UI.error("[#{@active_phase}] Could not finish active rule '#{@active_rule}'. Aborting it.")
+        @active_rule = nil
+      end
+      UI.verbose("--- Ending #{@active_phase} phase ---")
+      @active_phase = nil
+      @context.clear
+      @rule_lines_buffer.clear
+    end
+
     def rules_path
       path = ENV["U3D_RULES_PATH"]
       unless path.nil?

data/lib/u3d/unity_runner.rb

@@ -30,24 +30,22 @@ module U3d
     def run(installation, args, raw_logs: false)
       log_file = find_and_prepare_logfile(installation, args)
 
-      tail_thread = Thread.new do
-        begin
-          if raw_logs
-            pipe(log_file) { |l| UI.message l.rstrip }
-          else
-            analyzer = LogAnalyzer.new
-            pipe(log_file) { |l| analyzer.parse_line l }
-          end
-        rescue => e
-          UI.error "Failure while trying to pipe #{log_file}: #{e.message}"
-          e.backtrace.each { |l| UI.error "  #{l}" }
+      if raw_logs
+        output_callback = proc do |line|
+          UI.command_output(line.rstrip)
+        end
+      else
+        analyzer = LogAnalyzer.new
+        output_callback = proc do |line|
+          analyzer.parse_line(line)
         end
       end
 
-      # Wait for tail_thread setup to be complete
-      sleep 0.5 while tail_thread.status == 'run'
-      return unless tail_thread.status
-      tail_thread.run
+      if log_file
+        tail_thread = start_tail_thread(log_file, output_callback)
+        return unless tail_thread.status
+        tail_thread.run
+      end
 
       begin
         args.unshift(installation.exe_path)
@@ -57,16 +55,20 @@ module U3d
           args.map!(&:shellescape)
         end
 
-        U3dCore::CommandExecutor.execute(command: args, print_all: true)
+        U3dCore::CommandExecutor.execute_command(command: args, output_callback: output_callback)
       ensure
-        sleep 1
-        Thread.kill(tail_thread)
+        if tail_thread
+          sleep 1
+          Thread.kill(tail_thread)
+        end
       end
     end
 
     def find_and_prepare_logfile(installation, args)
       log_file = Runner.find_logFile_in_args(args)
 
+      return nil if log_file == '/dev/stdout'
+
       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
@@ -100,6 +102,21 @@ module U3d
 
     private
 
+    def start_tail_thread(log_file, output_callback)
+      tail_thread = Thread.new do
+        begin
+          pipe(log_file) { |line| output_callback.call(line) }
+        rescue => e
+          UI.error "Failure while trying to pipe #{log_file}: #{e.message}"
+          e.backtrace.each { |l| UI.error "  #{l}" }
+        end
+      end
+
+      # Wait for tail_thread setup to be complete
+      sleep 0.5 while tail_thread.status == 'run'
+      tail_thread
+    end
+
     def pipe(file)
       File.open(file, 'r') do |f|
         f.extend File::Tail

data/lib/u3d/unity_version_definition.rb

@@ -26,14 +26,15 @@ module U3d
   class UnityVersionDefinition
     attr_accessor :version, :os, :url, :ini
 
-    def initialize(version, os, cached_versions)
+    def initialize(version, os, cached_versions, offline: false)
       @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)
+        @ini = INIparser.load_ini(version, cached_versions, os: os, offline: offline)
       rescue => e
+        # FIXME: weird that we catch this here
         UI.error "Could not load INI file for version #{@version} on #{@os}: #{e}"
         @ini = nil
       end
@@ -48,7 +49,8 @@ module U3d
       @ini[key]
     end
 
-    def size_in_kb(package)
+    def size_in_bytes(package)
+      return nil unless @ini
       return -1 unless @ini[package] && @ini[package]['size']
       @os == :win ? @ini[package]['size'] * 1024 : @ini[package]['size']
     end

data/lib/u3d/unity_versions.rb

@@ -128,6 +128,12 @@ module U3d
         end
 
         def save_package_size(version, url)
+          uvd = UnityVersionDefinition.new(version, :linux, nil, offline: true)
+          if (size = uvd.size_in_bytes('Unity'))
+            UI.verbose "Package size for version #{version} already cached: #{size}"
+            return
+          end
+          UI.verbose "Finding out package size for version #{version}"
           size = Utils.get_url_content_length(url)
           if size
             UnityVersionDefinition.create_fake(version, size, url)

data/lib/u3d/utils.rb

@@ -27,6 +27,7 @@ require 'u3d_core/helper'
 
 module U3d
   # Several different utility methods
+  # rubocop:disable ModuleLength
   module Utils
     # Regex to capture each part of a version string (0.0.0x0)
     CSIDL_LOCAL_APPDATA = 0x001c
@@ -58,13 +59,50 @@ module U3d
         end
       end
 
+      def download_file(path, url, size: nil)
+        File.open(path, 'wb') do |f|
+          uri = URI(url)
+          current = 0
+          last_print_update = 0
+          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+            request = Net::HTTP::Get.new uri
+            http.request request do |response|
+              begin
+                size ||= Integer(response['Content-Length'])
+              rescue ArgumentError
+                UI.verbose 'Unable to get length of file in download'
+              end
+              started_at = Time.now.to_i - 1
+              response.read_body do |segment|
+                f.write(segment)
+                current += segment.length
+                # wait for Net::HTTP buffer on slow networks
+                # FIXME revisits, this slows down download on fast network
+                # sleep 0.08 # adjust to reduce CPU
+                next unless UI.interactive?
+                next unless Time.now.to_f - last_print_update > 0.5
+                last_print_update = Time.now.to_f
+                if size
+                  Utils.print_progress(current, size, started_at)
+                else
+                  Utils.print_progress_nosize(current, started_at)
+                end
+              end
+            end
+          end
+          print "\n" if UI.interactive?
+        end
+      end
+
       def get_url_content_length(url)
+        UI.verbose "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
+        UI.verbose "get_url_content_length #{url}: #{size}"
         size
       end
 
@@ -128,4 +166,5 @@ module U3d
       end
     end
   end
+  # rubocop:enable ModuleLength
 end

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.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

@@ -53,26 +53,43 @@ module U3dCore
       # @param print_command [Boolean] Should we print the command that's being executed
       # @param error [Block] A block that's called if an error occurs
       # @param prefix [Array] An array containg a prefix + block which might get applied to the output
-      # @param loading [String] A loading string that is shown before the first output
       # @param admin [Boolean] Do we need admin privilege for this command?
-      # @param keychain [Boolean] Should we fetch admin rights from the keychain on OSX
       # @return [String] All the output as string
-      def execute(command: nil, print_all: false, print_command: true, error: nil, prefix: nil, loading: nil, admin: false)
+      # @deprecated
+      def execute(command: nil, print_all: false, print_command: true, error: nil, prefix: nil, admin: false)
         print_all = true if U3dCore::Globals.verbose?
         prefix ||= {}
 
+        output_callback = nil
+        if print_all
+          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)
+            end
+            UI.command_output(line)
+          end
+        end
+
+        execute_command(command: command, output_callback: output_callback, print_command: print_command, error_callback: error, admin: admin)
+      end
+
+      # @param command [String] The command to be executed
+      # @param output_callback [Block] the command to pass to print output
+      # @param print_command [Boolean] Should we print the command that's being executed
+      # @param error_callback [Block] A block that's called if an error occurs
+      # @param admin [Boolean] Do we need admin privilege for this command?
+      # @return [String] All the output as string
+      def execute_command(command: nil, output_callback: nil, print_command: true, error_callback: nil, admin: false)
         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
-
         command = grant_admin_privileges(command) if admin
 
-        execute_command(command: command, print_all: print_all, error: error, prefix: prefix)
+        execute_command_low(command: command, output_callback: output_callback, error_callback: error_callback)
       end
 
-      def execute_command(command: nil, print_all: nil, error: nil, prefix: nil)
+      def execute_command_low(command: nil, output_callback: nil, error_callback: nil)
         output = []
         begin
           status = U3dCore::Runner.run(command) do |stdin, _stdout, _pid|
@@ -80,14 +97,7 @@ module U3dCore
               line = l.strip # strip so that \n gets removed
               output << line
 
-              next unless print_all
-
-              # Prefix the current line with a string
-              prefix.each do |element|
-                line = element[:prefix] + line if element[:block] && element[:block].call(line)
-              end
-
-              UI.command_output(line)
+              output_callback.call(l) if output_callback
             end
           end
           raise "Exit status: #{status}".red if !status.nil? && status.nonzero?
@@ -99,8 +109,8 @@ module U3dCore
           output << ex.to_s
           o = output.join("\n")
           UI.verbose o
-          raise ex unless error
-          error.call(o, nil)
+          raise ex unless error_callback
+          error_callback.call(o, nil)
         end
         return output.join("\n")
       end
@@ -141,6 +151,6 @@ module U3dCore
       end
     end
 
-    private_class_method :execute_command
+    private_class_method :execute_command_low
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander