xcode-install 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e45140d056f5e42c4e07c2c319d6054e1ce00ea
-  data.tar.gz: 7791a902568ca8c67b807e957a00c06ce8276829
+  metadata.gz: 2f35f3bf3a7aac145047a95d07c5bdb1344600dc
+  data.tar.gz: 283c261a2a28d86116dcfcad1677f2df5e000a2d
 SHA512:
-  metadata.gz: 389e5345d4c1c2823b7a05d98af2d44a8b0601381d15f4a15318031a211f12abf221fa7c50fb17a86bef8701f5df81433ed8d402af60e733469b48f1d78b427c
-  data.tar.gz: 5a25e27292ae3f9f1a0b860859d5477cf082ed3c27c7070f406ef72bb8a424d1b238b557343596d48660cdfe44bdde1e0a961911216d240e300f6392e18b046d
+  metadata.gz: 99fb6cb82e6131948512f46f082c7eff162e4c414bba18da8c32d36346ff8080ea3ade45a413d43973c43098346443488a8ec6f6b947439ad4e1c82f536f9fd5
+  data.tar.gz: 760efcea4598e41a98dde02f23345ed7de599d70dd43ee6782da57c1a8a6be26481db2df9b7cedf5079eb4db09661001e9486b279a8908a8aa77c8eb1384da64

data/lib/xcode/install.rb

@@ -1,6 +1,7 @@
 require "fastlane_core"
 require "fastlane_core/developer_center/developer_center"
 require "nokogiri"
+require "rubygems/version"
 require "xcode/install/command"
 require "xcode/install/version"
 
@@ -62,6 +63,10 @@ module XcodeInstall
 			FileUtils.mkdir_p(CACHE_DIR)
 		end
 
+		def cache_dir
+			CACHE_DIR
+		end
+
 		def current_symlink
 			File.symlink?(SYMLINK_PATH) ? SYMLINK_PATH : nil
 		end
@@ -84,20 +89,38 @@ module XcodeInstall
 		end
 
 		def installed_versions
-			@installed ||= installed.map { |x| InstalledXcode.new(x) }
+			@installed ||= installed.map { |x| InstalledXcode.new(x) }.sort { 
+				|a,b| Gem::Version.new(a.version) <=> Gem::Version.new(b.version)
+			}
 		end
 
-		def install_dmg(dmgPath, suffix = '')
+		def install_dmg(dmgPath, suffix = '', switch = true, clean = true)
 			xcode_path = "/Applications/Xcode#{suffix}.app"
 
 			`hdiutil mount -nobrowse -noverify #{dmgPath}`
 			puts 'Please authenticate for Xcode installation...'
 			source =  Dir.glob('/Volumes/Xcode/Xcode*.app').first
+
+			if source.nil?
+				puts 'No `Xcode.app` found in DMG.'
+				return
+			end
+
 			`sudo ditto "#{source}" "#{xcode_path}"`
 			`umount "/Volumes/Xcode"`
 
-			`sudo xcode-select -s #{xcode_path}`
-			puts `xcodebuild -version`
+			enable_developer_mode
+			`sudo xcodebuild -license` unless xcode_license_approved?
+
+			if switch
+				`sudo rm -f #{SYMLINK_PATH}` unless current_symlink.nil?
+				`sudo ln -sf #{xcode_path} #{SYMLINK_PATH}` unless SYMLINK_PATH.exist?
+				
+				`sudo xcode-select --switch #{xcode_path}`
+				puts `xcodebuild -version`
+			end
+
+			FileUtils.rm_f(dmgPath) if clean
 		end
 
 		def list_current
@@ -127,12 +150,18 @@ module XcodeInstall
 
 		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')
 
 		def devcenter
 			@devcenter ||= FastlaneCore::DeveloperCenter.new
 		end
 
+		def enable_developer_mode
+			`sudo /usr/sbin/DevToolsSecurity -enable`
+			`sudo /usr/sbin/dseditgroup -o edit -t group -a staff _developer`
+		end
+
 		def get_seedlist
 			@xcodes = parse_seedlist(devcenter.download_seedlist)
 			@xcodes += prereleases
@@ -151,7 +180,9 @@ module XcodeInstall
 		def parse_seedlist(seedlist)
 			seedlist['data'].select { 
 				|t| /^Xcode [0-9]/.match(t['name'])
-			}.map { |x| Xcode.new(x) }.sort { |a,b| a.dateModified <=> b.dateModified }
+			}.map { |x| Xcode.new(x) }.reject { |x| x.version < MINIMUM_VERSION }.sort { 
+				|a,b| a.dateModified <=> b.dateModified
+			}
 		end
 
 		def list_versions
@@ -170,6 +201,10 @@ module XcodeInstall
 			@xcodes = Marshal.load(File.read(LIST_FILE)) if LIST_FILE.exist? && xcodes.nil?
 			xcodes || get_seedlist
 		end
+
+		def xcode_license_approved?
+			!(`/usr/bin/xcrun clang 2>&1` =~ /license/ && !$?.success?)
+		end
 	end
 
 	class InstalledXcode
@@ -194,12 +229,19 @@ module XcodeInstall
 		attr_reader :name
 		attr_reader :path
 		attr_reader :url
+		attr_reader :version
 
 		def initialize(json)
 			@dateModified = json['dateModified'].to_i
 			@name = json['name'].gsub(/^Xcode /, '')
 			@path = json['files'].first['remotePath']
 			@url = "https://developer.apple.com/devcenter/download.action?path=#{@path}"
+
+			begin
+				@version = Gem::Version.new(@name.split(' ')[0])
+			rescue
+				@version = Installer::MINIMUM_VERSION
+			end
 		end
 
 		def self.new_prelease(version, url)
@@ -208,4 +250,4 @@ module XcodeInstall
 				'files' => [{'remotePath' => url.split('=').last}]})
 		end
 	end
-end
+end

data/lib/xcode/install/cleanup.rb

@@ -0,0 +1,14 @@
+module XcodeInstall
+	class Command
+		class Cleanup < Command
+			self.command = 'cleanup'
+			self.summary = 'Cleanup cached downloads.'
+
+			def run
+				installer = XcodeInstall::Installer.new
+				return if installer.cache_dir.nil? || installer.cache_dir.to_s.length < 5
+				FileUtils.rm_f(Dir.glob("#{installer.cache_dir}/*"))
+			end
+		end
+	end
+end

data/lib/xcode/install/command.rb

@@ -13,6 +13,7 @@ module XcodeInstall
 	end
 
 	class Command < CLAide::Command
+		require "xcode/install/cleanup"
 		require "xcode/install/install"
 		require "xcode/install/installed"
 		require "xcode/install/list"

data/lib/xcode/install/install.rb

@@ -8,9 +8,17 @@ module XcodeInstall
 				CLAide::Argument.new('VERSION', :true),
 			]
 
+			def self.options
+				[['--no-switch', 'Don’t switch to this version after installation'],
+				 ['--no-clean', 'Don’t delete DMG after installation.']].concat(super)
+			end
+
 			def initialize(argv)
 				@installer = Installer.new
 				@version = argv.shift_argument
+				@should_clean = argv.flag?('clean', true)
+				@should_switch = argv.flag?('switch', true)
+				super
 			end
 
 			def validate!
@@ -22,8 +30,8 @@ module XcodeInstall
 				dmgPath = @installer.download(@version)
 				raise Informative, "Failed to download Xcode #{@version}." if dmgPath.nil?
 
-				@installer.install_dmg(dmgPath, "-#{@version}")
+				@installer.install_dmg(dmgPath, "-#{@version.split(' ')[0]}", @should_switch, @should_clean)
 			end
 		end
 	end
-end
+end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-	VERSION = "0.0.3"
+	VERSION = "0.1.0"
 end

data/spec/fixtures/xcode_63.json

@@ -0,0 +1,46 @@
+{
+	"active": true,
+	"availableInMemberSite": true,
+	"categories": [
+	{
+		"active": null,
+		"dateCreated": 1052825460000,
+		"dateModified": 1079108316000,
+		"enabled": true,
+		"id": 187,
+		"name": "Developer Tools",
+		"sortOrder": 28
+	}
+	],
+	"dateAvailable": null,
+	"dateCreated": 1425695047000,
+	"dateDisabled": null,
+	"dateModified": 1425943753000,
+	"description": "This is the complete Xcode developer toolset for Mac, iPhone, and iPad. It includes the Xcode IDE, iOS Simulator, and all required tools and frameworks for building OS X and iOS apps.",
+	"files": [
+	{
+		"active": true,
+		"dateCreated": 1425696402000,
+		"dateModified": 1425929405000,
+		"fileSize": 2778059898,
+		"format": {
+			"active": null,
+			"dateCreated": 1066327569000,
+			"dateModified": null,
+			"description": "Disk Image",
+			"extension": ".dmg",
+			"id": 12
+			},
+			"id": 35240,
+			"name": "Xcode 6.3",
+			"remotePath": "/Developer_Tools/Xcode_6.2/Xcode_6.2.dmg",
+			"sortOrder": null,
+			"state": "ENABLED"
+		}
+	],
+	"id": 23600,
+	"name": "Xcode 6.3",
+	"prerelease": false,
+	"releasedSeed": true,
+	"state": "ENABLED"
+}

data/spec/install_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+module XcodeInstall
+	describe Command::Install do
+		before do
+			Installer.any_instance.stubs(:exists).returns(true)
+			Installer.any_instance.stubs(:installed).returns([])
+			fixture = Pathname.new('spec/fixtures/xcode_63.json').read
+			xcode = Xcode.new(JSON.parse(fixture))
+			Installer.any_instance.stubs(:seedlist).returns([xcode])
+		end
+
+		it "downloads and installs" do
+			Installer.any_instance.expects(:download).with("6.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 and does not switch if --no-switch given" do
+			Installer.any_instance.expects(:download).with("6.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
+	end
+end

data/spec/json_spec.rb

@@ -16,6 +16,7 @@ module XcodeInstall
 			installer = Installer.new
 
 			seedlist = installer.send(:parse_seedlist, JSON.parse(fixture))
+			installer.stubs(:installed_versions).returns([])
 			installer.stubs(:xcodes).returns(seedlist)
 			
 			installer.list.should == "6.1\n6.1.1\n6.2"

data/spec/spec_helper.rb

@@ -6,6 +6,9 @@ ROOT = Pathname.new(File.expand_path('../../', __FILE__))
 $:.unshift((ROOT + 'lib').to_s)
 $:.unshift((ROOT + 'spec').to_s)
 
+ENV['DELIVER_USER'] = "xcode-install"
+ENV['DELIVER_PASSWORD'] = "12345password"
+
 require 'bundler/setup'
 require 'bacon'
 require 'mocha-on-bacon'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Boris Bügling
@@ -96,6 +96,7 @@ files:
 - Rakefile
 - bin/xcode-install
 - lib/xcode/install.rb
+- lib/xcode/install/cleanup.rb
 - lib/xcode/install/command.rb
 - lib/xcode/install/install.rb
 - lib/xcode/install/installed.rb
@@ -104,7 +105,9 @@ files:
 - lib/xcode/install/update.rb
 - lib/xcode/install/version.rb
 - spec/fixtures/xcode.json
+- spec/fixtures/xcode_63.json
 - spec/fixtures/yolo.json
+- spec/install_spec.rb
 - spec/json_spec.rb
 - spec/spec_helper.rb
 - xcode-install.gemspec
@@ -134,7 +137,9 @@ specification_version: 4
 summary: Xcode installation manager.
 test_files:
 - spec/fixtures/xcode.json
+- spec/fixtures/xcode_63.json
 - spec/fixtures/yolo.json
+- spec/install_spec.rb
 - spec/json_spec.rb
 - spec/spec_helper.rb
 has_rdoc: