xcode-install 2.6.0 → 2.7.0

data/spec/install_spec.rb

@@ -12,32 +12,32 @@ module XcodeInstall
       end
 
       it 'downloads and installs' do
-        Installer.any_instance.expects(:download).with('6.3', true, nil, nil).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', true, nil, nil, 3).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, nil).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', true, url, nil, 3).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, nil).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', true, nil, nil, 3).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, nil).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', false, nil, nil, 3).returns('/some/path')
         Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
         Command::Install.run(['6.3', '--no-progress'])
       end
 
       it 'reads .xcode-version' do
-        Installer.any_instance.expects(:download).with('6.3', true, nil, nil).returns('/some/path')
+        Installer.any_instance.expects(:download).with('6.3', true, nil, nil, 3).returns('/some/path')
         Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
         File.expects(:exist?).with('.xcode-version').returns(true)
         File.expects(:read).returns('6.3')

data/spec/installer_spec.rb

@@ -1,101 +1,126 @@
 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
+  #
+  # FIXME: This test randomely fail on GitHub Actions.
+  #
+  # 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")
 
-    it 'downloads the file and calls the `progress_block` with the percentage' do
+  #     command = [
+  #       'curl',
+  #       '--disable',
+  #       '--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
+
+  describe '#find_xcode_version' do
+    it 'should find the one with the matching name' 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',
-        '--disable',
-        '--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}"
+      xcodes = [
+        XcodeInstall::Xcode.new('name' => '11.4 beta 2',
+                                'dateModified' => '12/11/19 14:28',
+                                'files' => [{
+                                  'remotePath' => '/Developer_Tools/Xcode_11.4_beta_2/Xcode_11.4_beta_2.xip'
+                                }]),
+        XcodeInstall::Xcode.new('name' => '11.4',
+                                'dateModified' => '12/15/19 11:28',
+                                'files' => [{
+                                  'remotePath' => '/Developer_Tools/Xcode_11.4/Xcode_11.4.xip'
+                                }])
       ]
-      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)
+
+      installer.stubs(:fetch_seedlist).returns(xcodes)
+      installer.find_xcode_version('11.4').name.should.be.equal('11.4')
     end
   end
 end

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', '4.6.1', '4.6.2', '4.6.3',
+        '5', '5.0.1', '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', '7.2.1', '7.3', '7.3.1',
+        '8', '8.1', '8.2', '8.2.1', '8.3', '8.3.2', '8.3.3',
+        '9', '9.0.1', '9.1', '9.2', '9.3', '9.3.1', '9.4', '9.4.1',
+        '10', '10.1', '10.2', '10.2.1', '10.3',
+        '11', '11.1', '11.2', '11.2.1', '11.3 beta', '11.3', '11.3.1', '11.4 beta', '11.4 beta 2', '11.4 beta 3', '11.4', '11.4.1', '11.5 beta', '11.5 beta 2', '11.5 GM Seed', '11.5'
+      ]
+      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)
@@ -44,14 +45,42 @@ module XcodeInstall
         fake_installed_xcodes
         installer.list.should == "1\n2.3\n2.3.1\n2.3.2\n3 some\n4 beta\n10 beta"
       end
+
+      it 'lists all versions in the correct order' do
+        fake_xcodes(
+          '12 beta 4', '12 beta 3', '12 beta 2', '12 for macOS Universal Apps beta 2',
+          '12 beta', '12 for macOS Universal Apps beta', '12.0.1', '12', '12 beta 6',
+          '12 beta 5', '12.1 GM seed', '12.2 beta 3', '12.2 beta', '12.2 beta 2'
+        )
+        fake_installed_xcodes
+
+        versions = [
+          '12 beta', '12 beta 2', '12 beta 3', '12 beta 4', '12 beta 5', '12 beta 6',
+          '12 for macOS Universal Apps beta', '12 for macOS Universal Apps beta 2',
+          '12', '12.0.1', '12.1 GM seed', '12.2 beta', '12.2 beta 2', '12.2 beta 3'
+        ]
+        installer.list.split("\n").should == versions
+      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'
+        fake_installed_xcodes '2.3', '4.3.1 for Lion', '10 beta'
         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)"
       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 3', '11.4 beta'
+        fake_installed_xcodes '11.4 beta'
+        installer.list.should == "11.4 beta (installed)\n11.4 beta 3"
+      end
     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', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  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.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -54,30 +54,36 @@ 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: '1.7'
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !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
@@ -87,8 +93,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".gitattributes"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -96,6 +102,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- XCODE_VERSION.md
 - bin/xcversion
 - "bin/\U0001F389"
 - lib/xcode/install.rb
@@ -159,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Xcode installation manager.

data/.circleci/config.yml

@@ -1,33 +0,0 @@
-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