u3d 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71adab2b2a03a3bc2b9d6af6dd6dd42cc02114d9
-  data.tar.gz: cb3f2acc27496edbf00ac8a2c5e942576ddb01f6
+  metadata.gz: 7ef51a1704cb01f95cc2ff2f66f90eb851c0010d
+  data.tar.gz: 26d03be1911d01506a9aa0bab60caf1abd8cf07d
 SHA512:
-  metadata.gz: 482ad130cd557980293b600ff3b19818b28441705f99e5b17244bb6638c44a1ace808fdfd83798656b96644a3a8c86faca70ebb9acd27eaa797a72bface947aa
-  data.tar.gz: f19eae468d593e8ab1e64c4ce1224773e963c9020f09fd0857e59b9e5029ad83f63eb393372e59ff6a5195ceb5e3932c4310958d4e5e66b8060f4f32f3999777
+  metadata.gz: 18d24c1137ce676f44354019fe449180038fde137cfdb6b7c8a94a4ce3639cf93ae2fda3d114c06ac97ef2d4579e26cf619f2658cf679d3ff9b3464faae72bff
+  data.tar.gz: 8f2c047324246b81c7ac78325045d49bbb90d867c4c345b90687b36aa2e62c1a1f7c41ac16c18476806943ecc1c95ec9d2f36909ebb916771119a581e2c01d31

data/.github_changelog_generator

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

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [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)
+
+**Implemented enhancements:**
+
+- Implement uninstall [\#174](https://github.com/DragonBox/u3d/issues/174)
+- u3d/install: find all patched versions [\#172](https://github.com/DragonBox/u3d/issues/172)
+
+**Merged pull requests:**
+
+- u3d/available: discover all patched releases \(fixes \#172\) [\#173](https://github.com/DragonBox/u3d/pull/173) ([lacostej](https://github.com/lacostej))
+- Implement uninstall. Also modify the output of list on Mac and deprecate Installation.path in favor of Installation.root\_path [\#171](https://github.com/DragonBox/u3d/pull/171) ([lacostej](https://github.com/lacostej))
+- u3d/cleanups small refactorings and cleanups [\#170](https://github.com/DragonBox/u3d/pull/170) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.8](https://github.com/DragonBox/u3d/tree/v1.0.8) (2017-10-18)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.7...v1.0.8)
 

data/Gemfile.lock

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

data/README.md

@@ -25,6 +25,10 @@ Available commands are:
 
 ![u3d install](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_install.png)
 
+* `u3d uninstall`: Uninstall Unity3D versions
+
+![u3d uninstall](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_uninstall.png)
+
 * `u3d list`: List installed versions of Unity3d
 
 ![u3d list](https://github.com/DragonBox/u3d/raw/master/docs/assets/u3d_list.png)

data/lib/u3d/commands.rb

@@ -53,7 +53,7 @@ module U3d
         sorted_keys = vcomparators.sort.map { |v| v.version.to_s }
         sorted_keys.each do |k|
           u = map[k]
-          UI.message "Version #{u.version.ljust(30)}(#{u.path})"
+          UI.message "Version #{u.version.ljust(30)}(#{u.root_path})"
           packages = u.packages
           next unless options[:packages] && packages && !packages.empty?
           UI.message 'Packages:'
@@ -126,11 +126,7 @@ module U3d
 
         verify_package_names(definition, packages)
 
-        if options[:install]
-          U3dCore::Globals.use_keychain = true if options[:keychain] && Helper.mac?
-          UI.important 'Root privileges are required'
-          raise 'Could not get administrative privileges' unless U3dCore::CommandExecutor.has_admin_privileges?
-        end
+        get_administrative_privileges(options) if options[:install]
 
         files = Downloader.fetch_modules(definition, packages: packages, download: options[:download])
 
@@ -138,6 +134,20 @@ module U3d
         Installer.install_modules(files, definition.version, installation_path: options[:installation_path])
       end
 
+      def uninstall(args: [], options: [])
+        version = specified_or_current_project_version(args[0])
+
+        unity = check_unity_presence(version: version)
+
+        unless unity
+          UI.user_error!('Unity version #{version} is not present and cannot be uninstalled')
+        end
+
+        get_administrative_privileges(options)
+
+        Installer.uninstall(unity: unity)
+      end
+
       def install_dependencies
         unless Helper.linux?
           UI.important 'u3d dependencies is Linux-only, and not needed on other OS'
@@ -168,8 +178,7 @@ module U3d
           run_args = [extra_run_args, run_args].flatten
         end
 
-        # we could support matching 5.3.6p3 if passed 5.3.6
-        unity = Installer.create.installed.find { |u| u.version == version }
+        unity = check_unity_presence(version: version)
         UI.user_error! "Unity version '#{version}' not found" unless unity
         runner.run(unity, run_args, raw_logs: options[:raw_logs])
       end
@@ -290,12 +299,13 @@ module U3d
       end
 
       def check_unity_presence(version: nil)
+        # idea: we could support matching 5.3.6p3 if passed 5.3.6
         installed = Installer.create.installed
         unity = installed.find { |u| u.version == version }
         if unity.nil?
           UI.verbose "Version #{version} of Unity is not installed yet"
         else
-          UI.verbose "Unity #{version} is installed at #{unity.path}"
+          UI.verbose "Unity #{version} is installed at #{unity.root_path}"
           return unity
         end
         nil
@@ -312,7 +322,7 @@ module U3d
             packages.delete('Unity')
 
             # FIXME: Move me to the WindowsInstaller
-            options[:installation_path] ||= unity.path if definition.os == :win
+            options[:installation_path] ||= unity.root_path if definition.os == :win
           end
           if unity.packages
             unity.packages.each do |pack|
@@ -328,6 +338,12 @@ module U3d
         end
         true
       end
+
+      def get_administrative_privileges(options)
+        U3dCore::Globals.use_keychain = true if options[:keychain] && Helper.mac?
+        UI.important 'Root privileges are required'
+        raise 'Could not get administrative privileges' unless U3dCore::CommandExecutor.has_admin_privileges?
+      end
     end
   end
   # rubocop:enable ClassLength

data/lib/u3d/commands_generator.rb

@@ -148,6 +148,16 @@ This command allows you to either:
         end
       end
 
+      command :uninstall do |c|
+        c.syntax = 'u3d uninstall [<version>]'
+        c.description = "Uninstall the specified Unity3d version."
+        c.option '-k', '--keychain', 'Gain privileges right through the keychain. [OSX only]'
+        c.example 'Uninstall Unity version 5.2.1f1', 'u3d uninstall 5.1.2f1'
+        c.action do |args, options|
+          Commands.uninstall(args: args, options: convert_options(options))
+        end
+      end
+
       command :dependencies do |c|
         c.syntax = 'u3d dependencies'
         c.summary = 'Installs Unity dependencies. [Linux only]'

data/lib/u3d/installation.rb

@@ -1,170 +1,181 @@
-## --- BEGIN LICENSE BLOCK ---
-# Copyright (c) 2016-present WeWantToKnow AS
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-## --- END LICENSE BLOCK ---
-
-require 'u3d/utils'
-
-module U3d
-  UNITY_DIR_CHECK = /Unity_\d+\.\d+\.\d+[a-z]\d+/
-  UNITY_DIR_CHECK_LINUX = /unity-editor-\d+\.\d+\.\d+[a-z]\d+\z/
-
-  class Installation
-    def self.create(path: nil)
-      if Helper.mac?
-        MacInstallation.new path
-      elsif Helper.linux?
-        LinuxInstallation.new path
-      else
-        WindowsInstallation.new path
-      end
-    end
-  end
-
-  class MacInstallation < Installation
-    attr_reader :path
-
-    require 'plist'
-
-    def initialize(path: nil)
-      @path = path
-    end
-
-    def version
-      plist['CFBundleVersion']
-    end
-
-    def default_log_file
-      "#{ENV['HOME']}/Library/Logs/Unity/Editor.log"
-    end
-
-    def exe_path
-      "#{path}/Contents/MacOS/Unity"
-    end
-
-    def packages
-      if Utils.parse_unity_version(version)[0].to_i <= 4
-        # Unity < 5 doesn't have packages
-        return []
-      end
-      fpath = File.expand_path('../PlaybackEngines', 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?
-      path =~ UNITY_DIR_CHECK
-    end
-
-    private
-
-    def plist
-      @plist ||= Plist.parse_xml("#{@path}/Contents/Info.plist")
-    end
-  end
-
-  class LinuxInstallation < Installation
-    attr_reader :path
-
-    def initialize(path: nil)
-      @path = path
-    end
-
-    def version
-      # I don't find an easy way to extract the version on Linux
-      require 'rexml/document'
-      fpath = "#{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
-      if (m = version.match(/^(.*)x(.*)Linux$/))
-        version = "#{m[1]}#{m[2]}"
-      end
-      version
-    end
-
-    def default_log_file
-      "#{ENV['HOME']}/.config/unity3d/Editor.log"
-    end
-
-    def exe_path
-      "#{path}/Editor/Unity"
-    end
-
-    def packages
-      false
-    end
-
-    def clean_install?
-      path =~ UNITY_DIR_CHECK_LINUX
-    end
-  end
-
-  class WindowsInstallation < Installation
-    attr_reader :path
-
-    def initialize(path: nil)
-      @path = path
-    end
-
-    def version
-      require 'rexml/document'
-      # For versions >= 5
-      fpath = "#{path}/Editor/Data/PlaybackEngines/windowsstandalonesupport/ivy.xml"
-      # For versions < 5
-      fpath = "#{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
-    end
-
-    def default_log_file
-      if @logfile.nil?
-        begin
-          loc_appdata = Utils.windows_local_appdata
-          log_dir = File.expand_path('Unity/Editor/', loc_appdata)
-          UI.important "Log directory (#{log_dir}) does not exist" unless Dir.exist? log_dir
-          @logfile = File.expand_path('Editor.log', log_dir)
-        rescue RuntimeError => ex
-          UI.error "Unable to retrieve the editor logfile: #{ex}"
-        end
-      end
-      @logfile
-    end
-
-    def exe_path
-      File.join(@path, 'Editor', 'Unity.exe')
-    end
-
-    def packages
-      # Unity prior to Unity5 did not have package
-      return [] if Utils.parse_unity_version(version)[0].to_i <= 4
-      fpath = "#{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 == '..') }
-    end
-
-    def clean_install?
-      path =~ UNITY_DIR_CHECK
-    end
-  end
-end
+## --- BEGIN LICENSE BLOCK ---
+# Copyright (c) 2016-present WeWantToKnow AS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+## --- END LICENSE BLOCK ---
+
+require 'u3d/utils'
+
+module U3d
+  UNITY_DIR_CHECK = /Unity_\d+\.\d+\.\d+[a-z]\d+/
+  UNITY_DIR_CHECK_LINUX = /unity-editor-\d+\.\d+\.\d+[a-z]\d+\z/
+
+  class Installation
+    attr_reader :root_path
+
+    def initialize(root_path: nil, path: nil)
+      @root_path = root_path
+      @path = path
+    end
+
+    def self.create(root_path: nil, path: nil)
+      UI.deprecated("path is deprecated. Use root_path instead") unless path.nil?
+      if Helper.mac?
+        MacInstallation.new(root_path: root_path, path: path)
+      elsif Helper.linux?
+        LinuxInstallation.new(root_path: root_path, path: path)
+      else
+        WindowsInstallation.new(root_path: root_path, path: path)
+      end
+    end
+  end
+
+  class MacInstallation < Installation
+    require 'plist'
+
+    def version
+      plist['CFBundleVersion']
+    end
+
+    def default_log_file
+      "#{ENV['HOME']}/Library/Logs/Unity/Editor.log"
+    end
+
+    def exe_path
+      "#{root_path}/Unity.app/Contents/MacOS/Unity"
+    end
+
+    def path
+      UI.deprecated("path is deprecated. Use root_path instead")
+      return @path if @path
+      "#{@root_path}/Unity.app"
+    end
+
+    def packages
+      if Utils.parse_unity_version(version)[0].to_i <= 4
+        # Unity < 5 doesn't have packages
+        return []
+      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?
+      !(root_path =~ UNITY_DIR_CHECK).nil?
+    end
+
+    private
+
+    def plist
+      @plist ||=
+        begin
+          fpath = "#{root_path}/Unity.app/Contents/Info.plist"
+          raise "#{fpath} doesn't exist" unless File.exist? fpath
+          Plist.parse_xml(fpath)
+        end
+    end
+  end
+
+  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
+      if (m = version.match(/^(.*)x(.*)Linux$/))
+        version = "#{m[1]}#{m[2]}"
+      end
+      version
+    end
+
+    def default_log_file
+      "#{ENV['HOME']}/.config/unity3d/Editor.log"
+    end
+
+    def exe_path
+      "#{root_path}/Editor/Unity"
+    end
+
+    def path
+      UI.deprecated("path is deprecated. Use root_path instead")
+      @root_path || @path
+    end
+
+    def packages
+      false
+    end
+
+    def clean_install?
+      !(root_path =~ UNITY_DIR_CHECK_LINUX).nil?
+    end
+  end
+
+  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
+    end
+
+    def default_log_file
+      if @logfile.nil?
+        begin
+          loc_appdata = Utils.windows_local_appdata
+          log_dir = File.expand_path('Unity/Editor/', loc_appdata)
+          UI.important "Log directory (#{log_dir}) does not exist" unless Dir.exist? log_dir
+          @logfile = File.expand_path('Editor.log', log_dir)
+        rescue RuntimeError => ex
+          UI.error "Unable to retrieve the editor logfile: #{ex}"
+        end
+      end
+      @logfile
+    end
+
+    def exe_path
+      File.join(@root_path, 'Editor', 'Unity.exe')
+    end
+
+    def path
+      UI.deprecated("path is deprecated. Use root_path instead")
+      @root_path || @path
+    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 == '..') }
+    end
+
+    def clean_install?
+      !(root_path =~ UNITY_DIR_CHECK).nil?
+    end
+  end
+end

data/lib/u3d/installer.rb

@@ -25,6 +25,7 @@ require 'u3d_core/core_ext/string'
 require 'u3d/installation'
 require 'fileutils'
 require 'file-tail'
+require 'pathname'
 
 module U3d
   DEFAULT_LINUX_INSTALL = '/opt/'.freeze
@@ -66,6 +67,11 @@ module U3d
         installer.install(file, version, installation_path: installation_path, info: info)
       end
     end
+
+    def self.uninstall(unity: nil)
+      installer = Installer.create
+      installer.uninstall(unity: unity)
+    end
   end
 
   class CommonInstaller
@@ -89,20 +95,18 @@ module U3d
 
   class MacInstaller
     def sanitize_install(unity, dry_run: false)
-      source_path = File.expand_path('..', unity.path)
+      source_path = unity.root_path
       parent = File.expand_path('..', source_path)
       new_path = File.join(parent, UNITY_DIR % unity.version)
-      source_path = source_path.shellescape
-      new_path = new_path.shellescape
 
-      command = "mv #{source_path} #{new_path}"
+      command = "mv #{source_path.shellescape} #{new_path.shellescape}"
 
       CommonInstaller.sanitize_install(source_path, new_path, command, dry_run: dry_run)
     end
 
     def installed
       paths = (list_installed_paths + spotlight_installed_paths).uniq
-      versions = paths.map { |path| MacInstallation.new(path: path) }
+      versions = paths.map { |path| MacInstallation.new(root_path: path) }
 
       # sorting should take into account stable/patch etc
       versions.sort! { |x, y| x.version <=> y.version }
@@ -132,9 +136,9 @@ module U3d
         destination_path = File.join(target_path, 'Applications', UNITY_DIR % version)
         FileUtils.mv temp_path, destination_path
       else
-        UI.verbose "Unity install for version #{version} found under #{unity.path}"
+        UI.verbose "Unity install for version #{version} found under #{unity.root_path}"
         begin
-          path = File.expand_path('..', unity.path)
+          path = unity.root_path
           move_to_temp = (temp_path != path)
           if move_to_temp
             UI.verbose "Temporary switching location of #{path} to #{temp_path} for installation purpose"
@@ -151,11 +155,22 @@ module U3d
       UI.success "Successfully installed package from #{file_path}"
     end
 
+    def uninstall(unity: nil)
+      UI.verbose("Uninstalling Unity at '#{unity.root_path}'...")
+      command = "rm -r #{unity.root_path.argescape}"
+      U3dCore::CommandExecutor.execute(command: command, admin: true)
+    rescue => e
+      UI.error "Failed to uninstall unity at #{unity.path}: #{e}"
+    else
+      UI.success "Successfully uninstalled '#{unity.root_path}'"
+    end
+
     private
 
     def list_installed_paths
       find = File.join(DEFAULT_MAC_INSTALL, 'Applications', 'Unity*', 'Unity.app')
       paths = Dir[find]
+      paths = paths.map { |u| Pathname.new(u).parent.to_s }
       UI.verbose "Found list_installed_paths: #{paths}"
       paths
     end
@@ -173,6 +188,7 @@ module U3d
       cmd = "mdfind \"#{mdfind_args}\" 2>/dev/null"
       UI.verbose cmd
       paths = `#{cmd}`.split("\n")
+      paths = paths.map { |u| Pathname.new(u).parent.to_s }
       UI.verbose "Found spotlight_installed_paths: #{paths}"
       paths
     end
@@ -180,20 +196,18 @@ module U3d
 
   class LinuxInstaller
     def sanitize_install(unity, dry_run: false)
-      source_path = File.expand_path(unity.path)
+      source_path = File.expand_path(unity.root_path)
       parent = File.expand_path('..', source_path)
       new_path = File.join(parent, UNITY_DIR_LINUX % unity.version)
-      source_path = source_path.shellescape
-      new_path = new_path.shellescape
 
-      command = "mv #{source_path} #{new_path}"
+      command = "mv #{source_path.shellescape} #{new_path.shellescape}"
 
       CommonInstaller.sanitize_install(source_path, new_path, command, dry_run: dry_run)
     end
 
     def installed
       find = File.join(DEFAULT_LINUX_INSTALL, 'unity-editor-*')
-      versions = Dir[find].map { |path| LinuxInstallation.new(path: path) }
+      versions = Dir[find].map { |path| LinuxInstallation.new(root_path: path) }
 
       # sorting should take into account stable/patch etc
       versions.sort! { |x, y| x.version <=> y.version }
@@ -237,27 +251,35 @@ module U3d
     else
       UI.success 'Installation successful'
     end
+
+    def uninstall(unity: nil)
+      UI.verbose("Uninstalling Unity at '#{unity.root_path}'...")
+      command = "rm -r #{unity.root_path}"
+      U3dCore::CommandExecutor.execute(command: command, admin: true)
+    rescue => e
+      UI.error "Failed to uninstall unity at #{unity.path}: #{e}"
+    else
+      UI.success "Successfully uninstalled '#{unity.root_path}'"
+    end
   end
 
   class WindowsInstaller
     def sanitize_install(unity, dry_run: false)
-      source_path = File.expand_path(unity.path)
+      source_path = File.expand_path(unity.root_path)
       parent = File.expand_path('..', source_path)
       new_path = File.join(parent, UNITY_DIR % unity.version)
 
       source_path.tr!('/', '\\')
       new_path.tr!('/', '\\')
-      source_path = source_path.argescape
-      new_path = new_path.argescape
 
-      command = "move #{source_path} #{new_path}"
+      command = "move #{source_path.argescape} #{new_path.argescape}"
 
       CommonInstaller.sanitize_install(source_path, new_path, command, dry_run: dry_run)
     end
 
     def installed
       find = File.join(DEFAULT_WINDOWS_INSTALL, 'Unity*', 'Editor', 'Uninstall.exe')
-      versions = Dir[find].map { |path| WindowsInstallation.new(path: File.expand_path('../..', path)) }
+      versions = Dir[find].map { |path| WindowsInstallation.new(root_path: File.expand_path('../..', path)) }
 
       # sorting should take into account stable/patch etc
       versions.sort! { |x, y| x.version <=> y.version }
@@ -296,6 +318,18 @@ module U3d
         UI.success "Successfully installed #{info['title']}"
       end
     end
+
+    def uninstall(unity: nil)
+      UI.verbose("Uninstalling Unity at '#{unity.root_path}'...")
+      uninstall_exe = File.join(unity.root_path, 'Editor', 'Uninstall.exe')
+      command = "#{uninstall_exe.argescape} /S"
+      UI.message("Although the uninstall process completed, it takes a few seconds before the files are actually removed")
+      U3dCore::CommandExecutor.execute(command: command, admin: true)
+    rescue => e
+      UI.error "Failed to uninstall unity at #{unity.path}: #{e}"
+    else
+      UI.success "Successfully uninstalled '#{unity.root_path}'"
+    end
   end
 
   class LinuxDependencies

data/lib/u3d/unity_versions.rb

@@ -78,6 +78,12 @@ module U3d
         return hash
       end
 
+      def fetch_version_paged(url, pattern)
+        U3d::Utils.get_ssl(url).scan(/\?page=\d+/).map do |page|
+          fetch_version("#{url}#{page}", pattern)
+        end.reduce({}, :merge)
+      end
+
       def fetch_betas(url, pattern)
         hash = {}
         data = Utils.get_ssl(url)
@@ -221,7 +227,7 @@ module U3d
           UI.success "Found #{current.count} releases." if current.count.nonzero?
           versions = versions.merge(current)
           UI.message 'Loading Unity patch releases'
-          current = UnityVersions.fetch_version(UNITY_PATCHES, MAC_DOWNLOAD)
+          current = UnityVersions.fetch_version_paged(UNITY_PATCHES, MAC_DOWNLOAD)
           UI.success "Found #{current.count} patch releases." if current.count.nonzero?
           versions = versions.merge(current)
           UI.message 'Loading Unity beta releases'
@@ -242,7 +248,7 @@ module U3d
           UI.success "Found #{current.count} releases." if current.count.nonzero?
           versions = versions.merge(current)
           UI.message 'Loading Unity patch releases'
-          current = UnityVersions.fetch_version(UNITY_PATCHES, WIN_DOWNLOAD)
+          current = UnityVersions.fetch_version_paged(UNITY_PATCHES, WIN_DOWNLOAD)
           UI.success "Found #{current.count} patch releases." if current.count.nonzero?
           versions = versions.merge(current)
           UI.message 'Loading Unity beta releases'

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.8'.freeze
+  VERSION = '1.0.9'.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.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -278,6 +278,7 @@ files:
 - docs/assets/u3d_run.png
 - docs/assets/u3d_run_current.png
 - docs/assets/u3d_sanitize.png
+- docs/assets/u3d_uninstall.png
 - examples/Example1/.gitignore
 - examples/Example1/Assets/Editor.meta
 - examples/Example1/Assets/Editor/EditorRun.cs
@@ -414,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: U3d