u3d 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef51a1704cb01f95cc2ff2f66f90eb851c0010d
-  data.tar.gz: 26d03be1911d01506a9aa0bab60caf1abd8cf07d
+  metadata.gz: 199952a8dafdb71e6f683bee1f99524fdf9fb4b1
+  data.tar.gz: fec612515c47bff5cac69eaeb6b02690f15d91ec
 SHA512:
-  metadata.gz: 18d24c1137ce676f44354019fe449180038fde137cfdb6b7c8a94a4ce3639cf93ae2fda3d114c06ac97ef2d4579e26cf619f2658cf679d3ff9b3464faae72bff
-  data.tar.gz: 8f2c047324246b81c7ac78325045d49bbb90d867c4c345b90687b36aa2e62c1a1f7c41ac16c18476806943ecc1c95ec9d2f36909ebb916771119a581e2c01d31
+  metadata.gz: 659ef44c9f876b8f20f7b7cf9deeb53fbde68b404e150483b547ecbeb0ecfc9783405e249531f123a4f4b1a02cee4a272b92b644e358dae7bfe6217ed57878c9
+  data.tar.gz: 4c3e390741a69b465b0d2298e158485203c319539989687989de6fba9e03039eb53ad5715949e76398d43514507d1d57c2159968a839ebea2b1e30a1a8393368

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## [v1.0.10](https://github.com/DragonBox/u3d/tree/v1.0.10) (2017-11-03)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.9...v1.0.10)
+
+**Fixed bugs:**
+
+- u3d/download progress bar on Windows not going to 100% [\#164](https://github.com/DragonBox/u3d/issues/164)
+
+**Closed issues:**
+
+- u3d/install: confusing "-p not available on linux" message [\#181](https://github.com/DragonBox/u3d/issues/181)
+- Linux CLI Activation in Unity \>= 5.4 [\#176](https://github.com/DragonBox/u3d/issues/176)
+- u3d/install: already installed packages are reinstalled [\#161](https://github.com/DragonBox/u3d/issues/161)
+
+**Merged pull requests:**
+
+- u3d/download/install: --all option was broken. Added tests [\#184](https://github.com/DragonBox/u3d/pull/184) ([lacostej](https://github.com/lacostej))
+- u3d install: Improve Linux warnings for package options \(fixes \#181\) [\#183](https://github.com/DragonBox/u3d/pull/183) ([lacostej](https://github.com/lacostej))
+- Fix log termination [\#180](https://github.com/DragonBox/u3d/pull/180) ([niezbop](https://github.com/niezbop))
+- u3d/list find package names under PlaybackEngines ivy.xml [\#178](https://github.com/DragonBox/u3d/pull/178) ([lacostej](https://github.com/lacostej))
+- u3d/downloader: print progress improvements \(fix \#164\) [\#177](https://github.com/DragonBox/u3d/pull/177) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.9](https://github.com/DragonBox/u3d/tree/v1.0.9) (2017-10-31)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.8...v1.0.9)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.0.9)
+    u3d (1.0.10)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
@@ -118,6 +118,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
   x86-mingw32
 
 DEPENDENCIES

data/config/log_rules.json

@@ -61,7 +61,7 @@
         "fetched_line_pattern": "(?<message>.*)\\n",
         "fetched_line_message": false,
         "start_message": false,
-        "end_pattern": "Filename: (?:[\\w/:]+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
+        "end_pattern": "Filename: (?:.+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
         "end_message": "[LOG] %{file}(line %{line}): %{message}"
       },
       "log_assertion": {

data/lib/u3d/commands.rb

@@ -290,8 +290,8 @@ module U3d
 
       def packages_with_unity_first(os, options)
         if os == :linux
-          UI.important 'Option -a | --all not available for Linux' if options[:all]
-          UI.important 'Option -p | --packages not available for Linux' if options[:packages]
+          UI.important 'Option -a | --all currently meaningless for Linux (only one package available)' if options[:all]
+          UI.important 'Option -p | --packages currently meaningless for Linux (only one package available)' if options[:packages]
         end
         temp = options[:packages] || ['Unity']
         temp.insert(0, 'Unity') if temp.delete('Unity')
@@ -312,7 +312,10 @@ module U3d
       end
 
       def enforce_setup_coherence(packages, options, unity, definition)
-        packages = definition.available_packages if options[:all]
+        if options[:all]
+          packages.clear
+          packages.concat(definition.available_packages)
+        end
         if unity
           UI.important "Unity #{unity.version} is already installed"
           # Not needed since Linux custom u3d files contain only one entry wich is Unity

data/lib/u3d/installation.rb

@@ -46,6 +46,28 @@ module U3d
     end
   end
 
+  class PlaybackEngineUtils
+    def self.list_module_configs(playbackengine_parent_path)
+      Dir.glob("#{playbackengine_parent_path}/PlaybackEngines/*/ivy.xml")
+    end
+
+    def self.node_value(config_path, node_name)
+      require 'rexml/document'
+      UI.verbose("reading #{config_path}")
+      raise "File not found at #{config_path}" unless File.exist? config_path
+      doc = REXML::Document.new(File.read(config_path))
+      REXML::XPath.first(doc, node_name).value
+    end
+
+    def self.module_name(config_path)
+      node_value(config_path, 'ivy-module/info/@module')
+    end
+
+    def self.unity_version(config_path)
+      node_value(config_path, 'ivy-module/info/@e:unityVersion')
+    end
+  end
+
   class MacInstallation < Installation
     require 'plist'
 
@@ -68,13 +90,9 @@ module U3d
     end
 
     def packages
-      if Utils.parse_unity_version(version)[0].to_i <= 4
-        # Unity < 5 doesn't have packages
-        return []
+      PlaybackEngineUtils.list_module_configs(root_path).map do |mpath|
+        PlaybackEngineUtils.module_name(mpath)
       end
-      fpath = File.expand_path('PlaybackEngines', root_path)
-      return [] unless Dir.exist? fpath # install without package
-      Dir.entries(fpath).select { |e| File.directory?(File.join(fpath, e)) && !(e == '.' || e == '..') }
     end
 
     def clean_install?
@@ -96,11 +114,10 @@ module U3d
   class LinuxInstallation < Installation
     def version
       # I don't find an easy way to extract the version on Linux
-      require 'rexml/document'
-      fpath = "#{root_path}/Editor/Data/PlaybackEngines/LinuxStandaloneSupport/ivy.xml"
-      raise "Couldn't find file #{fpath}" unless File.exist? fpath
-      doc = REXML::Document.new(File.read(fpath))
-      version = REXML::XPath.first(doc, 'ivy-module/info/@e:unityVersion').value
+      path = "#{root_path}/Editor/Data/"
+      package = PlaybackEngineUtils.list_module_configs(path).first
+      raise "Couldn't find a module under #{path}" unless package
+      version = PlaybackEngineUtils.unity_version(package)
       if (m = version.match(/^(.*)x(.*)Linux$/))
         version = "#{m[1]}#{m[2]}"
       end
@@ -131,16 +148,10 @@ module U3d
 
   class WindowsInstallation < Installation
     def version
-      require 'rexml/document'
-      # For versions >= 5
-      fpath = "#{root_path}/Editor/Data/PlaybackEngines/windowsstandalonesupport/ivy.xml"
-      # For versions < 5
-      fpath = "#{root_path}/Editor/Data/PlaybackEngines/wp8support/ivy.xml" unless File.exist? fpath
-      raise "Couldn't find file #{fpath}" unless File.exist? fpath
-      doc = REXML::Document.new(File.read(fpath))
-      version = REXML::XPath.first(doc, 'ivy-module/info/@e:unityVersion').value
-
-      version
+      path = "#{root_path}/Editor/Data/"
+      package = PlaybackEngineUtils.list_module_configs(path).first
+      raise "Couldn't find a module under #{path}" unless package
+      PlaybackEngineUtils.unity_version(package)
     end
 
     def default_log_file
@@ -167,11 +178,10 @@ module U3d
     end
 
     def packages
-      # Unity prior to Unity5 did not have package
-      return [] if Utils.parse_unity_version(version)[0].to_i <= 4
-      fpath = "#{root_path}/Editor/Data/PlaybackEngines/"
-      return [] unless Dir.exist? fpath # install without package
-      Dir.entries(fpath).select { |e| File.directory?(File.join(fpath, e)) && !(e == '.' || e == '..') }
+      path = "#{root_path}/Editor/Data/"
+      PlaybackEngineUtils.list_module_configs(path).map do |mpath|
+        PlaybackEngineUtils.module_name(mpath)
+      end
     end
 
     def clean_install?

data/lib/u3d/log_analyzer.rb

@@ -78,7 +78,7 @@ module U3d
       @phases.each do |name, phase|
         next if name == @active_phase
         next unless line =~ phase['phase_start_pattern']
-        finish_phase
+        finish_phase if @active_phase
         @active_phase = name
         UI.verbose("--- Beginning #{name} phase ---")
         break

data/lib/u3d/utils.rb

@@ -59,6 +59,7 @@ module U3d
         end
       end
 
+      # size a hint of the expected size
       def download_file(path, url, size: nil)
         File.open(path, 'wb') do |f|
           uri = URI(url)
@@ -69,7 +70,9 @@ module U3d
             request = Net::HTTP::Get.new uri
             http.request request do |response|
               begin
-                size ||= Integer(response['Content-Length'])
+                # override with actual results, this should help with
+                # innacurrate declared sizes, especially on Windows platform
+                size = Integer(response['Content-Length'])
               rescue ArgumentError
                 UI.verbose 'Unable to get length of file in download'
               end
@@ -81,13 +84,12 @@ module U3d
                 # FIXME revisits, this slows down download on fast network
                 # sleep 0.08 # adjust to reduce CPU
                 next unless print_progress
-                next unless Time.now.to_f - last_print_update > 0.5
+                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
-                if size
-                  Utils.print_progress(current, size, started_at)
-                else
-                  Utils.print_progress_nosize(current, started_at)
-                end
+                Utils.print_progress(current, size, started_at)
                 print "\n" unless UI.interactive?
               end
             end
@@ -122,7 +124,12 @@ module U3d
         FileUtils.mkpath(dir) unless File.directory?(dir)
       end
 
+      # if total is nil (unknown, falls back to print_progress_nosize)
       def print_progress(current, total, started_at)
+        if total.nil?
+          print_progress_nosize(current, started_at)
+          return
+        end
         ratio = [current.to_f / total, 1.0].min
         percent = (ratio * 100.0).round(1)
         arrow = (ratio * 20.0).floor

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.9'.freeze
+  VERSION = '1.0.10'.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"\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander