xcode-install 2.6.4 → 2.6.5

data/spec/json_spec.rb

@@ -6,9 +6,9 @@ module XcodeInstall
       fixture = Pathname.new('spec/fixtures/xcode.json').read
       xcode = Xcode.new(JSON.parse(fixture))
 
-      xcode.date_modified.should == 1_413_472_373_000
-      xcode.name.should == 'Command Line Tools (OS X 10.9) for Xcode - Xcode 6.1'
-      xcode.url.should == 'https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/command_line_tools_os_x_10.9_for_xcode__xcode_6.1/command_line_tools_for_osx_10.9_for_xcode_6.1.dmg'
+      xcode.date_modified.should == 1_572_613_080
+      xcode.name.should == '9.3'
+      xcode.url.should == 'https://developer.apple.com/devcenter/download.action?path=/Developer_Tools/Xcode_9.3/Xcode_9.3.xip'
     end
 
     it 'can parse list of all Xcodes' do
@@ -19,7 +19,17 @@ module XcodeInstall
       installer.stubs(:installed_versions).returns([])
       installer.stubs(:xcodes).returns(seedlist)
 
-      installer.list.should == "6.1\n6.1.1\n6.2"
+      versions = [
+        '4.3 for Lion', '4.3.1 for Lion', '4.3.2 for Lion', '4.3.3 for Lion', '4.4.1', '4.5', '4.6.2', '4.6', '4.6.1', '4.6.3',
+        '5.0.1', '5', '5.0.2', '5.1', '5.1.1',
+        '6.0.1', '6.1', '6.1.1', '6.2', '6.3', '6.3.1', '6.3.2', '6.4',
+        '7', '7.0.1', '7.1', '7.1.1', '7.2.1', '7.2', '7.3', '7.3.1',
+        '8', '8.1', '8.2', '8.2.1', '8.3.2', '8.3.3', '8.3',
+        '9', '9.0.1', '9.1', '9.2', '9.3', '9.3.1', '9.4', '9.4.1',
+        '10', '10.1', '10.2.1', '10.2', '10.3',
+        '11', '11.1', '11.2', '11.2.1', '11.3 beta', '11.3', '11.3.1', '11.4 beta', '11.4', '11.4 beta 3', '11.4 beta 2', '11.4.1', '11.5 beta 2', '11.5', '11.5 GM Seed', '11.5 beta'
+      ]
+      installer.list.split("\n").should == versions
     end
 
     it 'raises informative error when account is not registered as a developer' do

data/spec/list_spec.rb

@@ -23,8 +23,9 @@ module XcodeInstall
     end
 
     def fake_installed_xcode(name)
-      xcode_path = "/Applications/Xcode-#{name}.app"
-      xcode_version = name
+      installed_name = name.split(' ').join('.')
+      xcode_path = "/Applications/Xcode-#{installed_name}.app"
+      xcode_version = name.split(' ').first
       xcode_version << '.0' unless name.include? '.'
 
       installed_xcode = InstalledXcode.new(xcode_path)
@@ -42,15 +43,27 @@ module XcodeInstall
       it 'lists all versions' do
         fake_xcodes '1', '2.3', '2.3.1', '2.3.2', '3 some', '4 beta', '10 beta'
         fake_installed_xcodes
-        installer.list.should == "1\n2.3\n2.3.1\n2.3.2\n3 some\n4 beta\n10 beta"
+        installer.list.should == "1\n2.3.2\n2.3.1\n2.3\n3 some\n4 beta\n10 beta"
       end
     end
 
     describe '#list_annotated' do
       it 'lists all versions with annotations' do
         fake_xcodes '1', '2.3', '2.3.1', '2.3.2', '3 some', '4.3.1 for Lion', '9.4.1', '10 beta'
-        fake_installed_xcodes '2.3', '4.3.1', '10'
-        installer.list.should == "1\n2.3 (installed)\n2.3.1\n2.3.2\n3 some\n4.3.1 for Lion (installed)\n9.4.1\n10 beta (installed)"
+        fake_installed_xcodes '2.3', '4.3.1 for Lion', '10 beta'
+        installer.list.should == "1\n2.3.2\n2.3.1\n2.3 (installed)\n3 some\n4.3.1 for Lion (installed)\n9.4.1\n10 beta (installed)"
+      end
+
+      it 'distinguish between beta and official_version' do
+        fake_xcodes '11.4', '11.4 beta'
+        fake_installed_xcodes '11.4'
+        installer.list.should == "11.4 beta\n11.4 (installed)"
+      end
+
+      it 'distinguish each beta versions' do
+        fake_xcodes '11.4 beta', '11.4 beta 3'
+        fake_installed_xcodes '11.4 beta'
+        installer.list.should == "11.4 beta 3\n11.4 beta (installed)"
       end
     end
   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', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  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.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Boris Bügling
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -56,28 +56,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: Download, install and upgrade Xcodes with ease.
 email:
 - boris@icculus.org
@@ -89,7 +89,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitattributes"
-- ".github/workflows/e2e.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -145,7 +145,7 @@ homepage: https://github.com/neonichu/xcode-install
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +160,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.14.4
+signing_key:
 specification_version: 4
 summary: Xcode installation manager.
 test_files:

data/.github/workflows/e2e.yml

@@ -1,47 +0,0 @@
-name: "E2E test"
-on: [pull_request]
-
-jobs:
-  check_install:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest]
-        xcode: ["10.0", "10.1", "10.2.1", "10.3", "11.0", "11.1", "11.2.1"]
-
-    runs-on: ${{ matrix.os }}
-    env:
-      # It needs AppleID that has disabled 2FA.
-      XCODE_INSTALL_USER: ${{ secrets.XCODE_INSTALL_USER }}
-      XCODE_INSTALL_PASSWORD: ${{ secrets.XCODE_INSTALL_PASSWORD }}
-    steps:
-    # Prepare env
-    - uses: actions/checkout@master
-    - uses: actions/setup-ruby@master
-      with:
-        ruby-version: '2.6'
-
-    # Show env
-    - name: Show macOS version
-      run: sw_vers
-    - name: Show ruby version
-      run: |
-        ruby --version
-        bundler --version
-    
-    # Prepare
-    - run: bundle install -j4 --clean --path=vendor
-    - run: bundle exec xcversion update
-    - name: Show installed versions before install
-      run: bundle exec xcversion installed
-    - name: Uninstall installed target Xcode version
-      run: bundle exec xcversion uninstall ${{ matrix.xcode }} || true
-
-    # Exec
-    - run: bundle exec xcversion install ${{ matrix.xcode }}
-
-    # Check
-    - name: Show installed versions after install
-      run: bundle exec xcversion installed
-    - name: Check Xcode installation was successful
-      run: bundle exec xcversion installed | grep "${{ matrix.xcode }}"