xcode-install 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0cb5346a3d13b6710a60b68ca9099b0f2a55a8f
-  data.tar.gz: 99e5071dcd26f18f76d8d82c52e1bb46f5a4a161
+  metadata.gz: 2d904f76f82e27723aeacb38c130533ca14c911d
+  data.tar.gz: 4f986c4cb029a6b29812d84a811d24ebdf87c5cf
 SHA512:
-  metadata.gz: 3c547031019e7cd391bb33cebe55298204ad3494bc36f2a1e9bf88d58986fc009645d6671285db7f862d3b3e2a1a997e080f9c948128bd0ecb22de97a3f04a4c
-  data.tar.gz: 6108652858c7e60ba5d25d19ef9b974ecaf117175ecf754d545a2a19461f13bf97e18ed41937b907bf1bd9bde1d118d82f3400bdd7614db0b0bc3ae81f8bcc57
+  metadata.gz: 7e28575b83b56a5a76352fe1fa31768ecf19482ba98b386fda0c54923ba99760b2042b9015d8898b4cceef69284a833a891cf46926533703c940c210a5f06ebb
+  data.tar.gz: 4904ca25e427a493ca1f1d5131572681412bbc89e61e5e49cc854862ee72471e88bc38d485d6f8b3d0e5a708598beed90a804f96a35b63ae5d282f0ab05987d9

data/.rubocop_todo.yml

@@ -28,3 +28,8 @@ Metrics/MethodLength:
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
+
+# FIXME: for spaceship workaround
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/xcode/install.rb'

data/README.md

@@ -75,22 +75,26 @@ XcodeInstall can also manage your local simulators using the `simulators` comman
 
 ```
 $ xcversion simulators
-Xcode 6.4.0 (/Applications/Xcode.app)
+Xcode 6.4 (/Applications/Xcode-6.4.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)
+Xcode 7.2.1 (/Applications/Xcode-7.2.1.app)
 iOS 8.1 Simulator (not installed)
 iOS 8.2 Simulator (not installed)
 iOS 8.3 Simulator (installed)
-iOS 8.4 Simulator (installed)
+iOS 8.4 Simulator (not installed)
+iOS 9.0 Simulator (not installed)
+iOS 9.1 Simulator (not installed)
+tvOS 9.0 Simulator (not installed)
+watchOS 2.0 Simulator (installed)
 ```
 
-To install a simulator, simply:
+To install a simulator, use `--install` and the beginning of a simulator name:
 
 ```
-$ xcversion simulators --install=8.4
+$ xcversion simulators --install='iOS 8.4'
 ###########################################################               82.1%
 ######################################################################## 100.0%
 Please authenticate to install iOS 8.4 Simulator...

data/lib/xcode/install.rb

@@ -7,6 +7,33 @@ require 'rubygems/version'
 require 'xcode/install/command'
 require 'xcode/install/version'
 
+module Spaceship
+  class PortalClient
+    # 🐒🔧 to change `landing_url` 😢
+    # see <https://github.com/neonichu/xcode-install/issues/122>
+    def api_key
+      cache_path = '/tmp/spaceship_api_key.txt'
+      begin
+        cached = File.read(cache_path)
+      rescue Errno::ENOENT
+      end
+      return cached if cached
+
+      landing_url = 'https://developer.apple.com/account/'
+      logger.info('GET: ' + landing_url)
+      headers = @client.get(landing_url).headers
+      results = headers['location'].match(/.*appIdKey=(\h+)/)
+      if (results || []).length > 1
+        api_key = results[1]
+        File.write(cache_path, api_key) if api_key.length == 64
+        return api_key
+      else
+        fail 'Could not find latest API Key from the Dev Portal - the server might be slow right now'
+      end
+    end
+  end
+end
+
 module XcodeInstall
   CACHE_DIR = Pathname.new("#{ENV['HOME']}/Library/Caches/XcodeInstall")
   class Curl
@@ -53,7 +80,7 @@ module XcodeInstall
       xcode = seedlist.find { |x| x.name == version }
       dmg_file = Pathname.new(File.basename(url || xcode.path))
 
-      result = Curl.new.fetch(url || xcode.url, CACHE_DIR, spaceship.cookie, dmg_file, progress)
+      result = Curl.new.fetch(url || xcode.url, CACHE_DIR, url ? nil : spaceship.cookie, dmg_file, progress)
       result ? CACHE_DIR + dmg_file : nil
     end
 

data/lib/xcode/install/cli.rb

@@ -10,8 +10,7 @@ module XcodeInstall
       end
 
       def installed?
-        `xcode-select -p`
-        $?.success?
+        File.exist?('/Library/Developer/CommandLineTools/usr/lib/libxcrun.dylib')
       end
 
       def install

data/lib/xcode/install/uninstall.rb

@@ -16,6 +16,8 @@ module XcodeInstall
 
       def validate!
         super
+        help! 'A VERSION argument is required.' unless @version
+
         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 = '1.2.5'
+  VERSION = '1.2.6'.freeze
 end

data/spec/uninstall_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+module XcodeInstall
+  describe Command::Uninstall do
+    describe 'when invoked' do
+      it 'raise error when the version is not specified' do
+        Command::Uninstall.any_instance.expects(:help!)
+        -> { Command::Uninstall.run([]) }.should.raise(Exception)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -124,6 +124,7 @@ files:
 - spec/list_spec.rb
 - spec/prerelease_spec.rb
 - spec/spec_helper.rb
+- spec/uninstall_spec.rb
 - xcode-install.gemspec
 homepage: https://github.com/neonichu/xcode-install
 licenses:
@@ -169,4 +170,5 @@ test_files:
 - spec/list_spec.rb
 - spec/prerelease_spec.rb
 - spec/spec_helper.rb
+- spec/uninstall_spec.rb
 has_rdoc: