xcode-install 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d2ba944e260009634b80f9962d20322fd1f902
-  data.tar.gz: eeefd86022b7f7b2649c2d336b74edcb86fae74e
+  metadata.gz: fd49f95272394358487c0eed4f39884120ea0717
+  data.tar.gz: f6dc4b73867986caaa06811a2c91e90f6741ec21
 SHA512:
-  metadata.gz: 0c35741166c044efbf422f5957bcb8527b6935ed0c8177d02f890d6ef5ee2b96bf46bfe379931317f5aca5491a387b199b08fe4e099299b406d2944530e802e1
-  data.tar.gz: 58e3d669156fe437fb0519be9f2c08e2a987bda6c7c859cfd2c4019d6bd97a01fac06fc18ed5bd73bfe7712ebbde62e70794f8b33d428574d010b0523230ed74
+  metadata.gz: 97e5d324c43f25f40f1b1682eac49544f6d695f44f2e27a942eb9782b635fb770bc271ef5ec81c93f4ace20523fa4cb2ad6dfb7dee03a446923d04feccae663e
+  data.tar.gz: 3ee8b79219737c56cb9d9a8050be6bc88aa15d74b94329907ec742e11bf95341268517ce8aff4218a14192638b465441896bfbd77412fc28bae3615800d2dd9b

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 .DS_Store
+test

data/README.md

@@ -1,6 +1,6 @@
 # Xcode::Install
 
-[![Gem Version](http://img.shields.io/gem/v/xcode-install.svg?style=flat)](http://badge.fury.io/rb/xcode-install)
+[![Gem Version](http://img.shields.io/gem/v/xcode-install.svg?style=flat)](http://badge.fury.io/rb/xcode-install) [![CircleCI](https://circleci.com/gh/KrauseFx/xcode-install.svg?style=svg)](https://circleci.com/gh/KrauseFx/xcode-install)
 
 Install and update your Xcodes automatically.
 
@@ -9,6 +9,8 @@ $ gem install xcode-install
 $ xcversion install 6.3
 ```
 
+This tool uses the [Downloads for Apple Developer](https://developer.apple.com/download/more/) page.
+
 ## Installation
 
 ```
@@ -34,6 +36,8 @@ XCODE_INSTALL_USER
 XCODE_INSTALL_PASSWORD
 ```
 
+### List
+
 To list available versions:
 
 ```
@@ -41,17 +45,21 @@ $ xcversion list
 6.0.1
 6.1
 6.1.1
-6.2
+6.2 (installed)
 6.3
 ```
 
-Installed versions will be omitted and by default, only the latest major version is listed.
+Already installed versions are marked with `(installed)`.
+(Use `$ xcversion installed` to only list installed Xcodes with their path).
+
+To update the list of available versions, run:
 
-To list all available versions run
 ```
-$ xcversion list --all
+$ xcversion update
 ```
 
+### Install
+
 To install a certain version, simply:
 
 ```
@@ -64,7 +72,10 @@ Xcode 8
 Build version 6D570
 ```
 
-This will download and install that version of Xcode. It will also be automatically selected.
+This will download and install that version of Xcode. Then you can start it from `/Applications` as usual.
+The new version will also be automatically selected for CLI commands (see below).
+
+#### GMs and beta versions
 
 Note: GMs and beta versions usually have special names, e.g.
 
@@ -74,7 +85,24 @@ $ xcversion list
 7.1 beta
 ```
 
-they have to be installed using the full name, e.g. `xcversion install '7 GM seed'`.
+They have to be installed using the full name, e.g. `xcversion install '7 GM seed'`.
+
+### Select
+
+To see the currently selected version, run
+```
+$ xcversion selected
+```
+
+To select a version as active, run
+```
+$ xcversion select 8
+```
+
+To select a version as active and change the symlink at `/Applications/Xcode`, run
+```
+$ xcversion select 8 --symlink
+```
 
 ### Command Line Tools
 
@@ -127,6 +155,8 @@ versions on unindexed volumes.
 
 ## Thanks
 
+Thanks to [@neonichu](https://github.com/neonichu), the original (and best) author.
+
 [This][3] downloading script which has been used for some inspiration, also [this][4]
 for doing the installation. Additionally, many thanks to everyone who has contributed to this
 project, especially [@henrikhodne][6] and [@lacostej][7] for making XcodeInstall C extension free.
@@ -139,6 +169,18 @@ project, especially [@henrikhodne][6] and [@lacostej][7] for making XcodeInstall
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
+### Running tests
+
+```
+bundle exec rake spec
+```
+
+### Running code style linter
+
+```
+bundle exec rubocop -a
+```
+
 ## License
 
 This project is licensed under the terms of the MIT license. See the [LICENSE](LICENSE) file.

data/bin//360/237/216/211

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-load File.expand_path("../xcversion", __FILE__)
+load File.expand_path('../xcversion', __FILE__)

data/circle.yml

@@ -0,0 +1,7 @@
+machine:
+  xcode:
+    version: 9.0
+test:
+  override:
+    - bundle exec rake spec
+    - bundle exec rake rubocop

data/lib/xcode/install.rb

@@ -6,42 +6,116 @@ require 'json'
 require 'rubygems/version'
 require 'xcode/install/command'
 require 'xcode/install/version'
+require 'shellwords'
+require 'open3'
+require 'fileutils'
 
 module XcodeInstall
   CACHE_DIR = Pathname.new("#{ENV['HOME']}/Library/Caches/XcodeInstall")
   class Curl
     COOKIES_PATH = Pathname.new('/tmp/curl-cookies.txt')
 
-    def fetch(url, directory = nil, cookies = nil, output = nil, progress = true)
+    # @param url: The URL to download
+    # @param directory: The directory to download this file into
+    # @param cookies: Any cookies we should use for the download (used for auth with Apple)
+    # @param output: A PathName for where we want to store the file
+    # @param progress: parse and show the progress?
+    # @param progress_block: A block that's called whenever we have an updated progress %
+    #                        the parameter is a single number that's literally percent (e.g. 1, 50, 80 or 100)
+    # rubocop:disable Metrics/AbcSize
+    def fetch(url: nil,
+              directory: nil,
+              cookies: nil,
+              output: nil,
+              progress: nil,
+              progress_block: nil)
       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
 
+      # Piping over all of stderr over to a temporary file
+      # the file content looks like this:
+      #  0 4766M    0 6835k    0     0   573k      0  2:21:58  0:00:11  2:21:47  902k
+      # This way we can parse the current %
+      # The header is
+      #  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+      #
+      # Discussion for this on GH: https://github.com/KrauseFx/xcode-install/issues/276
+      # It was not easily possible to reimplement the same system using built-in methods
+      # especially when it comes to resuming downloads
+      # Piping over stderror to Ruby directly didn't work, due to the lack of flushing
+      # from curl. The only reasonable way to trigger this, is to pipe things directly into a
+      # local file, and parse that, and just poll that. We could get real time updates using
+      # the `tail` command or similar, however the download task is not time sensitive enough
+      # to make this worth the extra complexity, that's why we just poll and
+      # wait for the process to be finished
+      progress_log_file = File.join(CACHE_DIR, "progress.#{Time.now.to_i}.progress")
+      FileUtils.rm_f(progress_log_file)
+
       retry_options = ['--retry', '3']
-      progress = progress ? '--progress-bar' : '--silent'
-      command = ['curl', *options, *retry_options, '--location', '--continue-at', '-', progress, '--output', output, url].map(&:to_s)
+      command = [
+        'curl',
+        *options,
+        *retry_options,
+        '--location',
+        '--continue-at',
+        '-',
+        '--output',
+        output,
+        url
+      ].map(&:to_s)
+
+      command_string = command.collect(&:shellescape).join(' ')
+      command_string += " 2> #{progress_log_file}" # to not run shellescape on the `2>`
 
       # Run the curl command in a loop, retry when curl exit status is 18
       # "Partial file. Only a part of the file was transferred."
       # https://curl.haxx.se/mail/archive-2008-07/0098.html
       # https://github.com/KrauseFx/xcode-install/issues/210
       3.times do
-        io = IO.popen(command)
-        io.each { |line| puts line }
-        io.close
+        # Non-blocking call of Open3
+        # We're not using the block based syntax, as the bacon testing
+        # library doesn't seem to support writing tests for it
+        stdin, stdout, stderr, wait_thr = Open3.popen3(command_string)
+
+        # Poll the file and see if we're done yet
+        while wait_thr.alive?
+          sleep(0.5) # it's not critical for this to be real-time
+          next unless File.exist?(progress_log_file) # it might take longer for it to be created
+
+          progress_content = File.read(progress_log_file).split("\r").last
+
+          # Print out the progress for the CLI
+          if progress
+            print "\r#{progress_content}%"
+            $stdout.flush
+          end
+
+          # Call back the block for other processes that might be interested
+          matched = progress_content.match(/^\s*(\d+)/)
+          next unless matched.length == 2
+          percent = matched[1].to_i
+          progress_block.call(percent) if progress_block
+        end
 
-        exit_code = $?.exitstatus
-        return exit_code.zero? unless exit_code == 18
+        # as we're not making use of the block-based syntax
+        # we need to manually close those
+        stdin.close
+        stdout.close
+        stderr.close
+
+        return wait_thr.value.success? if wait_thr.value.success?
       end
       false
     ensure
       FileUtils.rm_f(COOKIES_PATH)
+      FileUtils.rm_f(progress_log_file)
     end
   end
 
+  # rubocop:disable Metrics/ClassLength
   class Installer
     attr_reader :xcodes
 
@@ -57,17 +131,47 @@ module XcodeInstall
       File.symlink?(SYMLINK_PATH) ? SYMLINK_PATH : nil
     end
 
-    def download(version, progress, url = nil)
-      return unless url || exist?(version)
-      xcode = seedlist.find { |x| x.name == version } unless url
+    def download(version, progress, url = nil, progress_block = nil)
+      xcode = find_xcode_version(version) if url.nil?
+      return if url.nil? && xcode.nil?
+
       dmg_file = Pathname.new(File.basename(url || xcode.path))
 
-      result = Curl.new.fetch(url || xcode.url, CACHE_DIR, url ? nil : spaceship.cookie, dmg_file, progress)
+      result = Curl.new.fetch(
+        url: url || xcode.url,
+        directory: CACHE_DIR,
+        cookies: url ? nil : spaceship.cookie,
+        output: dmg_file,
+        progress: progress,
+        progress_block: progress_block
+      )
       result ? CACHE_DIR + dmg_file : nil
     end
 
+    def find_xcode_version(version)
+      # By checking for the name and the version we have the best success rate
+      # Sometimes the user might pass
+      #   "4.3 for Lion"
+      # or they might pass an actual Gem::Version
+      #   Gem::Version.new("8.0.0")
+      # which should automatically match with "Xcode 8"
+
+      begin
+        parsed_version = Gem::Version.new(version)
+      rescue ArgumentError
+        nil
+      end
+
+      seedlist.each do |current_seed|
+        return current_seed if current_seed.name == version
+        return current_seed if parsed_version && current_seed.version == parsed_version
+      end
+      nil
+    end
+
     def exist?(version)
-      list_versions.include?(version)
+      return true if find_xcode_version(version)
+      false
     end
 
     def installed?(version)
@@ -80,6 +184,31 @@ module XcodeInstall
       end
     end
 
+    # Returns an array of `XcodeInstall::Xcode`
+    #   <XcodeInstall::Xcode:0x007fa1d451c390
+    #     @date_modified=2015,
+    #     @name="6.4",
+    #     @path="/Developer_Tools/Xcode_6.4/Xcode_6.4.dmg",
+    #     @url=
+    #      "https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_6.4/Xcode_6.4.dmg",
+    #     @version=Gem::Version.new("6.4")>,
+    #
+    # the resulting list is sorted with the most recent release as first element
+    def seedlist
+      @xcodes = Marshal.load(File.read(LIST_FILE)) if LIST_FILE.exist? && xcodes.nil?
+      all_xcodes = (xcodes || fetch_seedlist)
+
+      # We have to set the `installed` value here, as we might still use
+      # the cached list of available Xcode versions, but have a new Xcode
+      # installed in the mean-time
+      cached_installed_versions = installed_versions.map(&:bundle_version)
+      all_xcodes.each do |current_xcode|
+        current_xcode.installed = cached_installed_versions.include?(current_xcode.version)
+      end
+
+      all_xcodes.sort_by(&:version)
+    end
+
     def install_dmg(dmg_path, suffix = '', switch = true, clean = true)
       archive_util = '/System/Library/CoreServices/Applications/Archive Utility.app/Contents/MacOS/Archive Utility'
       prompt = "Please authenticate for Xcode installation.\nPassword: "
@@ -142,12 +271,13 @@ HELP
       FileUtils.rm_f(dmg_path) if clean
     end
 
-    def install_version(version, switch = true, clean = true, install = true, progress = true, url = nil, show_release_notes = true)
-      dmg_path = get_dmg(version, progress, url)
+    # rubocop:disable Metrics/ParameterLists
+    def install_version(version, switch = true, clean = true, install = true, progress = true, url = nil, show_release_notes = true, progress_block = nil)
+      dmg_path = get_dmg(version, progress, url, progress_block)
       fail Informative, "Failed to download Xcode #{version}." if dmg_path.nil?
 
       if install
-        install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean)
+        install_dmg(dmg_path, "-#{version.to_s.split(' ')[0]}", switch, clean)
       else
         puts "Downloaded Xcode #{version} to '#{dmg_path}'"
       end
@@ -199,14 +329,12 @@ HELP
         begin
           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)
+          raise 'The specified Apple developer account credentials are incorrect.'
         rescue Spaceship::Client::NoUserCredentialsError
-          $stderr.puts <<-HELP
+          raise <<-HELP
 Please provide your Apple developer account credentials via the
 XCODE_INSTALL_USER and XCODE_INSTALL_PASSWORD environment variables.
 HELP
-          exit(1)
         end
 
         if ENV.key?('XCODE_INSTALL_TEAM_ID')
@@ -225,7 +353,7 @@ HELP
       `sudo /usr/sbin/dseditgroup -o edit -t group -a staff _developer`
     end
 
-    def get_dmg(version, progress = true, url = nil)
+    def get_dmg(version, progress = true, url = nil, progress_block = nil)
       if url
         path = Pathname.new(url)
         return path if path.exist?
@@ -235,7 +363,7 @@ HELP
         return cache_path if cache_path.exist?
       end
 
-      download(version, progress, url)
+      download(version, progress, url, progress_block)
     end
 
     def fetch_seedlist
@@ -254,8 +382,7 @@ HELP
 
     def installed
       unless (`mdutil -s /` =~ /disabled/).nil?
-        $stderr.puts 'Please enable Spotlight indexing for /Applications.'
-        exit(1)
+        raise 'Please enable Spotlight indexing for /Applications.'
       end
 
       `mdfind "kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'" 2>/dev/null`.split("\n")
@@ -314,11 +441,6 @@ HELP
       links
     end
 
-    def seedlist
-      @xcodes = Marshal.load(File.read(LIST_FILE)) if LIST_FILE.exist? && xcodes.nil?
-      xcodes || fetch_seedlist
-    end
-
     def verify_integrity(path)
       puts `/usr/sbin/spctl --assess --verbose=4 --type execute #{path}`
       $?.exitstatus.zero?
@@ -375,8 +497,13 @@ HELP
       end
     end
 
-    def download(progress)
-      result = Curl.new.fetch(source, CACHE_DIR, nil, nil, progress)
+    def download(progress, progress_block = nil)
+      result = Curl.new.fetch(
+        url: source,
+        directory: CACHE_DIR,
+        progress: progress,
+        progress_block: progress_block
+      )
       result ? dmg_path : nil
     end
 
@@ -478,12 +605,16 @@ HELP
     end
 
     def approve_license
-      license_path = "#{@path}/Contents/Resources/English.lproj/License.rtf"
-      license_id = IO.read(license_path).match(/\bEA\d{4}\b/)
-      license_plist_path = '/Library/Preferences/com.apple.dt.Xcode.plist'
-      `sudo rm -rf #{license_plist_path}`
-      `sudo /usr/libexec/PlistBuddy -c "add :IDELastGMLicenseAgreedTo string #{license_id}" #{license_plist_path}`
-      `sudo /usr/libexec/PlistBuddy -c "add :IDEXcodeVersionForAgreedToGMLicense string #{@version}" #{license_plist_path}`
+      if Gem::Version.new(version) < Gem::Version.new('7.3')
+        license_path = "#{@path}/Contents/Resources/English.lproj/License.rtf"
+        license_id = IO.read(license_path).match(/\bEA\d{4}\b/)
+        license_plist_path = '/Library/Preferences/com.apple.dt.Xcode.plist'
+        `sudo rm -rf #{license_plist_path}`
+        `sudo /usr/libexec/PlistBuddy -c "add :IDELastGMLicenseAgreedTo string #{license_id}" #{license_plist_path}`
+        `sudo /usr/libexec/PlistBuddy -c "add :IDEXcodeVersionForAgreedToGMLicense string #{@version}" #{license_plist_path}`
+      else
+        `sudo #{@path}/Contents/Developer/usr/bin/xcodebuild -license accept`
+      end
     end
 
     def available_simulators
@@ -510,27 +641,46 @@ HELP
       `touch #{cache_dir}com.apple.dt.Xcode.InstallCheckCache_#{osx_build_version}_#{tools_version}`
     end
 
-    :private
-
-    def plist_entry(keypath)
-      `/usr/libexec/PlistBuddy -c "Print :#{keypath}" "#{path}/Contents/Info.plist"`.chomp
-    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`
       return '0.0' if output.nil? || output.empty? # ¯\_(ツ)_/¯
       output.split("\n").first.split(' ')[1]
     end
+
+    :private
+
+    def plist_entry(keypath)
+      `/usr/libexec/PlistBuddy -c "Print :#{keypath}" "#{path}/Contents/Info.plist"`.chomp
+    end
   end
 
+  # A version of Xcode we fetched from the Apple Developer Portal
+  # we can download & install.
+  #
+  # Sample object:
+  # <XcodeInstall::Xcode:0x007fa1d451c390
+  #    @date_modified=2015,
+  #    @name="6.4",
+  #    @path="/Developer_Tools/Xcode_6.4/Xcode_6.4.dmg",
+  #    @url=
+  #     "https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_6.4/Xcode_6.4.dmg",
+  #    @version=Gem::Version.new("6.4")>,
   class Xcode
     attr_reader :date_modified
+
+    # The name might include extra information like "for Lion" or "beta 2"
     attr_reader :name
     attr_reader :path
     attr_reader :url
     attr_reader :version
     attr_reader :release_notes_url
 
+    # Accessor since it's set by the `Installer`
+    attr_accessor :installed
+
+    alias installed? installed
+
     def initialize(json, url = nil, release_notes_url = nil)
       if url.nil?
         @date_modified = json['dateModified'].to_i

data/lib/xcode/install/select.rb

@@ -8,9 +8,14 @@ module XcodeInstall
         CLAide::Argument.new('VERSION', :true)
       ]
 
+      def self.options
+        [['--symlink', 'Update symlink in /Applications with selected Xcode']].concat(super)
+      end
+
       def initialize(argv)
         @installer = Installer.new
         @version = argv.shift_argument
+        @should_symlink = argv.flag?('symlink', false)
         super
       end
 
@@ -24,6 +29,7 @@ module XcodeInstall
       def run
         xcode = @installer.installed_versions.detect { |v| v.version == @version }
         `sudo xcode-select --switch #{xcode.path}`
+        @installer.symlink xcode.version if @should_symlink
       end
     end
   end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '2.3.1'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/spec/curl_spec.rb

@@ -18,7 +18,7 @@ module XcodeInstall
       curl = XcodeInstall::Curl.new
       result = nil
       XcodeInstall.silence_stderr do
-        result = curl.fetch('http://0.0.0.0/test')
+        result = curl.fetch(url: 'http://0.0.0.0/test')
       end
       result.should == false
     end

data/spec/install_spec.rb

@@ -12,26 +12,26 @@ module XcodeInstall
       end
 
       it 'downloads and installs' do
-        Installer.any_instance.expects(:download).with('6.3', true, nil).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', true, nil, nil).returns('/some/path')
         Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
         Command::Install.run(['6.3'])
       end
 
       it 'downloads and installs with custom HTTP URL' do
         url = 'http://yolo.com/xcode.dmg'
-        Installer.any_instance.expects(:download).with('6.3', true, url).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', true, url, nil).returns('/some/path')
         Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
         Command::Install.run(['6.3', "--url=#{url}"])
       end
 
       it 'downloads and installs and does not switch if --no-switch given' do
-        Installer.any_instance.expects(:download).with('6.3', true, nil).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', true, nil, nil).returns('/some/path')
         Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', false, true)
         Command::Install.run(['6.3', '--no-switch'])
       end
 
       it 'downloads without progress if switch --no-progress is given' do
-        Installer.any_instance.expects(:download).with('6.3', false, nil).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', false, nil, nil).returns('/some/path')
         Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
         Command::Install.run(['6.3', '--no-progress'])
       end

data/spec/installer_spec.rb

@@ -0,0 +1,100 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+module XcodeInstall
+  describe '#fetch' do
+    before do
+      client = mock
+      client.stubs(:cookie).returns('customCookie')
+      Spaceship::PortalClient.stubs(:login).returns(client)
+    end
+
+    it 'downloads the file and calls the `progress_block` with the percentage' do
+      installer = Installer.new
+
+      xcode = XcodeInstall::Xcode.new('name' => 'Xcode 9.3',
+                                      'files' => [{
+                                        'remotePath' => '/Developer_Tools/Xcode_9.3/Xcode_9.3.xip'
+                                      }])
+
+      installer.stubs(:fetch_seedlist).returns([xcode])
+
+      stdin = 'stdin'
+      stdout = 'stdout'
+      stderr = 'stderr'
+      wait_thr = 'wait_thr'
+
+      stdin.stubs(:close)
+      stdout.stubs(:close)
+      stderr.stubs(:close)
+
+      current_time = '123123'
+      Time.stubs(:now).returns(current_time)
+
+      xip_path = File.join(File.expand_path('~'), '/Library/Caches/XcodeInstall/Xcode_9.3.xip')
+      progress_log_file = File.join(File.expand_path('~'), "/Library/Caches/XcodeInstall/progress.#{current_time}.progress")
+
+      command = [
+        'curl',
+        '--cookie customCookie',
+        '--cookie-jar /tmp/curl-cookies.txt',
+        '--retry 3',
+        '--location',
+        '--continue-at -',
+        "--output #{xip_path}",
+        'https://developer.apple.com/devcenter/download.action\\?path\\=/Developer_Tools/Xcode_9.3/Xcode_9.3.xip',
+        "2> #{progress_log_file}"
+      ]
+      Open3.stubs(:popen3).with(command.join(' ')).returns([stdin, stdout, stderr, wait_thr])
+
+      wait_thr.stubs(:alive?).returns(true)
+
+      thr_value = 'thr_value'
+      wait_thr.stubs(:value).returns(thr_value)
+      thr_value.stubs(:success?).returns(true)
+
+      installer.stubs(:install_dmg).with(Pathname.new(xip_path), '-9.3', false, false)
+
+      Thread.new do
+        sleep(1)
+        File.write(progress_log_file, '  0 4766M    0 6835k    0     0   573k      0  2:21:58  0:00:11  2:21:47  902k')
+        sleep(1)
+        File.write(progress_log_file, ' 5 4766M    0 6835k    0     0   573k      0  2:21:58  0:00:11  2:21:47  902k')
+        sleep(1)
+        File.write(progress_log_file, '50 4766M    0 6835k    0     0   573k      0  2:21:58  0:00:11  2:21:47  902k')
+        sleep(1)
+        File.write(progress_log_file, '100 4766M    0 6835k    0     0   573k      0  2:21:58  0:00:11  2:21:47  902k')
+        sleep(0.5)
+        wait_thr.stubs(:alive?).returns(false)
+      end
+
+      percentages = []
+      installer.install_version(
+        # version: the version to install
+        '9.3',
+        # `should_switch
+        false,
+        # `should_clean`
+        false, # false for now for faster debugging
+        # `should_install`
+        true,
+        # `progress`
+        false,
+        # `url` is nil, as we don't have a custom source
+        nil,
+        # `show_release_notes` is `false`, as this is a non-interactive machine
+        false,
+        # `progress_block` be updated on the download progress
+        proc do |percent|
+          percentages << percent
+        end
+      )
+
+      percentages.each do |current_percent|
+        # Verify all reported percentages are between 0 and 100
+        current_percent.should.be.close(50, 50)
+      end
+      # Verify we got a good amount of percentages reported
+      percentages.count.should.be.close(8, 4)
+    end
+  end
+end

data/spec/prerelease_spec.rb

@@ -29,7 +29,7 @@ module XcodeInstall
     it 'can parse prereleases from 20150414' do
       prereleases = parse_prereleases('20150414')
 
-      prereleases.should == [Xcode.new_prerelease('6.4', '/Developer_Tools/Xcode_6.4_Beta/Xcode_6.4_beta.dmg', '/Developer_Tools/Xcode_6.4_Beta/Xcode_6.4_beta_Release_Notes.pdf')]
+      prereleases.should == [Xcode.new_prerelease('6.4 beta', '/Developer_Tools/Xcode_6.4_Beta/Xcode_6.4_beta.dmg', '/Developer_Tools/Xcode_6.4_Beta/Xcode_6.4_beta_Release_Notes.pdf')]
     end
 
     it 'can parse prereleases from 20150427' do

data/xcode-install.gemspec

@@ -21,7 +21,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  # CLI parsing
   spec.add_dependency 'claide', '>= 0.9.1', '< 1.1.0'
+
+  # contains spaceship, which is used for auth and dev portal interactions
   spec.add_dependency 'fastlane', '>= 2.1.0', '< 3.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -91,13 +91,13 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/xcversion
 - "bin/\U0001F389"
+- circle.yml
 - lib/xcode/install.rb
 - lib/xcode/install/cleanup.rb
 - lib/xcode/install/cli.rb
@@ -133,6 +133,7 @@ files:
 - spec/fixtures/yolo.json
 - spec/install_spec.rb
 - spec/installed_spec.rb
+- spec/installer_spec.rb
 - spec/json_spec.rb
 - spec/list_spec.rb
 - spec/prerelease_spec.rb
@@ -186,9 +187,9 @@ test_files:
 - spec/fixtures/yolo.json
 - spec/install_spec.rb
 - spec/installed_spec.rb
+- spec/installer_spec.rb
 - spec/json_spec.rb
 - spec/list_spec.rb
 - spec/prerelease_spec.rb
 - spec/spec_helper.rb
 - spec/uninstall_spec.rb
-has_rdoc: 

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-os: osx
-osx_image: xcode7.3
-rvm: 2.0.0-p598
-cache: bundler
-before_install:
-  - gem install bundler
-script:
-  - bundle exec rake spec
-  - bundle exec rake rubocop