xcode-install 2.3.1 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94d2ba944e260009634b80f9962d20322fd1f902
-  data.tar.gz: eeefd86022b7f7b2649c2d336b74edcb86fae74e
+SHA256:
+  metadata.gz: 0fea81231fe9d81aed11e53e9340d8749cb90b12b61cf455ef216c4659beaf85
+  data.tar.gz: d385404265a3453ff25f3f6c2c532235ca7ed9769e0c1b808c64749f930f6eca
 SHA512:
-  metadata.gz: 0c35741166c044efbf422f5957bcb8527b6935ed0c8177d02f890d6ef5ee2b96bf46bfe379931317f5aca5491a387b199b08fe4e099299b406d2944530e802e1
-  data.tar.gz: 58e3d669156fe437fb0519be9f2c08e2a987bda6c7c859cfd2c4019d6bd97a01fac06fc18ed5bd73bfe7712ebbde62e70794f8b33d428574d010b0523230ed74
+  metadata.gz: 4147ef290648e0f0ac2122be32a2cc0d4fd26d3c9509767661107527fe20e58534bab89c505d992a876202a40effa7913b3901e24f504952839e5f416d011503
+  data.tar.gz: fa470926afe6472b552bd7be37619542024913101997df6e00a47064714199594c6c0dafbf1a41c07aa79ea1cb22e35f3cca75a1bbce8bb068b9453ec7bc6a6d

data/.circleci/config.yml

@@ -0,0 +1,33 @@
+version: 2
+
+jobs:
+  build:
+    macos:
+      xcode: "9.0"
+    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

data/.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: "CI"
+on: [pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6"]
+
+    runs-on: macos-latest
+    steps:
+    # Setup env
+    - uses: actions/checkout@v2
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+
+    # Show env
+    - name: Show macOS version
+      run: sw_vers
+    - name: Show ruby version
+      run: |
+        ruby --version
+        bundler --version
+    
+    # Prepare
+    - name: Install bundler 1.7
+      run: gem install bundler -v "~> 1.7"
+    - name: Install ruby dependencies
+      run: bundle install -j4 --clean --path=vendor
+
+    - name: Run test
+      run: bundle exec rake spec
+    - name: Run lint
+      run: bundle exec rake rubocop

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/xcpretty/xcode-install.svg?style=svg)](https://circleci.com/gh/xcpretty/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
 
@@ -121,12 +149,16 @@ XcodeInstall automatically installs additional components so that it is immediat
 commandline. Unfortunately, Xcode will load third-party plugins even in that situation, which leads
 to a dialog popping up. Feel free to dupe [the radar][5]. 📡
 
-XcodeInstall uses the Spotlight index to locate installed versions of Xcode. If you use it while
+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.
 
 ## 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 +171,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/lib/xcode/install/cli.rb

@@ -5,7 +5,10 @@ module XcodeInstall
       self.summary = 'Installs Xcode Command Line Tools.'
 
       def run
-        fail Informative, 'Xcode CLI Tools are already installed.' if installed?
+        if installed?
+          print 'Xcode CLI Tools are already installed.'
+          exit(0)
+        end
         install
       end
 

data/lib/xcode/install/install.rb

@@ -17,12 +17,14 @@ module XcodeInstall
          ['--no-install', 'Only download DMG, but do not install it.'],
          ['--no-progress', 'Don’t show download progress.'],
          ['--no-clean', 'Don’t delete DMG after installation.'],
-         ['--no-show-release-notes', 'Don’t open release notes in browser after installation.']].concat(super)
+         ['--no-show-release-notes', 'Don’t open release notes in browser after installation.'],
+         ['--retry-download-count', 'Count of retrying download when curl is failed.']].concat(super)
       end
 
       def initialize(argv)
         @installer = Installer.new
         @version = argv.shift_argument
+        @version ||= File.read('.xcode-version') if File.exist?('.xcode-version')
         @url = argv.option('url')
         @force = argv.flag?('force', false)
         @should_clean = argv.flag?('clean', true)
@@ -30,6 +32,7 @@ module XcodeInstall
         @should_switch = argv.flag?('switch', true)
         @progress = argv.flag?('progress', true)
         @show_release_notes = argv.flag?('show-release-notes', true)
+        @retry_download_count = argv.option('retry-download-count', '3')
         super
       end
 
@@ -37,14 +40,18 @@ module XcodeInstall
         super
 
         help! 'A VERSION argument is required.' unless @version
-        fail Informative, "Version #{@version} already installed." if @installer.installed?(@version) && !@force
+        if @installer.installed?(@version) && !@force
+          print "Version #{@version} already installed."
+          exit(0)
+        end
         fail Informative, "Version #{@version} doesn't exist." unless @url || @installer.exist?(@version)
         fail Informative, "Invalid URL: `#{@url}`" unless !@url || @url =~ /\A#{URI.regexp}\z/
+        fail Informative, "Invalid Retry: `#{@retry_download_count} is not positive number.`" if (@retry_download_count =~ /\A[0-9]*\z/).nil?
       end
 
       def run
         @installer.install_version(@version, @should_switch, @should_clean, @should_install,
-                                   @progress, @url, @show_release_notes)
+                                   @progress, @url, @show_release_notes, nil, @retry_download_count.to_i)
       end
     end
   end

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
 
@@ -23,7 +28,8 @@ module XcodeInstall
 
       def run
         xcode = @installer.installed_versions.detect { |v| v.version == @version }
-        `sudo xcode-select --switch #{xcode.path}`
+        `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.6.7'.freeze
 end