lib/run_loop/xctools.rb in run_loop-1.0.0.pre7 vs lib/run_loop/xctools.rb in run_loop-1.0.0.pre9

- old
+ new

@@ -18,27 +18,27 @@ # Returns a version instance for `Xcode 6.0`; used to check for the # availability of features and paths to various items on the filesystem. # # @return [RunLoop::Version] 6.0 def v60 - @xc60 ||= Version.new('6.0') + @xc60 ||= RunLoop::Version.new('6.0') end # Returns a version instance for `Xcode 5.1`; used to check for the # availability of features and paths to various items on the filesystem. # # @return [RunLoop::Version] 5.1 def v51 - @xc51 ||= Version.new('5.1') + @xc51 ||= RunLoop::Version.new('5.1') end # Returns a version instance for `Xcode 5.0`; ; used to check for the # availability of features and paths to various items on the filesystem. # # @return [RunLoop::Version] 5.0 def v50 - @xc50 ||= Version.new('5.0') + @xc50 ||= RunLoop::Version.new('5.0') end # Are we running Xcode 6 or above? # # @return [Boolean] `true` if the current Xcode version is >= 6.0 @@ -58,11 +58,11 @@ # @return [RunLoop::Version] The current version of Xcode as reported by # `xcrun xcodebuild -version`. def xcode_version @xcode_version ||= lambda { xcode_build_output = `xcrun xcodebuild -version`.split(/\s/)[1] - Version.new(xcode_build_output) + RunLoop::Version.new(xcode_build_output) }.call end # Returns the path to the current developer directory. # @@ -113,11 +113,11 @@ @instruments_version ||= lambda { # Xcode 6 can print out some very strange output, so we have to retry. Retriable.retriable({:tries => 5}) do Open3.popen3("#{instruments}") do |_, _, stderr, _| version_str = stderr.read.chomp.split(/\s/)[2] - Version.new(version_str) + RunLoop::Version.new(version_str) end end }.call when :sims @instruments_sims ||= lambda { @@ -171,14 +171,14 @@ # # @return [Boolean] true if the version is >= 5.* def instruments_supports_hyphen_s?(version=instruments(:version)) @instruments_supports_hyphen_s ||= lambda { if version.is_a? String - _version = Version.new(version) + _version = RunLoop::Version.new(version) else _version = version end - _version >= Version.new('5.1') + _version >= RunLoop::Version.new('5.1') }.call end end end