xcode-install 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 425c3fc2af23deed5eced899dd8872ad250400c8
-  data.tar.gz: f5c3e3d584a870cff1cc3759042bda3f7664b942
+  metadata.gz: 3d26fe330e988d0a313ffeac4386ffa27edeff03
+  data.tar.gz: c2d3bc67f1412c9e229697e9d7d7dcbbb96ff03a
 SHA512:
-  metadata.gz: 356735fa355bb556d8016bae1843905a0b81617f7477b11259799a8df5d99bfb4ff30b533a66b41033515e200f42135865c8d070c9ac31148508489609cf2981
-  data.tar.gz: 591bda404fc8e63ab6ac8c55208a8d32052d8b5e515893343f09c0f852aa0e5f03a93e04413ef48a2ea51b8e78f696de357e738c762fe49d326da6d769753ab8
+  metadata.gz: b712a71ce8325eab4b1afc9ba3434ae93593b31c7987d0418062dde651d114ddffe39d6d155fa3e8ce44f88cd096e36cf84691ee2c99f03fb1af0b958b204c2c
+  data.tar.gz: fcf747735c56f7352bee1cc492dfe95813e3caa118ab8a49cd88058cd3ffa467920ee34edfbe8c3630536e8cd1ccf6403e226f5c7969f3c09832f5c7f63899b7

data/.rubocop_todo.yml

@@ -1,34 +1,78 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-04-26 22:45:06 -0700 using RuboCop version 0.35.1.
+# on 2017-06-12 12:01:46 +0100 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 11
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+Layout/IndentHeredoc:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 12
 Metrics/AbcSize:
-  Max: 39
+  Max: 44
+
+# Offense count: 4
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 76
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 226
+  Max: 252
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 10
 
-# Offense count: 10
+# Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 40
+  Max: 51
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 2
+# Offense count: 3
 Metrics/PerceivedComplexity:
-  Max: 9
+  Max: 12
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/CompareWithBlock:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IncludeActiveSupportAliases.
+Performance/DoubleStartEndWith:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 1
+Security/MarshalLoad:
+  Exclude:
+    - 'lib/xcode/install.rb'
+
+# Offense count: 13
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: only_raise, only_fail, semantic
+Style/SignalException:
+  Exclude:
+    - 'lib/xcode/install.rb'
+    - 'lib/xcode/install/cli.rb'
+    - 'lib/xcode/install/install.rb'
+    - 'lib/xcode/install/select.rb'
+    - 'lib/xcode/install/simulators.rb'
+    - 'lib/xcode/install/uninstall.rb'

data/Gemfile

@@ -4,9 +4,9 @@ gemspec
 
 group :development do
   gem 'bacon'
-  gem 'mocha-on-bacon'
+  gem 'coveralls', require: false
   gem 'mocha', '~> 0.11.4'
+  gem 'mocha-on-bacon'
   gem 'prettybacon'
-  gem 'rubocop', '0.35.1'
-  gem 'coveralls', require: false
+  gem 'rubocop', '~> 0.49.1', require: false
 end

data/Rakefile

@@ -13,4 +13,4 @@ end
 desc 'Lints all the files'
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]

data/bin//360/237/216/211

@@ -1 +1 @@
-xcversion
+bin/xcversion

data/lib/xcode/install.rb

@@ -20,16 +20,25 @@ module XcodeInstall
       output ||= File.basename(uri.path)
       output = (Pathname.new(directory) + Pathname.new(output)) if directory
 
+      retry_options = ['--retry', '3']
       progress = progress ? '--progress-bar' : '--silent'
-      command = ['curl', *options, '--location', '--continue-at', '-', progress, '--output', output, url].map(&:to_s)
-      io = IO.popen(command)
-      io.each { |line| puts line }
-      io.close
-
-      result = $?.exitstatus == 0
-
+      command = ['curl', *options, *retry_options, '--location', '--continue-at', '-', progress, '--output', output, url].map(&:to_s)
+
+      # Run the curl command in a loop, retry when curl exit status is 18
+      # "Partial file. Only a part of the file was transferred."
+      # https://curl.haxx.se/mail/archive-2008-07/0098.html
+      # https://github.com/KrauseFx/xcode-install/issues/210
+      3.times do
+        io = IO.popen(command)
+        io.each { |line| puts line }
+        io.close
+
+        exit_code = $?.exitstatus
+        return exit_code.zero? unless exit_code == 18
+      end
+      false
+    ensure
       FileUtils.rm_f(COOKIES_PATH)
-      result
     end
   end
 
@@ -113,7 +122,7 @@ HELP
       end
 
       unless verify_integrity(xcode_path)
-        `sudo rm -f #{xcode_path}`
+        `sudo rm -rf #{xcode_path}`
         return
       end
 
@@ -251,7 +260,7 @@ HELP
       names = @xcodes.map(&:name)
       @xcodes += prereleases.reject { |pre| names.include?(pre.name) }
 
-      File.open(LIST_FILE, 'w') do |f|
+      File.open(LIST_FILE, 'wb') do |f|
         f << Marshal.dump(xcodes)
       end
 
@@ -298,11 +307,11 @@ HELP
       end
       links = links.map { |pre| Xcode.new_prerelease(pre[2].strip.gsub(/.*Xcode /, ''), pre[0], pre[3]) }
 
-      if links.count == 0
+      if links.count.zero?
         rg = %r{platform-title.*Xcode.* beta.*<\/p>}
         scan = body.scan(rg)
 
-        if scan.count == 0
+        if scan.count.zero?
           rg = %r{Xcode.* GM.*<\/p>}
           scan = body.scan(rg)
         end
@@ -325,14 +334,14 @@ HELP
 
     def verify_integrity(path)
       puts `/usr/sbin/spctl --assess --verbose=4 --type execute #{path}`
-      $?.exitstatus == 0
+      $?.exitstatus.zero?
     end
 
     def hdiutil(*args)
       io = IO.popen(['hdiutil', *args])
       result = io.read
       io.close
-      unless $?.exitstatus == 0
+      unless $?.exitstatus.zero?
         file_path = args[-1]
         if `file -b #{file_path}`.start_with?('HTML')
           fail Informative, "Failed to mount #{file_path}, logging into your account from a browser should tell you what is going wrong."
@@ -379,13 +388,13 @@ HELP
       end
     end
 
-    def download
-      result = Curl.new.fetch(source, CACHE_DIR)
+    def download(progress)
+      result = Curl.new.fetch(source, CACHE_DIR, nil, nil, progress)
       result ? dmg_path : nil
     end
 
-    def install
-      download unless dmg_path.exist?
+    def install(progress)
+      download(progress)
       prepare_package unless pkg_path.exist?
       puts "Please authenticate to install #{name}..."
       `sudo installer -pkg #{pkg_path} -target /`
@@ -491,11 +500,19 @@ HELP
       @available_simulators ||= JSON.parse(`curl -Ls #{downloadable_index_url} | plutil -convert json -o - -`)['downloadables'].map do |downloadable|
         Simulator.new(downloadable)
       end
+    rescue JSON::ParserError
+      return []
     end
 
     def install_components
-      Dir.glob("#{@path}/Contents/Resources/Packages/*.pkg").each do |pkg|
-        `sudo installer -pkg #{pkg} -target /`
+      # starting with Xcode 9, we have `xcodebuild -runFirstLaunch` available to do package
+      # postinstalls using a documented option
+      if Gem::Version.new(@version) >= Gem::Version.new('9')
+        `sudo #{@path}/Contents/Developer/usr/bin/xcodebuild -runFirstLaunch`
+      else
+        Dir.glob("#{@path}/Contents/Resources/Packages/*.pkg").each do |pkg|
+          `sudo installer -pkg #{pkg} -target /`
+        end
       end
       osx_build_version = `sw_vers -buildVersion`.chomp
       tools_version = `/usr/libexec/PlistBuddy -c "Print :ProductBuildVersion" "#{@path}/Contents/version.plist"`.chomp
@@ -511,7 +528,7 @@ HELP
 
     def fetch_version
       output = `DEVELOPER_DIR='' "#{@path}/Contents/Developer/usr/bin/xcodebuild" -version`
-      return '0.0' if output.nil? # ¯\_(ツ)_/¯
+      return '0.0' if output.nil? || output.empty? # ¯\_(ツ)_/¯
       output.split("\n").first.split(' ')[1]
     end
   end

data/lib/xcode/install/simulators.rb

@@ -7,12 +7,14 @@ module XcodeInstall
       self.summary = 'List or install iOS simulators.'
 
       def self.options
-        [['--install=name', 'Install simulator beginning with name, e.g. \'iOS 8.4\', \'tvOS 9.0\'.']].concat(super)
+        [['--install=name', 'Install simulator beginning with name, e.g. \'iOS 8.4\', \'tvOS 9.0\'.'],
+         ['--no-progress', 'Don’t show download progress.']].concat(super)
       end
 
       def initialize(argv)
         @installed_xcodes = Installer.new.installed_versions
         @install = argv.option('install')
+        @progress = argv.flag?('progress', true)
         super
       end
 
@@ -36,7 +38,7 @@ module XcodeInstall
         simulator = filtered_simulators.first
         fail Informative, "#{simulator.name} is already installed." if simulator.installed?
         puts "Installing #{simulator.name} for Xcode #{simulator.xcode.bundle_version}..."
-        simulator.install
+        simulator.install(@progress)
       else
         puts "[!] More than one simulator matching #{@install} was found. Please specify the full version.".ansi.red
         filtered_simulators.each do |candidate|

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/spec/install_spec.rb

@@ -48,7 +48,7 @@ module XcodeInstall
     it 'gives more helpful error when downloaded DMG turns out to be HTML' do
       installer = Installer.new
       should.raise(Informative) { installer.mount('spec/fixtures/mail-verify.html') }.message
-        .should.include 'logging into your account from a browser'
+            .should.include 'logging into your account from a browser'
     end
   end
 end

data/xcode-install.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'xcode/install/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Xcode installation manager.
@@ -189,4 +189,3 @@ test_files:
 - spec/prerelease_spec.rb
 - spec/spec_helper.rb
 - spec/uninstall_spec.rb
-has_rdoc: