xcode-install 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07bf6a5e12986899c2838cfaa033a800cd926f3b
-  data.tar.gz: 4ad83829d78ba4f4e5f7519ff150c4ac9958298e
+  metadata.gz: fc28280820fe62413795965ee4b361d46b7aaff7
+  data.tar.gz: df8eab78dbaf502ac3006c2dc8d070a0562e4c70
 SHA512:
-  metadata.gz: a9be63a2ef0f3a58331eb6c1e07bfad285bf14023a832863d16f755f13557b2a5a6a5781724f54bcfd0f73ac3e847d6a4127e11d7d88dd866e286e09518a6592
-  data.tar.gz: 8d1f06026a27dbdd3571a6e13dfc2b9fb0499cdedcbc166b4911c516a5b7fa70f4a111f772f67eb8786eda15844cd60617731a63ceebece9b7beea393dfbb481
+  metadata.gz: f7aa0c1185455dc2edf0f2e63fd4b49262202e36a2941c74d8cc16eaf7b237ffddac48cbffd2331338efc310d558038ea0fb5c49ecfe22abd06d3998f45004cd
+  data.tar.gz: 299a9e10235efe65b101330cbfae0f8c1016c89d9c2d7fdf6fba67812acf5e8be498517e1c960ba52b5953f6a2d6ddb198782e2454ec642c4b458653462714e2

data/lib/xcode/install.rb

@@ -18,11 +18,11 @@ module FastlaneCore
 		end
 
 		def download_seedlist
-			# categories: Applications%2CDeveloper%20Tools%2CiOS%2COS%20X%2COS%20X%20Server%2CSafari
 			JSON.parse(page.evaluate_script("$.ajax({data: { start: \"0\", limit: \"1000\", " + 
 				"sort: \"dateModified\", dir: \"DESC\", searchTextField: \"\", " + 
-				"searchCategories: \"\", search: \"false\" } , type: 'POST', " + 
-				"url: '/downloads/seedlist.action', async: false})")['responseText'])
+				"searchCategories: \"\", search: \"false\" } , type: 'GET', " + 
+				"url: '/services-account/QH65B2/downloadws/listDownloads.action', " +
+				"async: false})")['responseText'])
 		end
 	end
 
@@ -123,6 +123,14 @@ module XcodeInstall
 			FileUtils.rm_f(dmgPath) if clean
 		end
 
+		def install_version(version, switch = true, clean = true)
+			return if version.nil?
+			dmg_path = get_dmg(version)
+			raise Informative, "Failed to download Xcode #{version}." if dmg_path.nil?
+
+			install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean)
+		end
+
 		def list_current
 			majors = list_versions.map { |v| v.split('.')[0] }.select { |v| v.length == 1 }.uniq
 			list_versions.select { |v| v.start_with?(majors.last) }.join("\n")
@@ -146,7 +154,7 @@ module XcodeInstall
 			File.absolute_path(File.readlink(current_symlink), SYMLINK_PATH.dirname) if current_symlink
 		end
 
-		:private
+		private
 
 		CACHE_DIR = Pathname.new("#{ENV['HOME']}/Library/Caches/XcodeInstall")
 		LIST_FILE = CACHE_DIR + Pathname.new('xcodes.bin')
@@ -162,6 +170,17 @@ module XcodeInstall
 			`sudo /usr/sbin/dseditgroup -o edit -t group -a staff _developer`
 		end
 
+		def get_dmg(version)
+			if ENV.key?("XCODE_INSTALL_CACHE_DIR")
+				cache_path = Pathname.new(ENV["XCODE_INSTALL_CACHE_DIR"]) + Pathname.new("xcode-#{version}.dmg")
+				if cache_path.exist?
+					return cache_path
+				end
+			end
+			
+			return download(version)
+		end
+
 		def get_seedlist
 			@xcodes = parse_seedlist(devcenter.download_seedlist)
 			
@@ -180,7 +199,7 @@ module XcodeInstall
 		end
 
 		def parse_seedlist(seedlist)
-			seedlist['data'].select { 
+			seedlist['downloads'].select { 
 				|t| /^Xcode [0-9]/.match(t['name'])
 			}.map { |x| Xcode.new(x) }.reject { |x| x.version < MINIMUM_VERSION }.sort { 
 				|a,b| a.dateModified <=> b.dateModified

data/lib/xcode/install/install.rb

@@ -29,10 +29,7 @@ module XcodeInstall
 
 			def run
 				return if @version.nil?
-				dmgPath = @installer.download(@version)
-				raise Informative, "Failed to download Xcode #{@version}." if dmgPath.nil?
-
-				@installer.install_dmg(dmgPath, "-#{@version.split(' ')[0]}", @should_switch, @should_clean)
+				@installer.install_version(@version, @should_switch, @should_clean)
 			end
 		end
 	end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-	VERSION = "0.2.0"
+	VERSION = "0.3.0"
 end

data/spec/prerelease_spec.rb

@@ -11,7 +11,7 @@ module XcodeInstall
 			Nokogiri::HTML.stubs(:parse).returns(fixture)
 
 			installer = Installer.new
-			installer.prereleases
+			installer.send(:prereleases)
 		end
 
 		before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide