xcode-install 0.3.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0315796b802e96968533cbd84beffd9196db6278
-  data.tar.gz: 5f1e8191fdd093ce812d335917999e90455498e4
+  metadata.gz: 82276c486f016d15325b027bac509063ef807cba
+  data.tar.gz: 12791f86b6e6d6a43ff5f179381c6c44d7649bb3
 SHA512:
-  metadata.gz: 6db340040ce85117495e443c0e39f05b3d617698e75aeb869717ffda3576c7b43c1e0162479f549383e7ed42401cc9a687bc59c5df989b24b0cbda3833a4bb15
-  data.tar.gz: 76b48c89942caf99ad195c0d713efb023fc27fc1bde695cd5dc02646ab6fda85af2db1044673ae400e87b01da6ba8fa7b0e40a1d394c9a6abbc7336c2320c944
+  metadata.gz: 9c75ef419ed9ffe50f16716c642114c99ce294baf2343455f1fe5de79ed9bb2099df340d48cd9621f797f52b43bfdbfbd9f4b94a83ce3741ec18dd08eda1be92
+  data.tar.gz: f956fc36418324bb1f55c2afda840d314b569135bbbdd6bd83e45c635347b46f6731439397febbb3d91c13ead6735dc3e96d21422e645da010d6f2132cd14605

data/.gitattributes

@@ -0,0 +1 @@
+spec/fixtures/* linguist-documentation

data/README.md

@@ -20,8 +20,13 @@ $ gem install xcode-install
 
 ## Usage
 
-XcodeInstall will ask for your credentials to access the Apple Developer Center, they are stored
-using the [CredentialsManager][1] of [Fastlane][2].
+XcodeInstall needs environment variables with your credentials to access the Apple Developer
+Center, they are stored using the [CredentialsManager][1] of [Fastlane][2]:
+
+```
+XCODE_INSTALL_USER
+XCODE_INSTALL_PASSWORD
+```
 
 To list available versions:
 
@@ -52,11 +57,15 @@ This will download and install that version of Xcode. It will also be automatica
 
 ## Limitations
 
-Because some dependencies uses C extensions, a working Xcode is required to actually install this gem (see [#17](../../issues/17)).
+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. 📡
 
-![](http://i.giphy.com/aImJnc9F8Omzu.gif)
+XcodeInstall automatically installs additional components so that it is immediately usable from the
+commandline. Unfortunately, Xcode will load third-party plugins even in that situation, which leads
+to a dialog popping up. Feel free to dupe [the radar][5]. 📡
 
-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. 📡
+XcodeInstall uses the Spotlight index to locate installed versions of Xcode. If you use it while
+indexing is happening, it might show inaccurate results and it will not be able to see installed
+versions on unindexed volumes.
 
 ## Thanks
 
@@ -72,7 +81,8 @@ for doing the installation.
 5. Create a new Pull Request
 
 
-[1]: https://github.com/KrauseFx/CredentialsManager
+[1]: https://github.com/fastlane/credentials_manager#using-environment-variables
 [2]: http://fastlane.tools
 [3]: http://atastypixel.com/blog/resuming-adc-downloads-cos-safari-sucks/
 [4]: https://github.com/magneticbear/Jenkins_Bootstrap
+[5]: http://www.openradar.me/22001810

data/lib/xcode/install.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'pathname'
 require 'spaceship'
-require 'nokogiri'
 require 'rubygems/version'
 require 'xcode/install/command'
 require 'xcode/install/version'
@@ -57,6 +56,10 @@ module XcodeInstall
       list_versions.include?(version)
     end
 
+    def install_components(xcode_path)
+      `#{xcode_path}/Contents/MacOS/Xcode -installComponents`
+    end
+
     def installed?(version)
       installed_versions.map(&:version).include?(version)
     end
@@ -75,7 +78,11 @@ module XcodeInstall
       source =  Dir.glob('/Volumes/Xcode/Xcode*.app').first
 
       if source.nil?
-        puts 'No `Xcode.app` found in DMG.'
+        $stderr.puts <<-HELP
+No `Xcode.app` found in DMG. Please remove #{dmgPath} if you suspect a corrupted
+download or run `xcode-install update` to see if the version you tried to install
+has been pulled by Apple. If none of this is true, please open a new GH issue.
+HELP
         return
       end
 
@@ -84,6 +91,7 @@ module XcodeInstall
 
       enable_developer_mode
       `sudo xcodebuild -license` unless xcode_license_approved?
+      install_components(xcode_path)
 
       if switch
         `sudo rm -f #{SYMLINK_PATH}` unless current_symlink.nil?
@@ -132,7 +140,16 @@ module XcodeInstall
 
     def spaceship
       @spaceship ||= begin
-        Spaceship.login(ENV["XCODE_INSTALL_USER"], ENV["XCODE_INSTALL_PASSWORD"])
+        begin
+          Spaceship.login(ENV["XCODE_INSTALL_USER"], ENV["XCODE_INSTALL_PASSWORD"])
+        rescue Spaceship::Client::InvalidUserCredentialsError
+          $stderr.puts <<-HELP
+Please provide your Apple developer account credentials via the
+XCODE_INSTALL_USER and XCODE_INSTALL_PASSWORD environment variables.
+HELP
+          exit(1)
+        end
+
         if ENV.key?("XCODE_INSTALL_TEAM_ID")
           Spaceship.client.team_id = ENV["XCODE_INSTALL_TEAM_ID"]
         end
@@ -181,6 +198,11 @@ module XcodeInstall
     end
 
     def installed
+      unless (`mdutil -s /` =~ /disabled/).nil?
+        $stderr.puts 'Please enable Spotlight indexing for /Applications.'
+        exit(1)
+      end
+
       `mdfind "kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'" 2>/dev/null`.split("\n")
     end
 
@@ -202,10 +224,10 @@ module XcodeInstall
     end
 
     def prereleases
-      page = Nokogiri::HTML.parse(spaceship.send(:request, :get, '/xcode/downloads/').body)
-      links = page.xpath('//a').select { |link| link['href'].end_with?('.dmg') }
+      body=spaceship.send(:request, :get, '/xcode/downloads/').body
+      links=body.scan(/<a.+?href="(.+?.dmg)".*>(.*)<\/a>/)
 
-      links.map { |pre| Xcode.new_prelease(pre.text.strip.gsub(/.*Xcode /, ''), pre['href']) }
+      links.map { |pre| Xcode.new_prelease(pre[1].strip.gsub(/.*Xcode /, ''), pre[0]) }
     end
 
     def seedlist

data/lib/xcode/install/install.rb

@@ -24,6 +24,8 @@ module XcodeInstall
       end
 
       def validate!
+        super
+
         return if @version.nil?
         fail Informative, "Version #{@version} already installed." if @installer.installed?(@version)
         fail Informative, "Version #{@version} doesn't exist." unless @installer.exist?(@version)

data/lib/xcode/install/uninstall.rb

@@ -11,9 +11,11 @@ module XcodeInstall
       def initialize(argv)
         @installer = Installer.new
         @version = argv.shift_argument
+        super
       end
 
       def validate!
+        super
         fail Informative, "Version #{@version} is not installed." unless @installer.installed?(@version)
       end
 

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '0.3.3'
+  VERSION = '0.9.0'
 end

data/spec/prerelease_spec.rb

@@ -3,12 +3,12 @@ require File.expand_path('../spec_helper', __FILE__)
 module XcodeInstall
   describe Installer do
     def fixture(date)
-      Nokogiri::HTML.parse(File.read("spec/fixtures/devcenter/xcode-#{date}.html"))
+      File.read("spec/fixtures/devcenter/xcode-#{date}.html")
     end
 
     def parse_prereleases(date)
       fixture = fixture(date)
-      Nokogiri::HTML.stubs(:parse).returns(fixture)
+      @result.stubs(:body).returns(fixture)
 
       installer = Installer.new
       installer.send(:prereleases)
@@ -19,11 +19,11 @@ module XcodeInstall
       devcenter.stubs(:download_file).returns(nil)
       Installer.any_instance.stubs(:devcenter).returns(devcenter)
 
-      result = mock
-      result.stubs(:body).returns(nil)
+      @result = mock
+      @result.stubs(:body).returns(nil)
       client = mock
-      client.stubs(:request).returns(result)
-      Spaceship::Client.stubs(:login).returns(client)
+      client.stubs(:request).returns(@result)
+      Spaceship::PortalClient.stubs(:login).returns(client)
     end
 
     it 'can parse prereleases from 20150414' do

data/xcode-install.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'claide', '~> 0.8.1'
-  spec.add_dependency 'spaceship', '0.0.11'
-  spec.add_dependency 'nokogiri', '~> 1.3'
+  spec.add_dependency 'spaceship', '~> 0.3.2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -26,32 +26,18 @@ dependencies:
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: spaceship
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.11
-- !ruby/object:Gem::Dependency
-  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitattributes
 - .gitignore
 - .rubocop.yml
 - .travis.yml