u3d 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 80cbd75cc31f765c99ad5045c7bc4a4aedef530decb41e694554b8d85ad2ce36
-  data.tar.gz: acf532a7231f8a75e2287f9c533feb71b4d8370c298f44bb8878041e7be91bec
+SHA1:
+  metadata.gz: 9058c36484b4c4ef6bc42c07e6b0669ef89750a1
+  data.tar.gz: 26c8bc6675b4becf0bd01cf211754d3ca5b9d4ae
 SHA512:
-  metadata.gz: c9fd958b3178ee339b2ed5dba30ffc83b0c03394dd6cab19e5885059bdddd7ec1e91ef33014fde1a1d2b45ef276db38df6a4d42f313111be8bf4322b8dd05ea5
-  data.tar.gz: de18a2ef437ec324d85906b27e568315e5bf09144308cff7849f27ed14212258a2c10fee9a0a5ae78e3040f5127d200e45ac24e7978fe494fcfb4699824fe3bb
+  metadata.gz: e674a5a5dc6a8b33baefc3479ae5873ad18aa7bd55a005cf182a5a68fb7351ab7a09f7e6ae642f10b42c9deb7bfdc574f02ad60df32e30d178c276507ed74bfa
+  data.tar.gz: f4a4b91a842e1a90833e8e04b4b01c48c2d61090c9219330d51f33531bebd236a9bac7ddd20e2efbed3f340105fa8840a566434d5be81971b664954e1247dc34

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v1.2.3](https://github.com/DragonBox/u3d/tree/v1.2.3) (2020-02-26)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.2.2...v1.2.3)
+
+**Merged pull requests:**
+
+- Allow to refresh the github changelog. Also fix them as we removed empty lines. [\#398](https://github.com/DragonBox/u3d/pull/398) ([lacostej](https://github.com/lacostej))
+- Detect 2019 modules and allow to install 2019, skipping dmg install for now [\#392](https://github.com/DragonBox/u3d/pull/392) ([lacostej](https://github.com/lacostej))
+
 ## [v1.2.2](https://github.com/DragonBox/u3d/tree/v1.2.2) (2020-02-21)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.2.1...v1.2.2)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.2.2)
+    u3d (1.2.3)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
@@ -26,7 +26,7 @@ GEM
     byebug (10.0.2)
     coderay (1.1.2)
     colored (1.2)
-    commander (4.5.0)
+    commander (4.4.7)
       highline (~> 2.0.0)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
@@ -100,7 +100,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    rubyzip (2.2.0)
+    rubyzip (2.0.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)

data/Rakefile

@@ -219,7 +219,7 @@ def parse_changelog
       buffer = version + "\n\n"
     else
       next unless version # skip first lines
-      buffer += line if line != "\n"
+      buffer += line
     end
   end
   releases[version] = buffer
@@ -227,22 +227,25 @@ def parse_changelog
 end
 
 desc 'Create missing Github releases from changelog'
-task :create_missing_github_releases do
+task :create_missing_github_releases, [:force] do |_t, args|
+  force = args[:force] || false
   releases = parse_changelog
 
   known_releases = `hub release`.split("\n")
 
   releases.keys.reverse.each do |version|
-    if known_releases.include? version
+    exist = known_releases.include? version
+    if exist && !force
       puts "Skipping existing version #{version}"
       next
     end
+    action = exist ? "edit" : "create"
     changelog = releases[version]
-    puts "Creating version #{version}"
+    puts "About to #{action} version #{version}"
     require "tempfile"
     Tempfile.create("githubchangelog") do |changelog_file|
       File.write(changelog_file, changelog)
-      command = "hub release create #{version} -F #{changelog_file.path}"
+      command = "hub release #{action} #{version} --file #{changelog_file.path}"
       `#{command}`
     end
   end

data/lib/u3d.rb

@@ -48,4 +48,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/commands.rb

@@ -342,9 +342,8 @@ module U3d
           UI.verbose "Version #{version} of Unity is not installed yet"
         else
           UI.verbose "Unity #{version} is installed at #{unity.root_path}"
-          return unity
         end
-        nil
+        unity
       end
 
       # rubocop:disable Metrics/BlockNesting

data/lib/u3d/downloader.rb

@@ -33,7 +33,7 @@ module U3d
     # Regex to get the name of a localization asset
     UNITY_LANGUAGE_FILE_REGEX = %r{\/\d+/[0-9\.]+\/([\w-]+)$}
     # Regex to get the name of a package out of its file name
-    UNITY_MODULE_FILE_REGEX = %r{\/([\w\-_\.\+]+\.(?:pkg|exe|zip|sh|deb|msi|xz))[^\/]*$}
+    UNITY_MODULE_FILE_REGEX = %r{\/([\w\-_\.\+]+\.(?:pkg|dmg|exe|zip|sh|deb|msi|xz))[^\/]*$}
 
     class << self
       def download_directory

data/lib/u3d/ini_modules_parser.rb

@@ -25,30 +25,6 @@ require 'u3d/utils'
 require 'u3d_core/helper'
 
 module U3d
-  # Backwards compatibility
-  module INIParser
-    class << self
-      def method_missing(method_name, *arguments, &block)
-        UI.deprecated 'INIParser is obsolete, Use INIModulesParser instead'
-        if INIModulesParser.respond_to?(method_name)
-          INIModulesParser.send(method_name, *arguments, &block)
-        else
-          super
-        end
-      end
-
-      def respond_to?(method_name, include_private = false)
-        UI.deprecated 'INIParser is obsolete, Use INIModulesParser instead'
-        INIModulesParser.respond_to?(method_name, include_private)
-      end
-
-      def respond_to_missing?(method_name, include_private = false)
-        UI.deprecated 'INIParser is obsolete, Use INIModulesParser instead'
-        INIModulesParser.respond_to_missing?(method_name, include_private)
-      end
-    end
-  end
-
   # Load and parse INI files
   module INIModulesParser
     #####################################################

data/lib/u3d/installation.rb

@@ -105,7 +105,7 @@ module U3d
     end
   end
 
-  class PlaybackEngineUtils
+  class IvyPlaybackEngineUtils
     def self.list_module_configs(playbackengine_parent_path)
       Dir.glob("#{playbackengine_parent_path}/PlaybackEngines/*/ivy.xml")
     end
@@ -127,6 +127,32 @@ module U3d
     end
   end
 
+  class ModulePlaybackEngineUtils
+    def self.list_module_configs(playbackengine_parent_path)
+      # this should work on all platforms, non existing paths being ignored...
+      Dir.glob("#{playbackengine_parent_path}/PlaybackEngines/*/modules.asset") |
+        Dir.glob("#{playbackengine_parent_path}/Unity.app/Contents/PlaybackEngines/*/modules.asset")
+    end
+
+    def self.module_name(config_path)
+      File.basename(File.dirname(config_path)).gsub("Support", "")
+    end
+  end
+
+  class InstallationUtils
+    def self.read_version_from_unity_builtin_extra(file)
+      File.open(file, "rb") do |f|
+        f.seek(20)
+        s = ""
+        while (c = f.read(1))
+          break if c == "\x00"
+          s += c
+        end
+        s
+      end
+    end
+  end
+
   class MacInstallation < Installation
     require 'plist'
 
@@ -154,9 +180,13 @@ module U3d
 
     def packages
       pack = []
-      PlaybackEngineUtils.list_module_configs(root_path).each do |mpath|
-        pack << PlaybackEngineUtils.module_name(mpath)
+      IvyPlaybackEngineUtils.list_module_configs(root_path).each do |mpath|
+        pack << IvyPlaybackEngineUtils.module_name(mpath)
+      end
+      ModulePlaybackEngineUtils.list_module_configs(root_path).each do |mpath|
+        pack << ModulePlaybackEngineUtils.module_name(mpath)
       end
+
       NOT_PLAYBACKENGINE_PACKAGES.each do |module_name|
         pack << module_name unless Dir[module_name_pattern(module_name)].empty?
       end
@@ -236,15 +266,8 @@ module U3d
 
   class LinuxInstallation < Installation
     def version
-      # I don't find an easy way to extract the version on Linux
-      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
-      version
+      path = "#{root_path}/Editor/Data/Resources/unity_builtin_extra"
+      InstallationUtils.read_version_from_unity_builtin_extra(path)
     end
 
     def build_number
@@ -267,8 +290,11 @@ module U3d
     def packages
       path = "#{root_path}/Editor/Data/"
       pack = []
-      PlaybackEngineUtils.list_module_configs(path).each do |mpath|
-        pack << PlaybackEngineUtils.module_name(mpath)
+      IvyPlaybackEngineUtils.list_module_configs(path).each do |mpath|
+        pack << IvyPlaybackEngineUtils.module_name(mpath)
+      end
+      ModulePlaybackEngineUtils.list_module_configs(root_path).each do |mpath|
+        pack << ModulePlaybackEngineUtils.module_name(mpath)
       end
       NOT_PLAYBACKENGINE_PACKAGES.each do |module_name|
         pack << module_name unless Dir[module_name_pattern(module_name)].empty?
@@ -368,9 +394,9 @@ module U3d
       return version unless version.nil?
 
       path = "#{root_path}/Editor/Data/"
-      package = PlaybackEngineUtils.list_module_configs(path).first
+      package = IvyPlaybackEngineUtils.list_module_configs(path).first
       raise "Couldn't find a module under #{path}" unless package
-      PlaybackEngineUtils.unity_version(package)
+      IvyPlaybackEngineUtils.unity_version(package)
     end
 
     def build_number
@@ -403,8 +429,11 @@ module U3d
     def packages
       path = "#{root_path}/Editor/Data/"
       pack = []
-      PlaybackEngineUtils.list_module_configs(path).each do |mpath|
-        pack << PlaybackEngineUtils.module_name(mpath)
+      IvyPlaybackEngineUtils.list_module_configs(path).each do |mpath|
+        pack << IvyPlaybackEngineUtils.module_name(mpath)
+      end
+      ModulePlaybackEngineUtils.list_module_configs(root_path).each do |mpath|
+        pack << ModulePlaybackEngineUtils.module_name(mpath)
       end
       NOT_PLAYBACKENGINE_PACKAGES.each do |module_name|
         pack << module_name unless Dir[module_name_pattern(module_name)].empty?

data/lib/u3d/installer.rb

@@ -191,12 +191,14 @@ module U3d
     def install(file_path, version, installation_path: nil, info: nil)
       # rubocop:enable UnusedMethodArgument
       extension = File.extname(file_path)
-      raise "Installation of #{extension} files is not supported on Mac" unless %w[.zip .po .pkg].include? extension
+      raise "Installation of #{extension} files is not supported on Mac" unless %w[.zip .po .pkg .dmg].include? extension
       path = installation_path || DEFAULT_MAC_INSTALL
       if extension == '.po'
         install_po(file_path, version, info: info)
       elsif extension == '.zip'
         install_zip(file_path, version, info: info)
+      elsif extension == '.dmg'
+        UI.important "Skipping installation of #{file_path} for now"
       else
         install_pkg(file_path, version: version, target_path: path)
       end

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
   DESCRIPTION = 'Provides numerous tools for installing, managing and running the Unity game engine from command line.'.freeze
   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"\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -452,7 +452,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: U3d