xcode-install 1.1.0 → 2.0.0

data/lib/xcode/install.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'pathname'
+require 'rexml/document'
 require 'spaceship'
 require 'json'
 require 'rubygems/version'
@@ -12,19 +13,20 @@ module XcodeInstall
     COOKIES_PATH = Pathname.new('/tmp/curl-cookies.txt')
 
     def fetch(url, directory = nil, cookies = nil, output = nil, progress = true)
-      options = cookies.nil? ? '' : "-b '#{cookies}' -c #{COOKIES_PATH}"
-      # options += ' -vvv'
+      options = cookies.nil? ? [] : ['--cookie', cookies, '--cookie-jar', COOKIES_PATH]
+      # options << ' -vvv'
 
       uri = URI.parse(url)
       output ||= File.basename(uri.path)
       output = (Pathname.new(directory) + Pathname.new(output)) if directory
 
-      progress = progress ? '-#' : '-s'
-      command = "curl #{options} -L -C - #{progress} -o #{output} #{url}"
-      IO.popen(command).each do |fd|
-        puts(fd)
-      end
-      result = $CHILD_STATUS.to_i == 0
+      progress = progress ? '--progress-bar' : '--silent'
+      command = ['curl', *options, '--location', '--continue-at', '-', progress, '--output', output, url].map(&:to_s)
+      io = IO.popen(command)
+      io.each { |line| puts line }
+      io.close
+
+      result = $?.exitstatus == 0
 
       FileUtils.rm_f(COOKIES_PATH)
       result
@@ -47,11 +49,11 @@ module XcodeInstall
     end
 
     def download(version, progress, url = nil)
-      return unless exist?(version) || url
-      xcode = seedlist.find { |x| x.name == version }
+      return unless url || exist?(version)
+      xcode = seedlist.find { |x| x.name == version } unless url
       dmg_file = Pathname.new(File.basename(url || xcode.path))
 
-      result = Curl.new.fetch(url || xcode.url, CACHE_DIR, spaceship.cookie, dmg_file, progress)
+      result = Curl.new.fetch(url || xcode.url, CACHE_DIR, url ? nil : spaceship.cookie, dmg_file, progress)
       result ? CACHE_DIR + dmg_file : nil
     end
 
@@ -69,27 +71,34 @@ module XcodeInstall
       end
     end
 
-    def install_dmg(dmgPath, suffix = '', switch = true, clean = true)
+    def install_dmg(dmg_path, suffix = '', switch = true, clean = true)
+      prompt = "Please authenticate for Xcode installation.\nPassword: "
       xcode_path = "/Applications/Xcode#{suffix}.app"
 
-      `hdiutil mount -nobrowse -noverify #{dmgPath}`
-      puts 'Please authenticate for Xcode installation...'
-      source =  Dir.glob('/Volumes/Xcode/Xcode*.app').first
-
-      if source.nil?
-        out <<-HELP
-No `Xcode.app` found in DMG. Please remove #{dmgPath} if you suspect a corrupted
+      if dmg_path.extname == '.xip'
+        `xar -x -f #{dmg_path} --exclude 'Metadata'`
+        `sudo -p "#{prompt}" ditto -x Content /Applications`
+        `sudo -p "#{prompt}" mv /Applications/Xcode-beta.app "#{xcode_path}"`
+        FileUtils.rm_f('Content')
+      else
+        mount_dir = mount(dmg_path)
+        source = Dir.glob(File.join(mount_dir, 'Xcode*.app')).first
+
+        if source.nil?
+          out = <<-HELP
+No `Xcode.app` found in DMG. Please remove #{dmg_path} if you suspect a corrupted
 download or run `xcversion update` to see if the version you tried to install
 has been pulled by Apple. If none of this is true, please open a new GH issue.
 HELP
-        $stderr.puts out.gsub("\n", ' ')
-        return
-      end
+          $stderr.puts out.tr("\n", ' ')
+          return
+        end
 
-      `sudo ditto "#{source}" "#{xcode_path}"`
-      `umount "/Volumes/Xcode"`
+        `sudo -p "#{prompt}" ditto "#{source}" "#{xcode_path}"`
+        `umount "/Volumes/Xcode"`
+      end
 
-      if not verify_integrity(xcode_path)
+      unless verify_integrity(xcode_path)
         `sudo rm -f #{xcode_path}`
         return
       end
@@ -107,7 +116,7 @@ HELP
         puts `xcodebuild -version`
       end
 
-      FileUtils.rm_f(dmgPath) if clean
+      FileUtils.rm_f(dmg_path) if clean
     end
 
     def install_version(version, switch = true, clean = true, install = true, progress = true, url = nil)
@@ -116,7 +125,7 @@ HELP
 
       install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean) if install
 
-      open_release_notes_url(version)
+      open_release_notes_url(version) unless url
     end
 
     def open_release_notes_url(version)
@@ -125,14 +134,20 @@ HELP
       `open #{xcode.release_notes_url}` unless xcode.nil? || xcode.release_notes_url.nil?
     end
 
+    def list_annotated(xcodes_list)
+      installed = installed_versions.map(&:version)
+      xcodes_list.map { |x| installed.include?(x) ? "#{x} (installed)" : x }.join("\n")
+    end
+
     def list_current
       stable_majors = list_versions.reject { |v| /beta/i =~ v }.map { |v| v.split('.')[0] }.map { |v| v.split(' ')[0] }
       latest_stable_major = stable_majors.select { |v| v.length == 1 }.uniq.sort.last.to_i
-      list_versions.select { |v| v.split('.')[0].to_i >= latest_stable_major }.sort.join("\n")
+      current_versions = list_versions.select { |v| v.split('.')[0].to_i >= latest_stable_major }.sort
+      list_annotated(current_versions)
     end
 
     def list
-      list_versions.join("\n")
+      list_annotated(list_versions.sort)
     end
 
     def rm_list_cache
@@ -149,12 +164,20 @@ HELP
       File.absolute_path(File.readlink(current_symlink), SYMLINK_PATH.dirname) if current_symlink
     end
 
+    def mount(dmg_path)
+      plist = hdiutil('mount', '-plist', '-nobrowse', '-noverify', dmg_path.to_s)
+      document = REXML::Document.new(plist)
+      node = REXML::XPath.first(document, "//key[.='mount-point']/following-sibling::*[1]")
+      fail Informative, 'Failed to mount image.' unless node
+      node.text
+    end
+
     private
 
     def spaceship
       @spaceship ||= begin
         begin
-          Spaceship.login(ENV["XCODE_INSTALL_USER"], ENV["XCODE_INSTALL_PASSWORD"])
+          Spaceship.login(ENV['XCODE_INSTALL_USER'], ENV['XCODE_INSTALL_PASSWORD'])
         rescue Spaceship::Client::InvalidUserCredentialsError
           $stderr.puts 'The specified Apple developer account credentials are incorrect.'
           exit(1)
@@ -166,8 +189,8 @@ HELP
           exit(1)
         end
 
-        if ENV.key?("XCODE_INSTALL_TEAM_ID")
-          Spaceship.client.team_id = ENV["XCODE_INSTALL_TEAM_ID"]
+        if ENV.key?('XCODE_INSTALL_TEAM_ID')
+          Spaceship.client.team_id = ENV['XCODE_INSTALL_TEAM_ID']
         end
         Spaceship.client
       end
@@ -196,15 +219,15 @@ HELP
     end
 
     def fetch_seedlist
-      @xcodes = parse_seedlist(spaceship.send(:request, :get, '/services-account/QH65B2/downloadws/listDownloads.action', {
-        start: "0",
-        limit: "1000",
-        sort: "dateModified",
-        dir: "DESC",
-        searchTextField: "",
-        searchCategories: "",
-        search: "false",
-      }).body)
+      @xcodes = parse_seedlist(spaceship.send(:request, :get,
+                                              '/services-account/QH65B2/downloadws/listDownloads.action',
+                                              start: '0',
+                                              limit: '1000',
+                                              sort: 'dateModified',
+                                              dir: 'DESC',
+                                              searchTextField: '',
+                                              searchCategories: '',
+                                              search: 'false').body)
 
       names = @xcodes.map(&:name)
       @xcodes += prereleases.reject { |pre| names.include?(pre.name) }
@@ -238,23 +261,32 @@ HELP
     end
 
     def list_versions
-      installed = installed_versions.map(&:version)
-      seedlist.map(&:name).reject { |x| installed.include?(x) }
+      seedlist.map(&:name)
     end
 
     def prereleases
-      body=spaceship.send(:request, :get, '/xcode/download/').body
-      links=body.scan(/<a.+?href="(.+?.dmg)".*>(.*)<\/a>/)
+      body = spaceship.send(:request, :get, '/download/').body
+
+      links = body.scan(%r{<a.+?href="(.+?.dmg)".*>(.*)</a>})
       links = links.map do |link|
-        parent = link[0].scan(/path=(\/.*\/.*\/)/).first.first
+        parent = link[0].scan(%r{path=(/.*/.*/)}).first.first
         match = body.scan(/#{Regexp.quote(parent)}(.+?.pdf)/).first
         if match
-          link += [parent + match.first]
+          link + [parent + match.first]
         else
-          link += [nil]
+          link + [nil]
         end
       end
-      links.map { |pre| Xcode.new_prerelease(pre[1].strip.gsub(/.*Xcode /, ''), pre[0], pre[2]) }
+      links = links.map { |pre| Xcode.new_prerelease(pre[1].strip.gsub(/.*Xcode /, ''), pre[0], pre[2]) }
+
+      if links.count == 0
+        version = body.scan(/Xcode.* beta/).last.sub(/<.*?>/, '').gsub(/.*Xcode /, '')
+        link = body.scan(%r{<button .*"(.+?.xip)".*</button>}).first.first
+        notes = body.scan(%r{<a.+?href="(/go/\?id=xcode-.+?)".*>(.*)</a>}).first.first
+        links << Xcode.new(version, link, notes)
+      end
+
+      links
     end
 
     def seedlist
@@ -266,6 +298,20 @@ HELP
       puts `/usr/sbin/spctl --assess --verbose=4 --type execute #{path}`
       $?.exitstatus == 0
     end
+
+    def hdiutil(*args)
+      io = IO.popen(['hdiutil', *args])
+      result = io.read
+      io.close
+      unless $?.exitstatus == 0
+        file_path = args[-1]
+        if `file -b #{file_path}`.start_with?('HTML')
+          fail Informative, "Failed to mount #{file_path}, logging into your account from a browser should tell you what is going wrong."
+        end
+        fail Informative, 'Failed to invoke hdiutil.'
+      end
+      result
+    end
   end
 
   class Simulator
@@ -327,7 +373,7 @@ HELP
 
     def prepare_package
       puts 'Mounting DMG'
-      mount_location = `hdiutil mount -nobrowse -noverify #{dmg_path}`.scan(/\/Volumes.*\n/).first.chomp
+      mount_location = Installer.new.mount(dmg_path)
       puts 'Expanding pkg'
       expanded_pkg_path = CACHE_DIR + identifier
       FileUtils.rm_rf(expanded_pkg_path)
@@ -382,7 +428,7 @@ HELP
     end
 
     def version
-      @version ||= get_version
+      @version ||= fetch_version
     end
 
     def bundle_version
@@ -413,7 +459,9 @@ HELP
     end
 
     def install_components
-      `sudo installer -pkg #{@path}/Contents/Resources/Packages/MobileDevice.pkg -target /`
+      Dir.glob("#{@path}/Contents/Resources/Packages/*.pkg").each do |pkg|
+        `sudo installer -pkg #{pkg} -target /`
+      end
       osx_build_version = `sw_vers -buildVersion`.chomp
       tools_version = `/usr/libexec/PlistBuddy -c "Print :ProductBuildVersion" "#{@path}/Contents/version.plist"`.chomp
       cache_dir = `getconf DARWIN_USER_CACHE_DIR`.chomp
@@ -426,7 +474,7 @@ HELP
       `/usr/libexec/PlistBuddy -c "Print :#{keypath}" "#{path}/Contents/Info.plist"`.chomp
     end
 
-    def get_version
+    def fetch_version
       output = `DEVELOPER_DIR='' "#{@path}/Contents/Developer/usr/bin/xcodebuild" -version`
       return '0.0' if output.nil? # ¯\_(ツ)_/¯
       output.split("\n").first.split(' ')[1]
@@ -441,13 +489,21 @@ HELP
     attr_reader :version
     attr_reader :release_notes_url
 
-    def initialize(json)
-      @date_modified = json['dateModified'].to_i
-      @name = json['name'].gsub(/^Xcode /, '')
-      @path = json['files'].first['remotePath']
-      url_prefix = 'https://developer.apple.com/devcenter/download.action?path='
-      @url = "#{url_prefix}#{@path}"
-      @release_notes_url = "#{url_prefix}#{json['release_notes_path']}" if json['release_notes_path']
+    def initialize(json, url = nil, release_notes_url = nil)
+      if url.nil?
+        @date_modified = json['dateModified'].to_i
+        @name = json['name'].gsub(/^Xcode /, '')
+        @path = json['files'].first['remotePath']
+        url_prefix = 'https://developer.apple.com/devcenter/download.action?path='
+        @url = "#{url_prefix}#{@path}"
+        @release_notes_url = "#{url_prefix}#{json['release_notes_path']}" if json['release_notes_path']
+      else
+        @name = json
+        @path = url.split('/').last
+        url_prefix = 'https://developer.apple.com/'
+        @url = "#{url_prefix}#{url}"
+        @release_notes_url = "#{url_prefix}#{release_notes_url}"
+      end
 
       begin
         @version = Gem::Version.new(@name.split(' ')[0])
@@ -467,7 +523,6 @@ HELP
 
     def self.new_prerelease(version, url, release_notes_path)
       new('name' => version,
-          'dateModified' => Time.now.to_i,
           'files' => [{ 'remotePath' => url.split('=').last }],
           'release_notes_path' => release_notes_path)
     end

data/spec/cli_spec.rb

@@ -4,7 +4,7 @@ module XcodeInstall
   describe Command::InstallCLITools do
     it 'fails if tools are already installed' do
       Command::InstallCLITools.any_instance.expects(:installed?).returns(true)
-      lambda { Command::InstallCLITools.run }.should.raise(SystemExit)
+      -> { Command::InstallCLITools.run }.should.raise(SystemExit)
     end
 
     it 'runs if tools are not installed' do

data/spec/curl_spec.rb

@@ -0,0 +1,26 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+module XcodeInstall
+  def self.silence_stderr
+    begin
+      orig_stderr = $stderr.clone
+      $stderr.reopen File.new('/dev/null', 'w')
+      retval = yield
+    ensure
+      $stderr.reopen orig_stderr
+    end
+    retval
+  end
+
+  describe Curl do
+    it 'reports failure' do
+      `true`
+      curl = XcodeInstall::Curl.new
+      result = nil
+      XcodeInstall.silence_stderr do
+        result = curl.fetch('http://0.0.0.0/test')
+      end
+      result.should == false
+    end
+  end
+end