xcode-install 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b948df58ca7b2f2c720472b89214775f134d23
-  data.tar.gz: 15aa407f7d766643d655e2a80df65e90498ddb24
+  metadata.gz: 6400b83c001ff5429ba066cb709c7c48a3ee52d3
+  data.tar.gz: d03b8a2ca220319f47e47883cff2b240bcdd6697
 SHA512:
-  metadata.gz: 1bebaacc5640edecaa090ab1cfd80a381c2c50564f2af37cfc148b8b734d74019b967fd0f4ec17041e3a4018ada81868872e1bb9d180eee4264894c079bb1bd7
-  data.tar.gz: c1dddfc1b74d0da06784eeb4c0a12f0afed8be3dcd072e5f6ef366976e563292f01163cee594ece527d904c195eed7db0da370e940b060009088b4797b0f6e84
+  metadata.gz: 7f670c8560447440ae2b048c481a91addf64752bbc083c0f849a92bc46a403eb09f7d58c05eaaa2714a9d7b005287821d01340bf78a4cc91f89be8e0875687b1
+  data.tar.gz: 1c116c302f03f011a924f6bd764967703fcc00af5578554318be11bc96045e28ec210a6e310e8059d04c20473d26af21e763e3b1e57a28986077a92f76f14549

data/Gemfile

@@ -6,6 +6,6 @@ group :development do
   gem 'bacon'
   gem 'mocha-on-bacon'
   gem 'mocha', '~> 0.11.4'
-  gem 'prettybacon', git: 'https://github.com/irrationalfab/PrettyBacon.git', branch: 'master'
+  gem 'prettybacon'
   gem 'coveralls', require: false
 end

data/README.md

@@ -69,6 +69,35 @@ they have to be installed using the full name, e.g. `xcversion install '7 GM see
 
 XcodeInstall can also install Xcode's Command Line Tools by calling `xcversion install-cli-tools`.
 
+### Simulators
+
+XcodeInstall can also manage your local simulators using the `simulators` command.
+
+```bash
+$ xcode-install simulators
+Xcode 6.4.0 (/Applications/Xcode.app)
+iOS 7.1 Simulator (installed)
+iOS 8.1 Simulator (not installed)
+iOS 8.2 Simulator (not installed)
+iOS 8.3 Simulator (installed)
+Xcode 7.0.0 (/Applications/Xcode-beta.app)
+iOS 8.1 Simulator (not installed)
+iOS 8.2 Simulator (not installed)
+iOS 8.3 Simulator (installed)
+iOS 8.4 Simulator (installed)
+```
+
+To install a simulator, simply:
+
+```bash
+$ xcode-install simulators --install=8.4
+###########################################################               82.1%
+######################################################################## 100.0%
+Please authenticate to install iOS 8.4 Simulator...
+
+Successfully installed iOS 8.4 Simulator
+```
+
 ## Limitations
 
 Unfortunately, the installation size of Xcodes downloaded will be bigger than when downloading via the Mac App Store, see [#10](/../../issues/10) and feel free to dupe the radar. 📡

data/lib/xcode/install/command.rb

@@ -22,6 +22,7 @@ module XcodeInstall
     require 'xcode/install/selected'
     require 'xcode/install/uninstall'
     require 'xcode/install/update'
+    require 'xcode/install/simulators'
 
     self.abstract_command = true
     self.command = 'xcversion'

data/lib/xcode/install/simulators.rb

@@ -0,0 +1,58 @@
+require 'claide'
+
+module XcodeInstall
+  class Command
+    class Simulators < Command
+      self.command = 'simulators'
+      self.summary = 'List or install iOS simulators.'
+
+      def self.options
+        [['--install=version', 'Install simulator with the given version.']].concat(super)
+      end
+
+      def initialize(argv)
+        @installed_xcodes = Installer.new.installed_versions
+        @install = argv.option('install')
+        super
+      end
+
+      def run
+        @install ? install : list
+      end
+    end
+
+    :private
+
+    def install
+      filtered_simulators = @installed_xcodes.map { |x| x.available_simulators }.flatten.select do |sim|
+        sim.version.to_s.start_with?(@install)
+      end
+      if filtered_simulators.count == 0
+        puts "[!] No simulator matching #{@install} was found. Please specify a version from the following available simulators:".ansi.red
+        list
+        exit 1
+      elsif filtered_simulators.count == 1
+        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
+      else
+        puts "[!] More than one simulator matching #{@install} was found. Please specify the full version.".ansi.red
+        filtered_simulators.each do |simulator|
+          puts "Xcode #{simulator.xcode.bundle_version} (#{simulator.xcode.path})".ansi.green
+          puts "xcode-install simulator --install=#{simulator.version}"
+        end
+        exit 1
+      end
+    end
+
+    def list
+      @installed_xcodes.each do |xcode|
+        puts "Xcode #{xcode.version} (#{xcode.path})".ansi.green
+        xcode.available_simulators.each do |simulator|
+          puts simulator.to_s
+        end
+      end
+    end
+  end
+end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/xcode/install.rb

@@ -1,11 +1,13 @@
 require 'fileutils'
 require 'pathname'
 require 'spaceship'
+require 'json'
 require 'rubygems/version'
 require 'xcode/install/command'
 require 'xcode/install/version'
 
 module XcodeInstall
+  CACHE_DIR = Pathname.new("#{ENV['HOME']}/Library/Caches/XcodeInstall")
   class Curl
     COOKIES_PATH = Pathname.new('/tmp/curl-cookies.txt')
 
@@ -62,7 +64,7 @@ module XcodeInstall
     end
 
     def installed_versions
-      @installed ||= installed.map { |x| InstalledXcode.new(x) }.sort do |a, b|
+      installed.map { |x| InstalledXcode.new(x) }.sort do |a, b|
         Gem::Version.new(a.version) <=> Gem::Version.new(b.version)
       end
     end
@@ -93,7 +95,9 @@ HELP
       end
 
       enable_developer_mode
-      InstalledXcode.new(xcode_path).approve_license
+      xcode = InstalledXcode.new(xcode_path)
+      xcode.approve_license
+      xcode.install_components
 
       if switch
         `sudo rm -f #{SYMLINK_PATH}` unless current_symlink.nil?
@@ -169,7 +173,6 @@ HELP
       end
     end
 
-    CACHE_DIR = Pathname.new("#{ENV['HOME']}/Library/Caches/XcodeInstall")
     LIST_FILE = CACHE_DIR + Pathname.new('xcodes.bin')
     MINIMUM_VERSION = Gem::Version.new('4.3')
     SYMLINK_PATH = Pathname.new('/Applications/Xcode.app')
@@ -265,13 +268,133 @@ HELP
     end
   end
 
+  class Simulator
+    attr_reader :version
+    attr_reader :name
+    attr_reader :identifier
+    attr_reader :source
+    attr_reader :xcode
+
+    def initialize(downloadable)
+      @version = Gem::Version.new(downloadable['version'])
+      @install_prefix = apply_variables(downloadable['userInfo']['InstallPrefix'])
+      @name = apply_variables(downloadable['name'])
+      @identifier = apply_variables(downloadable['identifier'])
+      @source = apply_variables(downloadable['source'])
+    end
+
+    def installed?
+      # FIXME: use downloadables' `InstalledIfAllReceiptsArePresentOrNewer` key
+      File.directory?(@install_prefix)
+    end
+
+    def installed_string
+      installed? ? 'installed' : 'not installed'
+    end
+
+    def to_s
+      "#{name} (#{installed_string})"
+    end
+
+    def xcode
+      Installer.new.installed_versions.find do |x|
+        x.available_simulators.find do |s|
+          s.version == version
+        end
+      end
+    end
+
+    def download
+      result = Curl.new.fetch(source, CACHE_DIR)
+      result ? dmg_path : nil
+    end
+
+    def install
+      download unless dmg_path.exist?
+      prepare_package unless pkg_path.exist?
+      puts "Please authenticate to install #{name}..."
+      `sudo installer -pkg #{pkg_path} -target /`
+      fail Informative, "Could not install #{name}, please try again" unless installed?
+      source_receipts_dir = '/private/var/db/receipts'
+      target_receipts_dir = "#{@install_prefix}/System/Library/Receipts"
+      FileUtils.mkdir_p(target_receipts_dir)
+      FileUtils.cp("#{source_receipts_dir}/#{@identifier}.bom", target_receipts_dir)
+      FileUtils.cp("#{source_receipts_dir}/#{@identifier}.plist", target_receipts_dir)
+      puts "Successfully installed #{name}"
+    end
+
+    :private
+
+    def prepare_package
+      puts 'Mounting DMG'
+      mount_location = `hdiutil mount -nobrowse -noverify #{dmg_path}`.scan(/\/Volumes.*\n/).first.chomp
+      puts 'Expanding pkg'
+      expanded_pkg_path = CACHE_DIR + identifier
+      FileUtils.rm_rf(expanded_pkg_path)
+      `pkgutil --expand #{mount_location}/*.pkg #{expanded_pkg_path}`
+      puts "Expanded pkg into #{expanded_pkg_path}"
+      puts 'Unmounting DMG'
+      `umount #{mount_location}`
+      puts 'Setting package installation location'
+      package_info_path = expanded_pkg_path + 'PackageInfo'
+      package_info_contents = File.read(package_info_path)
+      File.open(package_info_path, 'w') do |f|
+        f << package_info_contents.sub('pkg-info', %(pkg-info install-location="#{@install_prefix}"))
+      end
+      puts 'Rebuilding package'
+      `pkgutil --flatten #{expanded_pkg_path} #{pkg_path}`
+      FileUtils.rm_rf(expanded_pkg_path)
+    end
+
+    def dmg_path
+      CACHE_DIR + Pathname.new(source).basename
+    end
+
+    def pkg_path
+      CACHE_DIR + "#{identifier}.pkg"
+    end
+
+    def apply_variables(template)
+      variable_map = {
+        '$(DOWNLOADABLE_VERSION_MAJOR)' => version.to_s.split('.')[0],
+        '$(DOWNLOADABLE_VERSION_MINOR)' => version.to_s.split('.')[1],
+        '$(DOWNLOADABLE_IDENTIFIER)' => identifier,
+        '$(DOWNLOADABLE_VERSION)' => version.to_s
+      }.freeze
+      variable_map.each do |key, value|
+        next unless template.include?(key)
+        template.sub!(key, value)
+      end
+      template
+    end
+  end
+
   class InstalledXcode
     attr_reader :path
     attr_reader :version
+    attr_reader :bundle_version
+    attr_reader :uuid
+    attr_reader :downloadable_index_url
+    attr_reader :available_simulators
 
     def initialize(path)
       @path = Pathname.new(path)
-      @version = get_version(path)
+    end
+
+    def version
+      @version ||= get_version
+    end
+
+    def bundle_version
+      @bundle_version ||= Gem::Version.new(plist_entry(':DTXcode').to_i.to_s.split(//).join('.'))
+    end
+
+    def uuid
+      @uuid ||= plist_entry(':DVTPlugInCompatibilityUUID')
+    end
+
+    def downloadable_index_url
+      @downloadable_index_url ||= "https://devimages.apple.com.edgekey.net/downloads/xcode/simulators/index-#{bundle_version}-#{uuid}.dvtdownloadableindex"
     end
 
     def approve_license
@@ -283,10 +406,28 @@ HELP
       `sudo /usr/libexec/PlistBuddy -c "add :IDEXcodeVersionForAgreedToGMLicense string #{@version}" #{license_plist_path}`
     end
 
+    def available_simulators
+      @available_simulators ||= JSON.parse(`curl -Ls #{downloadable_index_url} | plutil -convert json -o - -`)['downloadables'].map do |downloadable|
+        Simulator.new(downloadable)
+      end
+    end
+
+    def install_components
+      `sudo installer -pkg #{@path}/Contents/Resources/Packages/MobileDevice.pkg -target /`
+      osx_build_version = `sw_vers -buildVersion`.chomp
+      tools_version = `/usr/libexec/PlistBuddy -c "Print :ProductBuildVersion" "#{@path}/Contents/version.plist"`.chomp
+      cache_dir = `getconf DARWIN_USER_CACHE_DIR`.chomp
+      `touch #{cache_dir}com.apple.dt.Xcode.InstallCheckCache_#{osx_build_version}_#{tools_version}`
+    end
+
     :private
 
-    def get_version(xcode_path)
-      output = `DEVELOPER_DIR='' "#{xcode_path}/Contents/Developer/usr/bin/xcodebuild" -version`
+    def plist_entry(keypath)
+      `/usr/libexec/PlistBuddy -c "Print :#{keypath}" "#{path}/Contents/Info.plist"`.chomp
+    end
+
+    def get_version
+      output = `DEVELOPER_DIR='' "#{@path}/Contents/Developer/usr/bin/xcodebuild" -version`
       return '0.0' if output.nil? # ¯\_(ツ)_/¯
       output.split("\n").first.split(' ')[1]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Boris Bügling
@@ -102,6 +102,7 @@ files:
 - lib/xcode/install/list.rb
 - lib/xcode/install/select.rb
 - lib/xcode/install/selected.rb
+- lib/xcode/install/simulators.rb
 - lib/xcode/install/uninstall.rb
 - lib/xcode/install/update.rb
 - lib/xcode/install/version.rb