u3d 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16167249f7c241c3d56a26a4f4f57799637f2bf
-  data.tar.gz: ec668456ad48bb9ea4ab5ffd259551fedce73c80
+  metadata.gz: f7fc56b235f6627c0f4e44e12dddb35e1f22b9ef
+  data.tar.gz: e6dbe1daf2d3ca3e1dcf6956e39541fb0d15fff6
 SHA512:
-  metadata.gz: 79e190c037b298fa2bd96d5f9736f641348bdbf70c243566400c9f52f5d01804337f9583afc0f8861fef2c486a8503c9fd9a98bb85be6512a2a16583cdee78c6
-  data.tar.gz: ff0c122ca7266eaebe87c416a742e7e95ab58f82bca7880249bc1bddee14d5ee1863ece34ab88afec3d697cde25d6d2b85c35fd0dd7cb5e75a6b981158d4c972
+  metadata.gz: d4ca5e97456b6d6a2769ca8d8cfe57fb3122b88a0a769a965eb5eb2b72bdcf1d7d379fd996b93480e0580e847c7c15af1a2326f80aaddb12258cc0b50d34e453
+  data.tar.gz: d58536ae973dfbd0261f97671472c8ae425277c9d5e61c5a7e022e8ef8c444573bd1f53eb0e485d011458b3d2ed81d23900a72d94f3e4ee6d22ef8a160236f96

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!--
+Thank you for helping u3d to get better!
+Before you post your issue, please make sure that you checked the boxes! (put an x in the [ ] without spaces)
+If possible, try to indicate what type of issue you are facing with the tags!
+-->
+
+### Issue Checklist
+
+- [ ] I'm using the latest u3d version
+- [ ] I ran `u3d --help`
+- [ ] I read the [README](https://github.com/DragonBox/u3d/blob/master/README.md)
+- [ ] I made sure that a similar [issue](https://github.com/DragonBox/u3d/issues) doesn't exit
+
+### Issue Description
+
+<!-- Please describe your issue with as much precision as possible. Write there the command you ran, its output, the behaviour you expect... -->
+
+[DESCRIBE YOUR ISSUE HERE]

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+<!--
+Thank you for contributing to u3d!
+Before you post your pull request, please make sure that you checked the boxes! (put an x in the [ ] without spaces)
+If possible, try to name your pull request by prefixing it with <SUBJECT>. For instance, if you're modifying the downloading, you could prefix it with u3d/download:
+-->
+
+### Pull Request Checklist
+
+- [ ] My pull request has been rebased on master
+- [ ] I ran `bundle exec rspec` to make sure that my PR didn't break any test
+- [ ] I ran `bundle exec rubocop` to make sure that my PR is inline with our code style
+- [ ] I have read the [code of conduct](https://github.com/DragonBox/u3d/blob/master/CODE_OF_CONDUCT.md)
+
+### Pull Request Description
+
+<!-- If this pull request is related to a specific issue, please specify here "Fixes #ISSUE_NO" -->
+<!-- Please describe your pull request with as much precision as possible. Write here why you think this change is required, what problem it solves, how it solves it...  -->
+<!-- Please describe to what extent you tested your modifications -->
+
+[DESCRIBE YOUR PULL REQUEST HERE]

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,9 +1,35 @@
 # Change Log
 
+## [v1.0.16](https://github.com/DragonBox/u3d/tree/v1.0.16) (2018-02-04)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.15...v1.0.16)
+
+**Implemented enhancements:**
+
+- support install of .xz files [\#251](https://github.com/DragonBox/u3d/issues/251)
+- Linux ini partial support exists now [\#244](https://github.com/DragonBox/u3d/issues/244)
+
+**Fixed bugs:**
+
+- u3d/install & u3d/available no INI file error on Linux [\#242](https://github.com/DragonBox/u3d/issues/242)
+- u3d/prettify: Fix rule termination when there are special characters in the file name [\#246](https://github.com/DragonBox/u3d/pull/246) ([niezbop](https://github.com/niezbop))
+
+**Closed issues:**
+
+- u3d/available missing latest versions on Linux [\#241](https://github.com/DragonBox/u3d/issues/241)
+- u3d/install fails to install Linux dependencies inside docker [\#240](https://github.com/DragonBox/u3d/issues/240)
+
+**Merged pull requests:**
+
+- u3d/install linux xz format \(fixes \#251\) [\#252](https://github.com/DragonBox/u3d/pull/252) ([lacostej](https://github.com/lacostej))
+- u3d/available: support broken parts of Linux INI \(\#244\) [\#248](https://github.com/DragonBox/u3d/pull/248) ([lacostej](https://github.com/lacostej))
+- u3d/available: fix forums parsing and move ini faking/downloading at available time, to support package based Linux versions [\#247](https://github.com/DragonBox/u3d/pull/247) ([lacostej](https://github.com/lacostej))
+- u3d/prettify: Parse Android command invocation failure [\#245](https://github.com/DragonBox/u3d/pull/245) ([niezbop](https://github.com/niezbop))
+- Support linux forums pagination [\#243](https://github.com/DragonBox/u3d/pull/243) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.15](https://github.com/DragonBox/u3d/tree/v1.0.15) (2018-01-16)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.14...v1.0.15)
 
-**Merged pull requests:**
+**Fixed bugs:**
 
 - u3d/install: download beta for mac also needs to discard checking md5s on Windows packages [\#234](https://github.com/DragonBox/u3d/pull/234) ([lacostej](https://github.com/lacostej))
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.0.15)
+    u3d (1.0.16)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)
@@ -24,7 +24,7 @@ GEM
     builder (3.2.3)
     coderay (1.1.1)
     colored (1.2)
-    commander (4.4.3)
+    commander (4.4.4)
       highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)

data/config/log_rules.json

@@ -11,7 +11,7 @@
       "fail": {
         "active": true,
         "start_pattern": "^(?<fail>Failed to .+)\\n",
-        "end_pattern": "Filename: (?:[\\w/:]+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
+        "end_pattern": "Filename: (?:.+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
         "start_message": false,
         "end_message": "%{file}(line %{line}): %{fail}",
         "store_lines": false,
@@ -39,7 +39,7 @@
       "exception_report": {
         "active": true,
         "start_pattern": "^(?<message>.*threw exception\\.)\\n",
-        "end_pattern": "Filename: (?:[\\w/:]+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
+        "end_pattern": "Filename: (?:.+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
         "start_message": false,
         "end_message": "%{file}(line %{line}): %{message}",
         "store_lines": false,
@@ -74,7 +74,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}",
         "type": "warning"
       },
@@ -83,12 +83,13 @@
         "start_pattern": "UnityEngine\\.Debug:LogWarning\\(Object\\)",
         "fetch_first_line_not_matching": [
           "UnityEngine\\.",
-          "^\\n"
+          "^\\n",
+          "^\\s+"
         ],
         "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}",
         "type": "warning"
       },
@@ -104,7 +105,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}",
         "type": "error"
       },
@@ -120,7 +121,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}",
         "type": "error"
       },
@@ -307,6 +308,42 @@
         "start_pattern": "Textures\\s+\\d+\\.?\\d* .b\\s+\\d{1,3}\\.?\\d*%",
         "end_pattern": "Complete size\\s+\\d+\\.?\\d* .b\\s+\\d{1,3}\\.?\\d*%",
         "store_lines": true
+      },
+      "command_invocation_failure": {
+        "active": true,
+        "start_pattern": "CommandInvokationFailure: (?<message>.+\\.)",
+        "store_lines": true,
+        "end_pattern": "^\\n",
+        "start_message": "[ANDROID] Command invocation failure: %{message}",
+        "end_message": false,
+        "type": "error"
+      },
+      "command_invocation_failure_stderr": {
+        "active": true,
+        "start_pattern": "stderr\\[",
+        "store_lines": true,
+        "ignore_lines": ["^\\n"],
+        "end_pattern": "\\]\\n",
+        "start_message": "[ANDROID] Errors:",
+        "end_message": false,
+        "type": "error"
+      },
+      "command_invocation_failure_stdout": {
+        "active": true,
+        "start_pattern": "stdout\\[",
+        "store_lines": true,
+        "ignore_lines": ["^\\n"],
+        "end_pattern": "\\]\\n",
+        "start_message": "[ANDROID] Warnings:",
+        "end_message": false,
+        "type": "warning"
+      },
+      "command_invocation_failure_stack": {
+        "active": true,
+        "start_pattern": "[Ee]xit code: (?<code>\\d+)",
+        "end_pattern": "Filename: (?:.+/(?<file>\\w+\\.\\w+))? Line: (?<line>-?\\d+)",
+        "start_message": false,
+        "end_message": "[ANDROID] %{file}(line %{line}) Exit code %{code}"
       }
     }
   }

data/lib/u3d/cache.rb

@@ -133,6 +133,7 @@ module U3d
       @cache = data unless need_update
       !need_update
     rescue StandardError => e
+      UI.verbose(e.backtrace.join("\n"))
       UI.error("Failed fetching central versions.json. Manual fetch for platform #{os} #{e}")
       false
     end

data/lib/u3d/commands.rb

@@ -106,7 +106,7 @@ module U3d
         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)
+        packages = packages_with_unity_first(options)
 
         cache_versions = cache_versions(os, offline: !options[:download])
         version = interpret_latest(version, cache_versions)
@@ -286,11 +286,7 @@ module U3d
         iversion
       end
 
-      def packages_with_unity_first(os, options)
-        if os == :linux
-          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
+      def packages_with_unity_first(options)
         temp = options[:packages] || ['Unity']
         temp.insert(0, 'Unity') if temp.delete('Unity')
         temp

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|msi))[^\/]*$}
+    UNITY_MODULE_FILE_REGEX = %r{\/([\w\-_\.\+]+\.(?:pkg|exe|zip|sh|deb|msi|xz))[^\/]*$}
 
     class << self
       def download_directory

data/lib/u3d/iniparser.rb

@@ -46,21 +46,12 @@ module U3d
         Utils.ensure_dir(default_ini_path)
         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'" unless offline
-            return nil
-          end
           raise "INI file does not exist at #{ini_path}" if offline
-          uri = URI(cached_versions[version] + ini_name)
-          File.open(ini_path, 'wb') do |f|
-            data = Net::HTTP.get(uri)
-            data.tr!("\"", '')
-            data.gsub!(/Note:.+\n/, '')
-            f.write(data)
-          end
+          download_ini(version, cached_versions, os, ini_name, ini_path)
         end
         begin
           result = IniFile.load(ini_path).to_h
+          result = filter_broken_linux(result) if os == 'linux'
         rescue StandardError => e
           raise "Could not parse INI data (#{e})"
         end
@@ -87,6 +78,33 @@ url=#{url}
 
       private
 
+      def download_ini(version, cached_versions, os, ini_name, ini_path)
+        # former urls for Linux pointed to unity-editor-installer.sh directlry
+        if os == 'linux' && cached_versions[version] =~ /.*.sh$/
+          UI.verbose "No INI on server. Faking one by finding out package size for version #{version}"
+          url = cached_versions[version]
+          size = Utils.get_url_content_length(url)
+          if size
+            create_linux_ini(version, size, url)
+          else
+            UI.important "u3d tried to get the size of the installer for version #{version}, but wasn't able to"
+          end
+          return
+        end
+        uri = URI(cached_versions[version] + ini_name)
+        UI.verbose("Searching for ini file at #{uri}")
+        File.open(ini_path, 'wb') do |f|
+          data = Net::HTTP.get(uri)
+          data.tr!("\"", '')
+          data.gsub!(/Note:.+\n/, '')
+          f.write(data)
+        end
+      end
+
+      def filter_broken_linux(ini_hash)
+        ini_hash.select { |_k, v| v['url'] && !v['url'].end_with?('.pkg') }
+      end
+
       def default_ini_path
         case U3dCore::Helper.operating_system
         when :linux

data/lib/u3d/installation.rb

@@ -189,6 +189,32 @@ module U3d
       @root_path || @path
     end
 
+    def packages
+      path = "#{root_path}/Editor/Data/"
+      pack = []
+      PlaybackEngineUtils.list_module_configs(path).each do |mpath|
+        pack << PlaybackEngineUtils.module_name(mpath)
+      end
+      NOT_PLAYBACKENGINE_PACKAGES.each do |module_name|
+        pack << module_name unless Dir[module_name_pattern(module_name)].empty?
+      end
+      pack
+    end
+
+    def module_name_pattern(module_name)
+      # FIXME: we are not yet sure where these modules will end up yet
+      case module_name
+      when 'Documentation'
+        return "#{root_path}/Editor/Data/Documentation/"
+      when 'StandardAssets'
+        return "#{root_path}/Editor/Standard Assets/"
+      when 'MonoDevelop'
+        return "#{root_path}/MonoDevelop/"
+      else
+        UI.crash! "No pattern is known for #{module_name} on Linux"
+      end
+    end
+
     def clean_install?
       !(root_path =~ UNITY_DIR_CHECK_LINUX).nil?
     end

data/lib/u3d/installer.rb

@@ -212,12 +212,17 @@ module U3d
     def install(file_path, version, installation_path: nil, info: {})
       # rubocop:enable UnusedMethodArgument
       extension = File.extname(file_path)
-      raise "Installation of #{extension} files is not supported on Linux" if extension != '.sh'
-      path = installation_path || DEFAULT_LINUX_INSTALL
-      install_sh(
-        file_path,
-        installation_path: path
-      )
+
+      raise "Installation of #{extension} files is not supported on Linux" unless ['.sh', '.xz'].include? extension
+      if extension == '.sh'
+        path = installation_path || DEFAULT_LINUX_INSTALL
+        install_sh(file_path, installation_path: path)
+      elsif extension == '.xz'
+        new_path = File.join(DEFAULT_LINUX_INSTALL, format(UNITY_DIR_LINUX, version: version))
+        path = installation_path || new_path
+        install_xz(file_path, installation_path: path)
+      end
+
       # Forces sanitation for installation of 'weird' versions eg 5.6.1xf1Linux
       unity = installed.select { |u| u.version == version }.first
       if unity
@@ -240,7 +245,19 @@ module U3d
         U3dCore::CommandExecutor.execute(command: cmd, admin: true)
       end
     rescue StandardError => e
-      UI.error "Failed to install bash file at #{file}: #{e}"
+      UI.error "Failed to install sh file #{file} at #{installation_path}: #{e}"
+    else
+      UI.success 'Installation successful'
+    end
+
+    def install_xz(file, installation_path: nil)
+      raise 'Missing installation_path' unless installation_path
+
+      command = "cd #{installation_path.shellescape}; tar xf #{file.shellescape}"
+      command = "mkdir -p #{installation_path.shellescape}; #{command}" unless File.directory? installation_path
+      U3dCore::CommandExecutor.execute(command: command, admin: true)
+    rescue StandardError => e
+      UI.error "Failed to install xz file #{file} at #{installation_path}: #{e}"
     else
       UI.success 'Installation successful'
     end

data/lib/u3d/unity_version_definition.rb

@@ -58,9 +58,5 @@ module U3d
       return -1 unless @ini[package] && @ini[package]['size']
       @os == :win ? @ini[package]['size'] * 1024 : @ini[package]['size']
     end
-
-    def self.create_fake(version, size, url)
-      INIparser.create_linux_ini(version, size, url)
-    end
   end
 end

data/lib/u3d/unity_versions.rb

@@ -25,6 +25,78 @@ require 'u3d_core/helper'
 require 'net/http'
 
 module U3d
+  class UnityForums
+    def pagination_urls(url)
+      # hardcoded for now
+      # otherwise maybe
+      # # <div class="PageNav" data-page="7" data-range="2" data-start="5" data-end="9" data-last="10" data-sentinel="{{sentinel}}" data-baseurl="threads/twitter.12003/page-{{sentinel}}"
+      #  <span class="pageNavHeader">Page 7 of 10</span>
+      [url,
+       "#{url}page-2"]
+    end
+
+    def page_content(url)
+      fetch_cookie
+      request_headers = { 'Connection' => 'keep-alive', 'Cookie' => @cookie }
+      UI.verbose "Fetching from #{url}"
+      Utils.page_content(url, request_headers: request_headers)
+    end
+
+    private
+
+    def fetch_cookie
+      UI.verbose "FetchCookie? #{@cookie}"
+      return @cookie if @cookie
+      cookie_str = ''
+      url = 'https://forum.unity.com/forums/linux-editor.93/' # a page that triggers cookies
+      uri = URI(url)
+      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+        request = Net::HTTP::Get.new uri
+        request['Connection'] = 'keep-alive'
+        response = http.request request
+
+        case response
+        when Net::HTTPSuccess then
+          UI.verbose "unexpected result"
+        when Net::HTTPRedirection then
+          # A session must be opened with the server before accessing forum
+          res = nil
+          cookie_str = ''
+          # Store the name and value of the cookies returned by the server
+          response['set-cookie'].gsub(/\s+/, '').split(',').each do |c|
+            cookie_str << c.split(';', 2)[0] + '; '
+          end
+          cookie_str.chomp!('; ')
+
+          # It should be the Unity register API
+          uri = URI(response['location'])
+          UI.verbose "Redirecting to #{uri}"
+          Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http_api|
+            request = Net::HTTP::Get.new uri
+            request['Connection'] = 'keep-alive'
+            res = http_api.request request
+          end
+
+          raise 'Unexpected result' unless res.is_a? Net::HTTPRedirection
+          # It should be a redirection to the forum to perform authentication
+          uri = URI(res['location'])
+          UI.verbose "Redirecting to #{uri}"
+          request = Net::HTTP::Get.new uri
+          request['Connection'] = 'keep-alive'
+          request['Cookie'] = cookie_str
+
+          res = http.request request
+
+          raise 'Unable to establish a session with Unity forum' unless res.is_a? Net::HTTPRedirection
+
+          UI.verbose "Found cookie_str #{cookie_str}"
+          cookie_str << '; ' + res['set-cookie'].gsub(/\s+/, '').split(';', 2)[0]
+        end
+      end
+      UI.verbose "Found @cookie #{cookie_str}"
+      @cookie = cookie_str
+    end
+  end
   # Takes care of fectching versions and version list
   module UnityVersions
     #####################################################
@@ -45,6 +117,7 @@ module U3d
     # @!group REGEX: expressions to interpret data
     #####################################################
     # Captures a version and its base url
+    LINUX_DOWNLOAD = %r{'(https?://[\w/\.-]+/[0-9a-f]{12}/)(./)?UnitySetup-(\d+\.\d+\.\d+\w\d+)'}
     MAC_DOWNLOAD = %r{"(https?://[\w/\.-]+/[0-9a-f]{12}/)MacEditorInstaller/[a-zA-Z0-9/\.]+-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
     WIN_DOWNLOAD = %r{"(https?://[\w/\.-]+/[0-9a-f]{12}/)Windows..EditorInstaller/[a-zA-Z0-9/\.]+-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
     LINUX_DOWNLOAD_DATED = %r{"(https?://[\w/\._-]+/unity\-editor\-installer\-(\d+\.\d+\.\d+\w\d+).*\.sh)"}
@@ -94,127 +167,56 @@ module U3d
     end
 
     class LinuxVersions
+      @unity_forums = U3d::UnityForums.new
       class << self
+        attr_accessor :unity_forums
+
         def list_available
           UI.message 'Loading Unity releases'
+          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)
+          if versions.count.zero?
+            UI.important 'Found no releases'
+          else
+            UI.success "Found #{versions.count} releases."
+          end
+          versions
+        end
 
-          data = linux_forum_page_content
+        private
 
+        def list_available_from_page(unity_forums, data)
           versions = {}
           results = data.scan(LINUX_DOWNLOAD_DATED)
           results.each do |capt|
-            save_package_size(capt[1], capt[0])
             versions[capt[1]] = capt[0]
           end
 
-          response = nil
           results = data.scan(LINUX_DOWNLOAD_RECENT_PAGE)
           results.each do |page|
-            response = linux_forum_version_page_content(page[0])
-            if response.is_a? Net::HTTPSuccess
-              capt = response.body.match(LINUX_DOWNLOAD_RECENT_FILE)
-              if capt && capt[1] && capt[2]
-                ver = capt[2].delete('x')
-                UI.important "Version #{ver} does not match standard Unity versions" unless ver =~ Utils::UNITY_VERSION_REGEX
-                save_package_size(ver, capt[1])
+            url = page[0]
+            page_body = unity_forums.page_content(url)
+            capt = page_body.match(LINUX_DOWNLOAD_RECENT_FILE)
+            if capt && capt[1] && capt[2]
+              ver = capt[2].delete('x')
+              UI.important "Version #{ver} does not match standard Unity versions" unless ver =~ Utils::UNITY_VERSION_REGEX
+              versions[ver] = capt[1]
+            else
+              capt = page_body.match(LINUX_DOWNLOAD)
+              # newer version of unity on linux support ini files
+              # http://beta.unity3d.com/download/3c89f8d277f5/unity-2017.3.0f1-linux.ini
+              if capt && capt[1] && capt[3]
+                ver = capt[3]
+                UI.verbose("Linux version #{ver}. Could not retrieve a fitting file from #{url}. Assuming ini file present")
                 versions[ver] = capt[1]
               else
-                UI.error("Could not retrieve a fitting file from #{url}")
+                UI.important("Could not retrieve a fitting file from #{url}.")
               end
-            else
-              UI.error("Could not access #{url}")
             end
           end
-          if versions.count.zero?
-            UI.important 'Found no releases'
-          else
-            UI.success "Found #{versions.count} releases."
-          end
           versions
         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)
-          else
-            UI.important "u3d tried to get the size of the installer for version #{version}, but wasn't able to"
-          end
-        end
-
-        def linux_forum_page_content
-          response = nil
-          data = ''
-          uri = URI(UNITY_LINUX_DOWNLOADS)
-          Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-            request = Net::HTTP::Get.new uri
-            request['Connection'] = 'keep-alive'
-            response = http.request request
-
-            case response
-            when Net::HTTPSuccess then
-              # Successfully retrieved forum content
-              data = response.body
-            when Net::HTTPRedirection then
-              # A session must be opened with the server before accessing forum
-              res = nil
-              cookie_str = ''
-              # Store the name and value of the cookies returned by the server
-              response['set-cookie'].gsub(/\s+/, '').split(',').each do |c|
-                cookie_str << c.split(';', 2)[0] + '; '
-              end
-              cookie_str.chomp!('; ')
-
-              # It should be the Unity register API
-              uri = URI(response['location'])
-              Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http_api|
-                request = Net::HTTP::Get.new uri
-                request['Connection'] = 'keep-alive'
-                res = http_api.request request
-              end
-
-              raise 'Unexpected result' unless res.is_a? Net::HTTPRedirection
-              # It should be a redirection to the forum to perform authentication
-              uri = URI(res['location'])
-
-              request = Net::HTTP::Get.new uri
-              request['Connection'] = 'keep-alive'
-              request['Cookie'] = cookie_str
-
-              res = http.request request
-
-              raise 'Unable to establish a session with Unity forum' unless res.is_a? Net::HTTPRedirection
-
-              cookie_str << '; ' + res['set-cookie'].gsub(/\s+/, '').split(';', 2)[0]
-
-              uri = URI(res['location'])
-
-              request = Net::HTTP::Get.new uri
-              request['Connection'] = 'keep-alive'
-              request['Cookie'] = cookie_str
-
-              res = http.request request
-
-              data = res.body if res.is_a? Net::HTTPSuccess
-            else raise "Request failed with status #{response.code}"
-            end
-          end
-          data
-        end
-
-        def linux_forum_version_page_content(url)
-          uri = URI(url)
-          Net::HTTP.start(uri.host, uri.port) do |http|
-            request = Net::HTTP::Get.new uri
-            return http.request request
-          end
-        end
       end
     end
 

data/lib/u3d/utils.rb

@@ -40,13 +40,18 @@ module U3d
         end
       end
 
-      def get_ssl(url, redirect_limit: 10)
-        follow_redirects(url, redirect_limit: redirect_limit) do |_request, response|
+      # FIXME: alias deprecated
+      def get_ssl(url, redirect_limit: 10, request_headers: {})
+        page_content(url, redirect_limit: redirect_limit, request_headers: request_headers)
+      end
+
+      def page_content(url, redirect_limit: 10, request_headers: {})
+        follow_redirects(url, redirect_limit: redirect_limit, request_headers: request_headers) do |_request, response|
           response.body
         end
       end
 
-      def follow_redirects(url, redirect_limit: 10, http_method: :get, &block)
+      def follow_redirects(url, redirect_limit: 10, http_method: :get, request_headers: {}, &block)
         raise 'Too many redirections' if redirect_limit.zero?
         response = nil
         request = nil
@@ -55,6 +60,9 @@ module U3d
           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
+            request_headers.each do |k, v|
+              request[k] = v
+            end
             response = http.request request
           end
         rescue OpenSSL::OpenSSLError => ssl_error
@@ -67,7 +75,7 @@ module U3d
           yield(request, response)
         when Net::HTTPRedirection then
           UI.verbose "Redirected to #{response['location']}"
-          follow_redirects(response['location'], redirect_limit: redirect_limit - 1, http_method: http_method, &block)
+          follow_redirects(response['location'], redirect_limit: redirect_limit - 1, http_method: http_method, request_headers: request_headers, &block)
         else raise "Request failed with status #{response.code}"
         end
       end

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.15'.freeze
+  VERSION = '1.0.16'.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.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -254,6 +254,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github_changelog_generator"
 - ".gitignore"
 - ".licenses.json"