xcode-install 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f963f106ba542c0705d573d9262d8fb92595df9d
-  data.tar.gz: ac247b88aba2b1548179b04c7e7a6eb6358c5004
+SHA256:
+  metadata.gz: 968729b1842c8f61bb71810891dd3690dd6153c64227c997e8688f1edf930b4c
+  data.tar.gz: 04f1e73ff7d6a7dbc33744dccc61e7f87cad8d2557d0535c85d1f502ca86f59e
 SHA512:
-  metadata.gz: e525ac44989fb47d31f0b976228eb1952f4d710fef60def7c3aaee7059312332c9d29e258b3a3a0760f6d39d2a1b067af9f3b3fc622c49a3780a14bd8fd61593
-  data.tar.gz: e630821045db39f07f64840f17e6d96df9ba3cfaeca05cc3391f9b9dc8843d48038382580b96743c3ea5868afda8aed92e8135153bea24320680b99f4f7933c9
+  metadata.gz: f00f1dd8776dd06b58da3f4142f802af2efb248eb9fb96609148d64d909bac042b8dc55866b3f36f467cb2b80ee172977579b9ab512c5d1e13b0df230e40f3be
+  data.tar.gz: c2cf129e9f2afd1257243585c3c5c517f54d0d7336f86c151431fa0c57a69dc5f6aa468d7cc48d312d1ecb20e38857a24cabaf5e0e4139c7a946075bc572a13d

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/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/KrauseFx/xcode-install.svg?style=svg)](https://circleci.com/gh/KrauseFx/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.
 

data/lib/xcode/install.rb

@@ -8,7 +8,8 @@ require 'xcode/install/command'
 require 'xcode/install/version'
 require 'shellwords'
 require 'open3'
-require 'fileutils'
+require 'fastlane/action'
+require 'fastlane/actions/verify_build'
 
 module XcodeInstall
   CACHE_DIR = Pathname.new("#{ENV['HOME']}/Library/Caches/XcodeInstall")
@@ -57,6 +58,7 @@ module XcodeInstall
       retry_options = ['--retry', '3']
       command = [
         'curl',
+        '--disable',
         *options,
         *retry_options,
         '--location',
@@ -210,14 +212,13 @@ module XcodeInstall
     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: "
       xcode_path = "/Applications/Xcode#{suffix}.app"
 
       if dmg_path.extname == '.xip'
-        `'#{archive_util}' #{dmg_path}`
-        xcode_orig_path = dmg_path.dirname + 'Xcode.app'
-        xcode_beta_path = dmg_path.dirname + 'Xcode-beta.app'
+        `xip -x #{dmg_path}`
+        xcode_orig_path = File.join(Dir.pwd, 'Xcode.app')
+        xcode_beta_path = File.join(Dir.pwd, 'Xcode-beta.app')
         if Pathname.new(xcode_orig_path).exist?
           `sudo -p "#{prompt}" mv "#{xcode_orig_path}" "#{xcode_path}"`
         elsif Pathname.new(xcode_beta_path).exist?
@@ -250,13 +251,14 @@ HELP
         `umount "/Volumes/Xcode"`
       end
 
-      unless verify_integrity(xcode_path)
+      xcode = InstalledXcode.new(xcode_path)
+
+      unless xcode.verify_integrity
         `sudo rm -rf #{xcode_path}`
         return
       end
 
       enable_developer_mode
-      xcode = InstalledXcode.new(xcode_path)
       xcode.approve_license
       xcode.install_components
 
@@ -364,8 +366,9 @@ HELP
         return path if path.exist?
       end
       if ENV.key?('XCODE_INSTALL_CACHE_DIR')
-        cache_path = Pathname.new(ENV['XCODE_INSTALL_CACHE_DIR']) + Pathname.new("xcode-#{version}.dmg")
-        return cache_path if cache_path.exist?
+        Pathname.glob(ENV['XCODE_INSTALL_CACHE_DIR'] + '/*').each do |fpath|
+          return fpath if /^xcode_#{version}\.dmg|xip$/ =~ fpath.basename.to_s
+        end
       end
 
       download(version, progress, url, progress_block)
@@ -448,11 +451,6 @@ HELP
       links
     end
 
-    def verify_integrity(path)
-      puts `/usr/sbin/spctl --assess --verbose=4 --type execute #{path}`
-      $?.exitstatus.zero?
-    end
-
     def hdiutil(*args)
       io = IO.popen(['hdiutil', *args])
       result = io.read
@@ -578,6 +576,9 @@ HELP
   end
 
   class InstalledXcode
+    TEAM_IDENTIFIER = '59GAB85EFG'.freeze
+    AUTHORITY = 'Software Signing'.freeze
+
     attr_reader :path
     attr_reader :version
     attr_reader :bundle_version
@@ -613,12 +614,18 @@ HELP
 
     def approve_license
       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_info_path = File.join(@path, 'Contents/Resources/LicenseInfo.plist')
+        license_id = `/usr/libexec/PlistBuddy -c 'Print :licenseID' #{license_info_path}`
+        license_type = `/usr/libexec/PlistBuddy -c 'Print :licenseType' #{license_info_path}`
         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 license_type == 'GM'
+          `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 /usr/libexec/PlistBuddy -c "add :IDELastBetaLicenseAgreedTo string #{license_id}" #{license_plist_path}`
+          `sudo /usr/libexec/PlistBuddy -c "add :IDEXcodeVersionForAgreedToBetaLicense string #{version}" #{license_plist_path}`
+        end
       else
         `sudo #{@path}/Contents/Developer/usr/bin/xcodebuild -license accept`
       end
@@ -655,6 +662,10 @@ HELP
       output.split("\n").first.split(' ')[1]
     end
 
+    def verify_integrity
+      verify_app_security_assessment && verify_app_cert
+    end
+
     :private
 
     def bundle_version_string
@@ -669,6 +680,18 @@ HELP
     def plist_entry(keypath)
       `/usr/libexec/PlistBuddy -c "Print :#{keypath}" "#{path}/Contents/Info.plist"`.chomp
     end
+
+    def verify_app_security_assessment
+      puts `/usr/sbin/spctl --assess --verbose=4 --type execute #{@path}`
+      $?.exitstatus.zero?
+    end
+
+    def verify_app_cert
+      cert_info = Fastlane::Actions::VerifyBuildAction.gather_cert_info(@path.to_s)
+      apple_team_identifier_result = cert_info['team_identifier'] == TEAM_IDENTIFIER
+      apple_authority_result = cert_info['authority'].include?(AUTHORITY)
+      apple_team_identifier_result && apple_authority_result
+    end
   end
 
   # A version of Xcode we fetched from the Apple Developer Portal

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/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '2.5.0'.freeze
+  VERSION = '2.6.0'.freeze
 end

data/spec/installer_spec.rb

@@ -35,6 +35,7 @@ module XcodeInstall
 
       command = [
         'curl',
+        '--disable',
         '--cookie customCookie',
         '--cookie-jar /tmp/curl-cookies.txt',
         '--retry 3',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -87,6 +87,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitattributes"
 - ".gitignore"
 - ".rubocop.yml"
@@ -97,7 +98,6 @@ files:
 - Rakefile
 - bin/xcversion
 - "bin/\U0001F389"
-- circle.yml
 - lib/xcode/install.rb
 - lib/xcode/install/cleanup.rb
 - lib/xcode/install/cli.rb
@@ -159,8 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Xcode installation manager.

data/circle.yml

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