xcode-install 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b87f893b10cddae2347fdbd7efb04798a7a355
-  data.tar.gz: 8e95f4459e1caca918bfb2ae5b466ccd522ea438
+  metadata.gz: 0315796b802e96968533cbd84beffd9196db6278
+  data.tar.gz: 5f1e8191fdd093ce812d335917999e90455498e4
 SHA512:
-  metadata.gz: bc08c7e3e75b4107474e54e259c6700af820c614f57cd1976bfc608fdd1f23395276fb21c1f3f3911ff941f9b79074de4db7f07aa24c18a09e775c1b44ca6246
-  data.tar.gz: 94e6b8ef8923103e2f030c54cfef8454d49ef034e1aa0823d87bf7c7298fffd23d7cb3d75ebc5748da85e848afafb3d341f1d51677c18ea93ec09ddc0703fee0
+  metadata.gz: 6db340040ce85117495e443c0e39f05b3d617698e75aeb869717ffda3576c7b43c1e0162479f549383e7ed42401cc9a687bc59c5df989b24b0cbda3833a4bb15
+  data.tar.gz: 76b48c89942caf99ad195c0d713efb023fc27fc1bde695cd5dc02646ab6fda85af2db1044673ae400e87b01da6ba8fa7b0e40a1d394c9a6abbc7336c2320c944

data/lib/xcode/install.rb

@@ -1,50 +1,11 @@
-require 'fastlane_core'
-require 'fastlane_core/developer_center/developer_center'
+require 'fileutils'
+require 'pathname'
+require 'spaceship'
 require 'nokogiri'
 require 'rubygems/version'
 require 'xcode/install/command'
 require 'xcode/install/version'
 
-module CredentialsManager
-  class PasswordManager
-    alias_method :old_ask_for_login, :ask_for_login
-
-    def ask_for_login
-      puts "\nXcodeInstall needs your developer AppleID credentials to access the DevCenter."
-
-      old_ask_for_login
-    end
-  end
-end
-
-module FastlaneCore
-  class DeveloperCenter
-    def cookies
-      cookie_string = ''
-
-      page.driver.cookies.each do |_key, cookie|
-        cookie_string << "#{cookie.name}=#{cookie.value};"
-      end
-
-      cookie_string
-    end
-
-    def download_seedlist
-      JSON.parse(page.evaluate_script("$.ajax({data: { start: \"0\", limit: \"1000\", " \
-        "sort: \"dateModified\", dir: \"DESC\", searchTextField: \"\", " \
-        "searchCategories: \"\", search: \"false\" } , type: 'GET', " \
-        "url: '/services-account/QH65B2/downloadws/listDownloads.action', " \
-        'async: false})')['responseText'])
-    end
-  end
-
-  module Helper
-    def self.is_test?
-      true
-    end
-  end
-end
-
 module XcodeInstall
   class Curl
     COOKIES_PATH = Pathname.new('/tmp/curl-cookies.txt')
@@ -88,7 +49,7 @@ module XcodeInstall
       xcode = seedlist.find { |x| x.name == version }
       dmg_file = Pathname.new(File.basename(xcode.path))
 
-      result = Curl.new.fetch(xcode.url, CACHE_DIR, devcenter.cookies, dmg_file)
+      result = Curl.new.fetch(xcode.url, CACHE_DIR, spaceship.cookie, dmg_file)
       result ? CACHE_DIR + dmg_file : nil
     end
 
@@ -135,12 +96,12 @@ module XcodeInstall
       FileUtils.rm_f(dmgPath) if clean
     end
 
-    def install_version(version, switch = true, clean = true)
+    def install_version(version, switch = true, clean = true, install = true)
       return if version.nil?
       dmg_path = get_dmg(version)
       fail Informative, "Failed to download Xcode #{version}." if dmg_path.nil?
 
-      install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean)
+      install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean) if install
     end
 
     def list_current
@@ -169,15 +130,21 @@ module XcodeInstall
 
     private
 
+    def spaceship
+      @spaceship ||= begin
+        Spaceship.login(ENV["XCODE_INSTALL_USER"], ENV["XCODE_INSTALL_PASSWORD"])
+        if ENV.key?("XCODE_INSTALL_TEAM_ID")
+          Spaceship.client.team_id = ENV["XCODE_INSTALL_TEAM_ID"]
+        end
+        Spaceship.client
+      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')
 
-    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`
@@ -193,7 +160,15 @@ module XcodeInstall
     end
 
     def fetch_seedlist
-      @xcodes = parse_seedlist(devcenter.download_seedlist)
+      @xcodes = parse_seedlist(spaceship.send(:request, :get, '/services-account/QH65B2/downloadws/listDownloads.action', {
+        start: "0",
+        limit: "1000",
+        sort: "dateModified",
+        dir: "DESC",
+        searchTextField: "",
+        searchCategories: "",
+        search: "false",
+      }).body)
 
       names = @xcodes.map(&:name)
       @xcodes += prereleases.reject { |pre| names.include?(pre.name) }
@@ -227,7 +202,7 @@ module XcodeInstall
     end
 
     def prereleases
-      page = Nokogiri::HTML.parse(devcenter.download_file('/xcode/downloads/'))
+      page = Nokogiri::HTML.parse(spaceship.send(:request, :get, '/xcode/downloads/').body)
       links = page.xpath('//a').select { |link| link['href'].end_with?('.dmg') }
 
       links.map { |pre| Xcode.new_prelease(pre.text.strip.gsub(/.*Xcode /, ''), pre['href']) }

data/lib/xcode/install/install.rb

@@ -10,6 +10,7 @@ module XcodeInstall
 
       def self.options
         [['--no-switch', 'Don’t switch to this version after installation'],
+         ['--no-install', 'Only download DMG, but do not install it.'],
          ['--no-clean', 'Don’t delete DMG after installation.']].concat(super)
       end
 
@@ -17,6 +18,7 @@ module XcodeInstall
         @installer = Installer.new
         @version = argv.shift_argument
         @should_clean = argv.flag?('clean', true)
+        @should_install = argv.flag?('install', true)
         @should_switch = argv.flag?('switch', true)
         super
       end
@@ -29,7 +31,7 @@ module XcodeInstall
 
       def run
         return if @version.nil?
-        @installer.install_version(@version, @should_switch, @should_clean)
+        @installer.install_version(@version, @should_switch, @should_clean, @should_install)
       end
     end
   end

data/lib/xcode/install/version.rb

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

data/spec/prerelease_spec.rb

@@ -18,6 +18,12 @@ module XcodeInstall
       devcenter = mock
       devcenter.stubs(:download_file).returns(nil)
       Installer.any_instance.stubs(:devcenter).returns(devcenter)
+
+      result = mock
+      result.stubs(:body).returns(nil)
+      client = mock
+      client.stubs(:request).returns(result)
+      Spaceship::Client.stubs(:login).returns(client)
     end
 
     it 'can parse prereleases from 20150414' do

data/xcode-install.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: fastlane_core
+  name: spaceship
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement