xcode-install 2.6.8 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b5d7d3549fb76b669aa736ff9c2cf5e0892131d2c8624e38555cac486f35e1
-  data.tar.gz: 0e2e82a56b815efe8659d3b00c26e426e720877fa7107fd3cc47e56ed7532ce3
+  metadata.gz: f5f95c1ec6494fb1482c6862a786fd3f149327096468dbfd01886d6a320ab31f
+  data.tar.gz: ef0e89795d7a5169a97adb29467025693644db1a8805e1ae395cd76066ae2569
 SHA512:
-  metadata.gz: e0924a4c6ab8e04733f66797cd52753e7f829cfc7d2e190ee9dfb0afe3b74d52e2bd5b835cecc038612417d82713ea96eb718a561ec3fb135c0e5a0519f0893a
-  data.tar.gz: b4664fae73d216b4e2b6a6ef82bd67ffdfd642f5420ed04b22fbb2706de6159a87bf236d2e9b1c1c622f559d053a26f6a56ed0133e002a8584577c1c6226afdc
+  metadata.gz: 4fa023f63479190d92da8f7a54d9ac0a9556eab534e4e4ea4a784f6bbd10837678910570dd9665d409214d52e47432ebafa99aaae0a9022097bde4540d42390f
+  data.tar.gz: 73c28ae14d7081a62376ce4611cae869987b8e2681325770b20d8d5f3be153abc02c7c0e3b94828c703ab786dd5960a62c6f3b097b162b82be39cf197e031d99

data/.github/workflows/ci.yml

@@ -1,12 +1,12 @@
 name: "CI"
-on: [pull_request]
+on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6"]
+        ruby: ["2.5", "2.6", "2.7"]
 
     runs-on: macos-latest
     steps:
@@ -19,16 +19,22 @@ jobs:
     # Show env
     - name: Show macOS version
       run: sw_vers
-    - name: Show ruby version
+    - name: Show env versions
       run: |
         ruby --version
         bundler --version
+        echo $HOME
     
     # Prepare
-    - name: Install bundler 1.7
-      run: gem install bundler -v "~> 1.7"
+    - name: Install bundler 2.2.14
+      run: gem install bundler -v "~> 2.2.14"
     - name: Install ruby dependencies
-      run: bundle install -j4 --clean --path=vendor
+      run: |
+        bundle config --local clean 'true'
+        bundle config --local path '.vendor'
+        bundle config --local jobs 8
+        bundle config --local without 'system_tests'
+        bundle install
 
     - name: Run test
       run: bundle exec rake spec

data/.gitignore

@@ -14,3 +14,4 @@
 mkmf.log
 .DS_Store
 test
+.vendor

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) [![CircleCI](https://circleci.com/gh/xcpretty/xcode-install.svg?style=svg)](https://circleci.com/gh/xcpretty/xcode-install)
+[![Gem Version](http://img.shields.io/gem/v/xcode-install.svg?style=flat)](http://badge.fury.io/rb/xcode-install) [![Build Status](https://github.com/xcpretty/xcode-install/actions/workflows/ci.yml/badge.svg)](https://github.com/xcpretty/xcode-install/actions)
 
 Install and update your Xcodes automatically.
 
@@ -87,6 +87,16 @@ $ xcversion list
 
 They have to be installed using the full name, e.g. `xcversion install '7 GM seed'`.
 
+#### `.xcode-version`
+
+We recommend the creation of a `.xcode-version` file to explicitly declare and store the Xcode version to be used by your CI environment as well as your team.
+
+```
+12.5
+```
+
+Read [the proposal](/XCODE_VERSION.md) of `.xcode-version`.
+
 ### Select
 
 To see the currently selected version, run
@@ -151,7 +161,7 @@ to a dialog popping up. Feel free to dupe [the radar][5]. 📡
 
 XcodeInstall normally relies on the Spotlight index to locate installed versions of Xcode. If you use it while
 indexing is happening, it might show inaccurate results and it will not be able to see installed
-versions on unindexed volumes. 
+versions on unindexed volumes.
 
 To workaround the Spotlight limitation, XcodeInstall searches `/Applications` folder to locate Xcodes when Spotlight is disabled on the machine, or when Spotlight query for Xcode does not return any results. But it still won't work if your Xcodes are not located under `/Applications` folder.
 
@@ -165,7 +175,7 @@ project, especially [@henrikhodne][6] and [@lacostej][7] for making XcodeInstall
 
 ## Contributing
 
-1. Fork it ( https://github.com/KrauseFx/xcode-install/fork )
+1. Fork it ( https://github.com/xcpretty/xcode-install/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/XCODE_VERSION.md

@@ -0,0 +1,49 @@
+# `.xcode-version`
+
+## Introduction
+
+This is a proposal for a new standard for the iOS community: a text-based file that defines the Xcode version to use to compile and package a given iOS project.
+
+This will be used by this gem, however it's designed in a way that any tool in the future can pick it up, no matter if it's Ruby based, Swift, JavaScript, etc.
+
+Similar to the [.ruby-version file](https://en.wikipedia.org/wiki/Ruby_Version_Manager), the `.xcode-version` file allows any CI system or IDE to automatically install and switch to the Xcode version needed for a given project to successfully compile your project.
+
+## Filename
+
+The filename must always be `.xcode-version`.
+
+## File location
+
+The file must be located in the same directory as your Xcode project/workspace, and you should add it to your versioning system (e.g. git).
+
+## File content
+
+The file content must be a simple string in a text file. The file may or may not end with an empty new line, this gem is responsible for stripping out the trailing `\n` (if used).
+
+### Sample files
+
+To define an official Xcode release
+
+```
+9.3
+```
+
+```
+7.2.1
+```
+
+You can also use pre-releases
+
+```
+11.5 GM Seed
+```
+
+```
+12 beta 6
+```
+
+Always following the same version naming listed by `xcversion list`.
+
+**Note**: Be aware that pre-releases might be eventually taken down from Apple's servers, meaning that it won't allow you to have fully reproducible builds as you won't be able to download the Xcode release once it's gone.
+
+It is recommended to only use non-beta releases in an `.xcode-version` file to have fully reproducible builds that you'll be able to run in a few years also.

data/lib/xcode/install.rb

@@ -26,7 +26,6 @@ module XcodeInstall
     # @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)
     # @param retry_download_count: A count to retry the downloading Xcode dmg/xip
-    # rubocop:disable Metrics/AbcSize
     def fetch(url: nil,
               directory: nil,
               cookies: nil,
@@ -81,37 +80,7 @@ module XcodeInstall
       # https://curl.haxx.se/mail/archive-2008-07/0098.html
       # https://github.com/KrauseFx/xcode-install/issues/210
       retry_download_count.times do
-        # 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 && matched.length == 2
-          percent = matched[1].to_i
-          progress_block.call(percent) if progress_block
-        end
-
-        # as we're not making use of the block-based syntax
-        # we need to manually close those
-        stdin.close
-        stdout.close
-        stderr.close
-
+        wait_thr = poll_file(command_string: command_string, progress_log_file: progress_log_file, progress: progress, progress_block: progress_block)
         return wait_thr.value.success? if wait_thr.value.success?
       end
       false
@@ -119,6 +88,41 @@ module XcodeInstall
       FileUtils.rm_f(COOKIES_PATH)
       FileUtils.rm_f(progress_log_file)
     end
+
+    def poll_file(command_string:, progress_log_file:, progress: nil, progress_block: nil)
+      # 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 && matched.length == 2
+        percent = matched[1].to_i
+        progress_block.call(percent) if progress_block
+      end
+
+      # as we're not making use of the block-based syntax
+      # we need to manually close those
+      stdin.close
+      stdout.close
+      stderr.close
+
+      wait_thr
+    end
   end
 
   # rubocop:disable Metrics/ClassLength

data/lib/xcode/install/install.rb

@@ -24,7 +24,7 @@ module XcodeInstall
       def initialize(argv)
         @installer = Installer.new
         @version = argv.shift_argument
-        @version ||= File.read('.xcode-version') if File.exist?('.xcode-version')
+        @version ||= File.read('.xcode-version').strip if File.exist?('.xcode-version')
         @url = argv.option('url')
         @force = argv.flag?('force', false)
         @should_clean = argv.flag?('clean', true)

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '2.6.8'.freeze
+  VERSION = '2.7.0'.freeze
 end

data/xcode-install.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   # 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'
+  spec.add_development_dependency 'bundler', '>= 2.0.0', '< 3.0.0'
   spec.add_development_dependency 'rake', '>= 12.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.7.0
 platform: ruby
 authors:
 - Boris Bügling
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -54,16 +54,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +93,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitattributes"
 - ".github/workflows/ci.yml"
 - ".gitignore"
@@ -97,6 +102,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- XCODE_VERSION.md
 - bin/xcversion
 - "bin/\U0001F389"
 - lib/xcode/install.rb
@@ -145,7 +151,7 @@ homepage: https://github.com/neonichu/xcode-install
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -161,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Xcode installation manager.
 test_files:

data/.circleci/config.yml

@@ -1,33 +0,0 @@
-version: 2
-
-jobs:
-  build:
-    macos:
-      xcode: "9.4.1"
-    working_directory: ~/xcode-install
-    shell: /bin/bash --login -eo pipefail
-    steps:
-      - checkout
-
-      # See Also: https://discuss.circleci.com/t/circleci-2-0-ios-error-installing-gems/23291/4
-      - run:
-          name: Set Ruby Version
-          command: echo "ruby-2.4" > ~/.ruby-version
-
-      - run:
-          name: Install ruby dependencies
-          command: bundle install
-
-      - run:
-          name: Run test
-          command: bundle exec rake spec
-
-      - run:
-          name: Run lint
-          command: bundle exec rake rubocop
-
-workflows:
-  version: 2
-  build_and_test:
-    jobs:
-      - build