Skip to content

list/available: find Mac or Windows version based on the unity_shader package. Fixes #349 #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lacostej merged 1 commit into from
Mar 6, 2019
Merged

list/available: find Mac or Windows version based on the unity_shader package. Fixes #349 #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/u3d/unity_versions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ module UnityVersions
#####################################################
# Captures a version and its base url
LINUX_DOWNLOAD = %r{['"](https?:\/\/[\w/\.-]+/[0-9a-f\+]{12,13}\/)(.\/)?UnitySetup-(\d+\.\d+\.\d+\w\d+)['"]}
MAC_DOWNLOAD = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)MacEditorInstaller/[a-zA-Z0-9/\.\+]+-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
MAC_DOWNLOAD_2018_2 = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)UnityDownloadAssistant-(\d+\.\d+\.\d+\w\d+)\.?\w+"}
WIN_DOWNLOAD = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)Windows..EditorInstaller/[a-zA-Z0-9/\.\+]+-(\d+\.\d+\.\d+\w\d+)\.?\w+"}

MAC_WIN_SHADERS = %r{"(https?://[\w/\.-]+/[0-9a-f\+]{12,13}/)builtin_shaders-(\d+\.\d+\.\d+\w\d+)\.?\w+"}

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)"}
LINUX_DOWNLOAD_RECENT_FILE = %r{'(https?://beta\.unity3d\.com/download/[a-zA-Z0-9/\.\+]+/unity\-editor\-installer\-(\d+\.\d+\.\d+(?:x)?\w\d+).*\.sh)'}
Expand Down Expand Up @@ -287,7 +287,7 @@ def fetch_all_channels
class MacVersions
class << self
def list_available
versions_fetcher = VersionsFetcher.new(pattern: [MAC_DOWNLOAD, MAC_DOWNLOAD_2018_2])
versions_fetcher = VersionsFetcher.new(pattern: [MAC_WIN_SHADERS])
versions_fetcher.fetch_all_channels
versions_fetcher.fetch_json('darwin')
end
Expand All @@ -297,7 +297,7 @@ def list_available
class WindowsVersions
class << self
def list_available
versions_fetcher = VersionsFetcher.new(pattern: WIN_DOWNLOAD)
versions_fetcher = VersionsFetcher.new(pattern: MAC_WIN_SHADERS)
versions_fetcher.fetch_all_channels
versions_fetcher.fetch_json('win32')
end
Expand Down
19 changes: 7 additions & 12 deletions spec/support/download_archives.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,14 @@
## --- END LICENSE BLOCK ---

# Various fake download archives
def windows_archive
def macosx_windows_archive
%(
<li><a href="http://download.unity3d.com/download_unity/d3101c3b8468/Windows64EditorInstaller/UnitySetup64-1.2.3f1.exe">Éditeur 64 bits</a></li>
<li><a href="http://download.unity3d.com/download_unity/d3101c3b8468/Windows64EditorInstaller/UnitySetup64-1.3.5f1.exe">Éditeur 64 bits</a></li>
<li><a href="http://download.unity3d.com/download_unity/d3101c3b8468/Windows64EditorInstaller/UnitySetup64-2017.1.6f1.exe">Éditeur 64 bits</a></li>
)
end

def macosx_archive
%(
<li><a href="http://download.unity3d.com/download_unity/d3101c3b8468/MacEditorInstaller/Unity-1.2.3f1.pkg">Éditeur Unity</a></li>
<li><a href="http://download.unity3d.com/download_unity/d3101c3b8468/MacEditorInstaller/Unity-1.3.5f1.pkg">Éditeur Unity</a></li>
<li><a href="http://download.unity3d.com/download_unity/d3101c3b8468/MacEditorInstaller/Unity-2017.1.6f1.pkg">Éditeur Unity</a></li>
<li><a href="https://download.unity3d.com/download_unity/builtin_shaders-4.7.2.zip">Shaders</a></li>
<li><a href="https://download.unity3d.com/download_unity/builtin_shaders-4.7.2.zip">Shaders</a></li>
<li><a href="https://download.unity3d.com/download_unity/6bac21139588/builtin_shaders-5.6.6f2.zip">Shaders</a></li>
<li><a href="https://download.unity3d.com/download_unity/6bac21139588/builtin_shaders-5.6.6f2.zip">Shaders</a></li>
<li><a href="https://netstorage.unity3d.com/unity/9e14d22a41bb/builtin_shaders-2018.3.7f1.zip"></a></li>
<li><a href="https://netstorage.unity3d.com/unity/9e14d22a41bb/builtin_shaders-2018.3.7f1.zip"></a></li>
)
end

Expand Down
15 changes: 5 additions & 10 deletions spec/u3d/unity_versions_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,9 @@ def fake_linux_ini_data(size, url)
end

describe '.fetch_version' do
it 'reads versions for windows' do
expect(U3d::Utils).to receive(:get_ssl) { windows_archive }
expect(U3d::UnityVersions.fetch_version("foo", U3d::UnityVersions::WIN_DOWNLOAD).count).to eql 3
end

it 'reads versions for mac' do
expect(U3d::Utils).to receive(:get_ssl) { macosx_archive }
expect(U3d::UnityVersions.fetch_version("foo", U3d::UnityVersions::MAC_DOWNLOAD).count).to eql 3
it 'reads versions for windows and mac' do
expect(U3d::Utils).to receive(:get_ssl) { macosx_windows_archive }
expect(U3d::UnityVersions.fetch_version("foo", U3d::UnityVersions::MAC_WIN_SHADERS).count).to eql 2
end
end

Expand Down Expand Up @@ -80,8 +75,8 @@ def fake_linux_ini_data(size, url)
expect(U3d::UnityVersions.list_available(os: :win).count).to eql 0
end
it 'retrieves mac versions' do
expect(U3d::UnityVersions).to receive(:fetch_version_paged).at_least(6).times { {} }
expect(U3d::UnityVersions).to receive(:fetch_version).at_least(6).times { {} }
expect(U3d::UnityVersions).to receive(:fetch_version_paged).at_least(3).times { {} }
expect(U3d::UnityVersions).to receive(:fetch_version).at_least(3).times { {} }
expect(U3d::UnityVersions).to receive(:fetch_from_json).at_least(:once) { {} }
expect(U3d::UnityVersions.list_available(os: :mac).count).to eql 0
end
Expand Down