u3d 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921e48e10c0e312b264724db1e4e8e995580150c
-  data.tar.gz: 65c8c9f9452e8a0ee9d8828301a17bc6cdbe114d
+  metadata.gz: 7da505bec2ad3c4609ec0afefe46329350425d04
+  data.tar.gz: 8c144e1dc9d9d8308cfa772cc8cf5c38515ff4e2
 SHA512:
-  metadata.gz: 420bae13d8ce41a64ee1b7cbef71e0083af60a6e31c0335ceae7f4fcbe42c74fd34cfe3bf535a49fc891dac7e12293db181e641b46003e79cc0c7db59eb5d76e
-  data.tar.gz: ca63925ef15a674149e5566f7afcc47b93e9c3782f22efe3e19febd2e8054100e9e5d44bd4c9ab3a5940651c87ec072099c63c5dc841507507314305d66e208f
+  metadata.gz: 0d4e7520378fb4cad4ea952732c29c2146bd89dc8756d3fdd2f6ea8a3d67fc29970e8f51cccd367552037de3d588d8cff84116e260380d42df1fcb3f0fbcc5fe
+  data.tar.gz: 0cc3430fea638963bcd2ed641e2cd6a4690920f4283e8129fa12bc3c0b68d56cf0559893cb0b2052f269c0b043252f4a8ccf1f35aa9c04f3e1ed9c39cd7deb42

data/.github_changelog_generator

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

data/.gitignore

@@ -3,3 +3,4 @@ coverage/
 gems/
 doc/
 LOCAL/
+.DS_Store

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [v1.0.14](https://github.com/DragonBox/u3d/tree/v1.0.14) (2018-01-15)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.13...v1.0.14)
+
+**Implemented enhancements:**
+
+- Support 2018.1.0b2 VisualStudio package installation [\#225](https://github.com/DragonBox/u3d/issues/225)
+- u3d/install: improve messages [\#231](https://github.com/DragonBox/u3d/pull/231) ([niezbop](https://github.com/niezbop))
+- u3d/install: add support for installing .msi packages on Windows [\#230](https://github.com/DragonBox/u3d/pull/230) ([niezbop](https://github.com/niezbop))
+
+**Merged pull requests:**
+
+- Appveyor support / Windows build automation [\#228](https://github.com/DragonBox/u3d/pull/228) ([lacostej](https://github.com/lacostej))
+- u3d/install Unity 2018. Download works on Windows and Mac and Mac installs. Fixes \#225 [\#227](https://github.com/DragonBox/u3d/pull/227) ([lacostej](https://github.com/lacostej))
+- u3d/install: allow to download from one platform while on another one [\#226](https://github.com/DragonBox/u3d/pull/226) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.13](https://github.com/DragonBox/u3d/tree/v1.0.13) (2018-01-09)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.12...v1.0.13)
 

data/Gemfile.lock

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

data/appveyor.yml

@@ -0,0 +1,21 @@
+# https://www.appveyor.com/docs/appveyor-yml/
+
+version: "{build}"
+
+init:
+  - git config --global core.autocrlf false
+
+# cloning the repository happens here
+
+install:
+  - set PATH=C:\Ruby24-x64\bin;%PATH%
+  - bundle install
+
+environment:
+  LC_ALL: en_US.UTF-8
+  LANG: en_US.UTF-8
+
+build: off
+
+test_script:
+  - bundle exec rake

data/lib/u3d/commands.rb

@@ -103,7 +103,8 @@ module U3d
       def install(args: [], options: {})
         version = specified_or_current_project_version(args[0])
 
-        os = U3dCore::Helper.operating_system
+        UI.user_error!("You cannot use the --operating_system and the --install options together") if options[:install] && options[:operating_system]
+        os = valid_os_or_current(options[:operating_system])
 
         packages = packages_with_unity_first(os, options)
 

data/lib/u3d/commands_generator.rb

@@ -122,7 +122,8 @@ Fore more information about how the rules work, see https://github.com/DragonBox
       end
 
       command :install do |c|
-        c.syntax = 'u3d install [<version>] [ [-p | --packages <package1>,<package2> ...] | [-a | --all] ] [--[no-]download] [ [--[no-]install] [-i | --installation_path <path>] ]'
+        oses = U3dCore::Helper.operating_systems
+        c.syntax = 'u3d install [<version>] [ [-p | --packages <package1>,<package2> ...] | [-o | --operating_system <OS>] [-a | --all] ] [--[no-]download] [ [--[no-]install] [-i | --installation_path <path>] ]'
         c.summary = "Download (and/or) install Unity3D editor packages."
         c.description = %(
 #{c.summary}
@@ -139,10 +140,12 @@ E.g. U3D_DOWNLOAD_PATH=/some/path/you/want u3d install ...
         c.option '--[no-]download', 'Perform or not downloading before installation. Downloads by default'
         c.option '--[no-]install', 'Perform or not installation after downloading. Installs by default'
         c.option '-p', '--packages PACKAGES', Array, 'Specifies which packages to download/install. Overriden by --all'
+        c.option '-o', '--operating_system STRING', String, "Downloads packages for specific OS [#{oses.join(', ')}]. Requires the --no-install option."
         c.option '-a', '--all', 'Download all available packages. Overrides -p'
         c.option '-i', '--installation_path PATH', String, 'Specifies where package(s) will be downloaded/installed. Conflicts with --no-install'
         c.option '-k', '--keychain', 'Gain privileges right through the keychain. [OSX only]'
         c.example 'Download and install Unity, its Documentation and the Android build support and install them for version 5.1.2f1', 'u3d install 5.1.2f1 -p Unity,Documentation,Android'
+        c.example 'Download but do not install all Unity version 2018.1.0b2 packages for platform Windows (while e.g. on Mac)', 'u3d install 2018.1.0b2 -o win -a --no-install'
         c.example "The 'version' argument can be a specific version number, such as 5.6.1f1, or an alias in [#{Commands.release_letter_mapping.keys.join(', ')}]. If not specified, u3d will download the unity version for the current project", 'u3d install latest'
         c.example "The admin password can be passed through the U3D_PASSWORD environment variable.", 'U3D_PASSWORD=mysecret u3d install a_version'
         c.example "On Mac, the admin password can be fetched from (and stored into) the keychain.", 'u3d install -k a_version'

data/lib/u3d/download_validator.rb

@@ -66,6 +66,11 @@ module U3d
 
   class WindowsValidator < DownloadValidator
     def validate(package, file, definition)
+      # External packages have no md5 and a false size value
+      if definition[package]['size'] % 1000 && definition[package]['md5'].nil?
+        UI.verbose "File '#{definition[package]['title']}' seems external. Validation skipped"
+        return true
+      end
       rounded_size = (File.size(file).to_f / 1024).floor
       size_validation(expected: definition[package]['size'], actual: rounded_size) &&
         hash_validation(expected: definition[package]['md5'], actual: Utils.hashfile(file))

data/lib/u3d/downloader.rb

@@ -31,7 +31,7 @@ module U3d
     # Path to the directory for the package downloading
     DOWNLOAD_PATH = "#{ENV['HOME']}/Downloads".freeze
     # Regex to get the name of a package out of its file name
-    UNITY_MODULE_FILE_REGEX = %r{\/([\w\-_\.\+]+\.(?:pkg|exe|zip|sh|deb))}
+    UNITY_MODULE_FILE_REGEX = %r{\/([\w\-_\.\+]+\.(?:pkg|exe|zip|sh|deb|msi))[^\/]*$}
 
     class << self
       def download_directory
@@ -82,6 +82,7 @@ module U3d
       private #-----------------------------------------------------------------
 
       def setup_os(os)
+        # downloader = Downloader::StandardPackageDownloader.new
         case os
         when :linux
           validator = LinuxValidator.new
@@ -99,8 +100,7 @@ module U3d
       end
 
       def get_package(downloader, validator, package, definition, files)
-        path = downloader.destination_for(package, definition)
-        url = downloader.url_for(package, definition)
+        path, url = downloader.destination_and_url_for(package, definition)
         if File.file?(path)
           UI.verbose "Installer file for #{package} seems to be present at #{path}"
           if validator.validate(package, path, definition)
@@ -137,46 +137,44 @@ module U3d
       end
     end
 
-    class MacDownloader
+    class StandardPackageDownloader
+      # for backward compatibility
       def destination_for(package, definition)
-        dir = File.join(Downloader.download_directory, definition.version)
-        Utils.ensure_dir(dir)
-        file_name = UNITY_MODULE_FILE_REGEX.match(definition[package]['url'])[1]
-
-        File.expand_path(file_name, dir)
+        destination_and_url_for(package, definition)[0]
       end
 
-      def url_for(package, definition)
-        definition.url + definition[package]['url']
-      end
-    end
+      def destination_and_url_for(package, definition)
+        final_url = url_for(package, definition)
 
-    class LinuxDownloader
-      def destination_for(package, definition)
         dir = File.join(Downloader.download_directory, definition.version)
         Utils.ensure_dir(dir)
-        file_name = UNITY_MODULE_FILE_REGEX.match(definition[package]['url'])[1]
+        file_name = UNITY_MODULE_FILE_REGEX.match(final_url)[1]
 
-        File.expand_path(file_name, dir)
-      end
+        destination = File.expand_path(file_name, dir)
 
-      def url_for(_package, definition)
-        definition.url
-      end
-    end
-
-    class WindowsDownloader
-      def destination_for(package, definition)
-        dir = File.join(Downloader.download_directory, definition.version)
-        Utils.ensure_dir(dir)
-        file_name = UNITY_MODULE_FILE_REGEX.match(definition[package]['url'])[1]
-
-        File.expand_path(file_name, dir)
+        [destination, final_url]
       end
 
       def url_for(package, definition)
-        definition.url + definition[package]['url']
+        url = definition[package]['url']
+        if url
+          if url =~ /^http/
+            Utils.final_url(url)
+          else
+            definition.url + url
+          end
+        else
+          definition.url
+        end
       end
     end
+
+    # for backward compatibility
+    class MacDownloader < StandardPackageDownloader
+    end
+    class LinuxDownloader < StandardPackageDownloader
+    end
+    class WindowsDownloader < StandardPackageDownloader
+    end
   end
 end

data/lib/u3d/installer.rb

@@ -63,7 +63,8 @@ module U3d
     def self.install_modules(files, version, installation_path: nil)
       installer = Installer.create
       files.each do |name, file, info|
-        UI.verbose "Installing #{name}#{info['mandatory'] ? ' (mandatory package)' : ''}, with file #{file}"
+        UI.header "Installing #{info['title']} (#{name})"
+        UI.message 'Installing with ' + file
         installer.install(file, version, installation_path: installation_path, info: info)
       end
     end
@@ -294,7 +295,7 @@ module U3d
 
     def install(file_path, version, installation_path: nil, info: {})
       extension = File.extname(file_path)
-      raise "Installation of #{extension} files is not supported on Windows" if extension != '.exe'
+      raise "Installation of #{extension} files is not supported on Windows" unless %w[.exe .msi].include? extension
       path = installation_path || File.join(DEFAULT_WINDOWS_INSTALL, format(UNITY_DIR, version: version))
       install_exe(
         file_path,
@@ -305,13 +306,17 @@ module U3d
 
     def install_exe(file_path, installation_path: nil, info: {})
       installation_path ||= DEFAULT_WINDOWS_INSTALL
-      final_path = installation_path.tr('/', '\\')
+      final_path = Utils.windows_path(installation_path)
       Utils.ensure_dir(final_path)
       begin
         command = nil
         if info['cmd']
           command = info['cmd']
-          command.sub!(/{FILENAME}/, file_path)
+          if /msiexec/ =~ command
+            command.sub!(/{FILENAME}/, '"' + Utils.windows_path(file_path) + '"')
+          else
+            command.sub!(/{FILENAME}/, file_path)
+          end
           command.sub!(/{INSTDIR}/, final_path)
           command.sub!(/{DOCDIR}/, final_path)
           command.sub!(/{MODULEDIR}/, final_path)
@@ -320,7 +325,7 @@ module U3d
         command ||= file_path.to_s
         U3dCore::CommandExecutor.execute(command: command, admin: true)
       rescue StandardError => e
-        UI.error "Failed to install exe at #{file_path}: #{e}"
+        UI.error "Failed to install package at #{file_path}: #{e}"
       else
         UI.success "Successfully installed #{info['title']}"
       end

data/lib/u3d/utils.rb

@@ -34,14 +34,27 @@ module U3d
     UNITY_VERSION_REGEX = /(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:(\w)(?:(\d+))?)?/
 
     class << self
+      def final_url(url, redirect_limit: 10)
+        follow_redirects(url, redirect_limit: redirect_limit, http_method: :head) do |request, _response|
+          request.uri.to_s
+        end
+      end
+
       def get_ssl(url, redirect_limit: 10)
+        follow_redirects(url, redirect_limit: redirect_limit) do |_request, response|
+          response.body
+        end
+      end
+
+      def follow_redirects(url, redirect_limit: 10, http_method: :get, &block)
         raise 'Too many redirections' if redirect_limit.zero?
         response = nil
         request = nil
         uri = URI(url)
         begin
-          Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-            request = Net::HTTP::Get.new uri
+          use_ssl = /^https/.match(url)
+          Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
+            request = http_request_class http_method, uri
             response = http.request request
           end
         rescue OpenSSL::OpenSSLError => ssl_error
@@ -51,14 +64,20 @@ module U3d
 
         case response
         when Net::HTTPSuccess then
-          response.body
+          yield(request, response)
         when Net::HTTPRedirection then
           UI.verbose "Redirected to #{response['location']}"
-          get_ssl(response['location'], redirect_limit: redirect_limit - 1)
+          follow_redirects(response['location'], redirect_limit: redirect_limit - 1, http_method: http_method, &block)
         else raise "Request failed with status #{response.code}"
         end
       end
 
+      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
+
       # size a hint of the expected size
       def download_file(path, url, size: nil)
         File.open(path, 'wb') do |f|
@@ -173,6 +192,10 @@ module U3d
       def pretty_filesize(filesize)
         Filesize.from(filesize.round.to_s + ' B').pretty
       end
+
+      def windows_path(path)
+        path.gsub(%r{\/(\d)}, '/\\\\\1').tr('/', '\\')
+      end
     end
   end
   # rubocop:enable ModuleLength

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.13'.freeze
+  VERSION = '1.0.14'.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.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -269,6 +269,7 @@ files:
 - LOG_RULES.md
 - README.md
 - Rakefile
+- appveyor.yml
 - build.sh
 - config/log_rules.json
 - docs/assets/ci_jenkins_ansi.png