Skip to content
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

improve version fetching command performance by reading Xcode's version.plist instead of using the xcodebuild command #427

Merged
merged 3 commits into from
Jun 15, 2021
Merged

improve version fetching command performance by reading Xcode's version.plist instead of using the xcodebuild command #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b986f7
Use the version.plist instead of the xcodebuild command to detect Xco…
aomathwift Apr 21, 2021
9f68f58
Update spec
aomathwift Apr 21, 2021
81f6ee6
Merge remote-tracking branch 'upstream/master' into fetch-version-faster
aomathwift Jun 13, 2021
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
5 changes: 2 additions & 3 deletions lib/xcode/install.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,11 +710,10 @@ def install_components
`touch #{cache_dir}com.apple.dt.Xcode.InstallCheckCache_#{osx_build_version}_#{tools_version}`
end

# This method might take a few ms, this could be improved by implementing https://github.com/KrauseFx/xcode-install/issues/273
def fetch_version
output = `DEVELOPER_DIR='' "#{@path}/Contents/Developer/usr/bin/xcodebuild" -version`
output = `/usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" "#{@path}/Contents/version.plist"`
return '0.0' if output.nil? || output.empty? # ¯\_(ツ)_/¯
output.split("\n").first.split(' ')[1]
output.sub("\n", '')
end

def verify_integrity
Expand Down
4 changes: 2 additions & 2 deletions spec/installed_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ module XcodeInstall

describe InstalledXcode do
it 'finds the current Xcode version with whitespace chars' do
InstalledXcode.any_instance.expects(:`).with("DEVELOPER_DIR='' \"#{xcode_path}/Contents/Developer/usr/bin/xcodebuild\" -version").returns("Xcode 6.3.1\nBuild version 6D1002")
InstalledXcode.any_instance.expects(:`).with("/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"#{xcode_path}/Contents/version.plist\"").returns('6.3.1')
installed = InstalledXcode.new(xcode_path)
installed.version.should == '6.3.1'
end

it 'is robust against broken Xcode installations' do
InstalledXcode.any_instance.expects(:`).with("DEVELOPER_DIR='' \"#{xcode_path}/Contents/Developer/usr/bin/xcodebuild\" -version").returns(nil)
InstalledXcode.any_instance.expects(:`).with("/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"#{xcode_path}/Contents/version.plist\"").returns(nil)
installed = InstalledXcode.new(xcode_path)
installed.version.should == '0.0'
end
Expand Down