u3d 1.1.5 → 1.2.0

data/lib/u3d/unity_versions.rb

@@ -124,6 +124,7 @@ module U3d
     LINUX_DOWNLOAD = %r{['"](https?:\/\/[\w/\.-]+/[0-9a-f\+]{12,13}\/)(.\/)?UnitySetup-(\d+\.\d+\.\d+\w\d+)['"]}
 
     MAC_WIN_SHADERS = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)builtin_shaders-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
+    LINUX_INSTALLER = %r{(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)LinuxEditorInstaller/Unity.tar.xz}
 
     LINUX_DOWNLOAD_DATED = %r{"(https?://[\w/\._-]+/unity\-editor\-installer\-(\d+\.\d+\.\d+\w\d+).*\.sh)"}
     LINUX_DOWNLOAD_RECENT_PAGE = %r{"(https?://beta\.unity3d\.com/download/[a-zA-Z0-9/\.\+]+/public_download\.html)"}
@@ -164,10 +165,18 @@ module U3d
         end.reduce({}, :merge)
       end
 
-      def fetch_from_json(url, pattern)
+      def json_url_for(os)
+        format(UNITY_LATEST_JSON_URL, os: os)
+      end
+
+      def fetch_json(url, pattern)
         require 'json'
         data = Utils.get_ssl(url)
-        JSON.parse(data).values.flatten.select { |b| pattern =~ b['downloadUrl'] }.map do |build|
+        JSON.parse(data).values.flatten.select { |b| pattern =~ b['downloadUrl'] }
+      end
+
+      def fetch_from_json(url, pattern)
+        fetch_json(url, pattern).map do |build|
           [build['version'], pattern.match(build['downloadUrl'])[1]]
         end.to_h
       end
@@ -182,6 +191,8 @@ module U3d
     end
 
     class LinuxVersions
+      JSON_OS = 'linux'.freeze
+
       @unity_forums = U3d::UnityForums.new
       class << self
         attr_accessor :unity_forums
@@ -191,6 +202,10 @@ module U3d
           versions = @unity_forums.pagination_urls(UNITY_LINUX_DOWNLOADS).map do |page_url|
             list_available_from_page(@unity_forums, unity_forums.page_content(page_url))
           end.reduce({}, :merge)
+
+          versions_fetcher = VersionsFetcher.new(pattern: LINUX_INSTALLER)
+          versions.merge!(versions_fetcher.fetch_json('linux'))
+
           if versions.count.zero?
             UI.important 'Found no releases'
           else
@@ -261,7 +276,7 @@ module U3d
 
       def fetch_json(os)
         UI.message 'Loading Unity latest releases'
-        url = format(UNITY_LATEST_JSON_URL, os: os)
+        url = UnityVersions.json_url_for(os)
         latest = UnityVersions.fetch_from_json(url, UNITY_LATEST_JSON)
 
         UI.success "Found #{latest.count} latest releases."
@@ -285,21 +300,25 @@ module U3d
     end
 
     class MacVersions
+      JSON_OS = 'darwin'.freeze
+
       class << self
         def list_available
           versions_fetcher = VersionsFetcher.new(pattern: [MAC_WIN_SHADERS])
           versions_fetcher.fetch_all_channels
-          versions_fetcher.fetch_json('darwin')
+          versions_fetcher.fetch_json(JSON_OS)
         end
       end
     end
 
     class WindowsVersions
+      JSON_OS = 'win32'.freeze
+
       class << self
         def list_available
           versions_fetcher = VersionsFetcher.new(pattern: MAC_WIN_SHADERS)
           versions_fetcher.fetch_all_channels
-          versions_fetcher.fetch_json('win32')
+          versions_fetcher.fetch_json(JSON_OS)
         end
       end
     end

data/lib/u3d/utils.rb

@@ -151,6 +151,28 @@ module U3d
         FileUtils.mkpath(dir) unless File.directory?(dir)
       end
 
+      def get_write_access(dir)
+        if U3dCore::Helper.operating_system == :win
+          yield
+        else
+          stat_command = if U3dCore::Helper.operating_system == :linux
+                           "stat -c \"%U,%a\" #{dir}"
+                         elsif U3dCore::Helper.operating_system == :mac
+                           "stat -f \"%Su,%A\" #{dir}"
+                         end
+          owner, access = U3dCore::CommandExecutor.execute(command: stat_command, admin: false).strip.split(',')
+          current_user = U3dCore::CommandExecutor.execute(command: 'whoami', admin: false)
+          U3dCore::CommandExecutor.execute(command: "chown #{current_user}: #{dir}", admin: true)
+          U3dCore::CommandExecutor.execute(command: "chmod u+w #{dir}", admin: true)
+          begin
+            yield
+          ensure
+            U3dCore::CommandExecutor.execute(command: "chown #{owner}: #{dir}", admin: true)
+            U3dCore::CommandExecutor.execute(command: "chmod #{access} #{dir}", admin: true)
+          end
+        end
+      end
+
       # if total is nil (unknown, falls back to print_progress_nosize)
       def print_progress(current, total, started_at)
         if total.nil?
@@ -191,6 +213,7 @@ module U3d
         result = getdir.call(0, CSIDL_LOCAL_APPDATA, 0, 0, windir)
         raise "Unable to get Local Appdata directory, returned with value #{result}" unless result.zero?
         windir.rstrip!
+        windir = windir.encode("UTF-8", Encoding.find('filesystem'))
         windir = File.expand_path(windir.rstrip)
 
         return windir if Dir.exist? windir

data/lib/u3d/version.rb

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

data/lib/u3d_core/ui/implementations/shell.rb

@@ -25,13 +25,18 @@ module U3dCore
   # Shell is the terminal output of things
   # For documentation for each of the methods open `interface.rb`
   class Shell < Interface
+    # test_log_buffer: by default, don't show any logs when running tests
+    def initialize(test_log_buffer: nil)
+      @test_log_buffer = test_log_buffer
+    end
+
     def log
       return @log if @log
 
       $stdout.sync = true
 
       @log ||= if Helper.test?
-                 Logger.new(nil) # don't show any logs when running tests
+                 Logger.new(@test_log_buffer)
                else
                  Logger.new(EPipeIgnorerLogDevice.new($stdout))
                end

data/lib/u3d_core/ui/ui.rb

@@ -27,6 +27,8 @@ module U3dCore
       def current
         @current ||= Shell.new
       end
+
+      attr_writer :current
     end
 
     # rubocop:disable Style/MethodMissing

data/u3d.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'filesize', '>= 0.1.1' # File sizes prettifier
   spec.add_dependency 'inifile', '>= 3.0.0', '< 4.0.0' # Parses INI files
   spec.add_dependency 'plist', '>= 3.1.0', '< 4.0.0' # Generate the Xcode config plist file
+  spec.add_dependency 'rubyzip', '>= 2.0.0', '< 3.0.0' # Installation of .zip files
   spec.add_dependency 'security', '= 0.1.3' # macOS Keychain manager, a dead project, no updates expected
   # Development only
   spec.add_development_dependency "bundler", "~> 1.13"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -119,6 +119,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: security
   requirement: !ruby/object:Gem::Requirement
@@ -384,11 +404,13 @@ files:
 - lib/u3d/download_validator.rb
 - lib/u3d/downloader.rb
 - lib/u3d/failure_reporter.rb
-- lib/u3d/iniparser.rb
+- lib/u3d/hub_modules_parser.rb
+- lib/u3d/ini_modules_parser.rb
 - lib/u3d/installation.rb
 - lib/u3d/installer.rb
 - lib/u3d/log_analyzer.rb
 - lib/u3d/unity_license.rb
+- lib/u3d/unity_module.rb
 - lib/u3d/unity_project.rb
 - lib/u3d/unity_runner.rb
 - lib/u3d/unity_version_definition.rb
@@ -433,8 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: U3d