xcode-install 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d37a17db67d22edd50424ccf56a2e88fdfe46a
-  data.tar.gz: 5a5adb23dc67519d513176a1ed796c9aa54e5c1f
+  metadata.gz: bbe119d0e500ca2bd3f40878365d9feccc766d78
+  data.tar.gz: 8e910ab1e30bbc5b66b21ea20a25b40647ebc646
 SHA512:
-  metadata.gz: 4dc978f5f136e1a621e3a7cbf293d2292dc0e9e00d20f9b0338daa28c37c849742a5c3b8d7f7a9e831f12eca4ac892faacdf938117d8a8100446b42c1467b5a8
-  data.tar.gz: 39ed9aa06b63e5d65c357752898783a80095eb6e1f3311079371a650c6e37e959d5f27575ab9f21b781c5f853af1d21470dbf3fcd670dbce2f623a906b5f3bd8
+  metadata.gz: 7d3de0a500322bc15c834d00093a05cf206e0040b7dbd71a7d722dda859e9349e9a76f5fb8a65afdb11977c120c623bacc4721a7d512e9b0b9e94d30ac47984f
+  data.tar.gz: a890daa46eddcfdb241b2dc07fef0fda2f3683ca056f7d36d62a75683374d50942ce0229619776331b4307e268f1bfc5fb1fdb4792f2dec46f530cc7ee445a7f

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.DS_Store

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/Gemfile

@@ -7,6 +7,6 @@ group :development do
   gem 'mocha-on-bacon'
   gem 'mocha', '~> 0.11.4'
   gem 'prettybacon'
-  gem 'rubocop'
+  gem 'rubocop', '0.35.1'
   gem 'coveralls', require: false
 end

data/README.md

@@ -18,6 +18,15 @@ $ xcversion install 6.3
 $ gem install xcode-install
 ```
 
+Note: unfortunately, XcodeInstall has a transitive dependency on a gem with native extensions and this is not really fixable at this point in time. If you are installing this on a machine without a working compiler, please use these alternative instructions instead:
+
+```
+$ curl -sL -O https://github.com/neonichu/ruby-domain_name/releases/download/v0.5.99999999/domain_name-0.5.99999999.gem
+$ gem install domain_name-0.5.99999999.gem
+$ gem install --conservative xcode-install
+$ rm -f domain_name-0.5.99999999.gem
+```
+
 ## Usage
 
 XcodeInstall needs environment variables with your credentials to access the Apple Developer
@@ -39,7 +48,7 @@ $ xcversion list
 6.3
 ```
 
-By default, only the latest major version is listed.
+Installed versions will be omitted and by default, only the latest major version is listed.
 
 To install a certain version, simply:
 
@@ -75,22 +84,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/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/install.rb

@@ -12,6 +12,7 @@ module XcodeInstall
 
       def self.options
         [['--url', 'Custom Xcode DMG file path or HTTP URL.'],
+         ['--force', 'Install even if the same version is already installed.'],
          ['--no-switch', 'Don’t switch to this version after installation'],
          ['--no-install', 'Only download DMG, but do not install it.'],
          ['--no-progress', 'Don’t show download progress.'],
@@ -22,6 +23,7 @@ module XcodeInstall
         @installer = Installer.new
         @version = argv.shift_argument
         @url = argv.option('url')
+        @force = argv.flag?('force', false)
         @should_clean = argv.flag?('clean', true)
         @should_install = argv.flag?('install', true)
         @should_switch = argv.flag?('switch', true)
@@ -32,8 +34,8 @@ module XcodeInstall
       def validate!
         super
 
-        return if @version.nil?
-        fail Informative, "Version #{@version} already installed." if @installer.installed?(@version)
+        help! 'A VERSION argument is required.' unless @version
+        fail Informative, "Version #{@version} already installed." if @installer.installed?(@version) && !@force
         fail Informative, "Version #{@version} doesn't exist." unless @installer.exist?(@version)
         fail Informative, "Invalid URL: `#{@url}`" unless !@url || @url =~ /\A#{URI.regexp}\z/
       end

data/lib/xcode/install/simulators.rb

@@ -7,7 +7,7 @@ module XcodeInstall
       self.summary = 'List or install iOS simulators.'
 
       def self.options
-        [['--install=version', 'Install simulator with the given version.']].concat(super)
+        [['--install=name', 'Install simulator beginning with name, e.g. \'iOS 8.4\', \'tvOS 9.0\'.']].concat(super)
       end
 
       def initialize(argv)
@@ -24,8 +24,8 @@ module XcodeInstall
     :private
 
     def install
-      filtered_simulators = @installed_xcodes.map(&:available_simulators).flatten.select do |sim|
-        sim.version.to_s.start_with?(@install)
+      filtered_simulators = @installed_xcodes.map(&:available_simulators).flatten.uniq(&:name).select do |sim|
+        sim.name.start_with?(@install)
       end
       case filtered_simulators.count
       when 0
@@ -41,7 +41,7 @@ module XcodeInstall
         puts "[!] More than one simulator matching #{@install} was found. Please specify the full version.".ansi.red
         filtered_simulators.each do |candidate|
           puts "Xcode #{candidate.xcode.bundle_version} (#{candidate.xcode.path})".ansi.green
-          puts "xcode-install candidate --install=#{candidate.version}"
+          puts "xcversion simulators --install=#{candidate.name}"
         end
         exit 1
       end

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.0'
+  VERSION = '1.3.0'.freeze
 end

data/lib/xcode/install.rb

@@ -53,7 +53,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
 
@@ -127,14 +127,20 @@ HELP
       `open #{xcode.release_notes_url}` unless xcode.nil? || xcode.release_notes_url.nil?
     end
 
+    def list_annotated(xcodes_list)
+      installed = installed_versions.map(&:version)
+      xcodes_list.map { |x| installed.include?(x) ? "#{x} (installed)" : x }.join("\n")
+    end
+
     def list_current
       stable_majors = list_versions.reject { |v| /beta/i =~ v }.map { |v| v.split('.')[0] }.map { |v| v.split(' ')[0] }
       latest_stable_major = stable_majors.select { |v| v.length == 1 }.uniq.sort.last.to_i
-      list_versions.select { |v| v.split('.')[0].to_i >= latest_stable_major }.sort.join("\n")
+      current_versions = list_versions.select { |v| v.split('.')[0].to_i >= latest_stable_major }.sort
+      list_annotated(current_versions)
     end
 
     def list
-      list_versions.join("\n")
+      list_annotated(list_versions.sort)
     end
 
     def rm_list_cache
@@ -151,6 +157,14 @@ HELP
       File.absolute_path(File.readlink(current_symlink), SYMLINK_PATH.dirname) if current_symlink
     end
 
+    def mount(dmg_path)
+      plist = hdiutil('mount', '-plist', '-nobrowse', '-noverify', dmg_path.to_s)
+      document = REXML::Document.new(plist)
+      node = REXML::XPath.first(document, "//key[.='mount-point']/following-sibling::*[1]")
+      fail Informative, 'Failed to mount image.' unless node
+      node.text
+    end
+
     private
 
     def spaceship
@@ -240,8 +254,7 @@ HELP
     end
 
     def list_versions
-      installed = installed_versions.map(&:version)
-      seedlist.map(&:name).reject { |x| installed.include?(x) }
+      seedlist.map(&:name)
     end
 
     def prereleases
@@ -276,14 +289,6 @@ HELP
       fail Informative, 'Failed to invoke hdiutil.' unless $?.exitstatus == 0
       result
     end
-
-    def mount(dmg_path)
-      plist = hdiutil('mount', '-plist', '-nobrowse', '-noverify', dmg_path.to_s)
-      document = REXML::Document.new(plist)
-      node = REXML::XPath.first(document, "//key[.='mount-point']/following-sibling::*[1]")
-      fail Informative, 'Failed to mount image.' unless node
-      node.text
-    end
   end
 
   class Simulator
@@ -345,7 +350,7 @@ HELP
 
     def prepare_package
       puts 'Mounting DMG'
-      mount_location = mount(dmg_path)
+      mount_location = Installer.new.mount(dmg_path)
       puts 'Expanding pkg'
       expanded_pkg_path = CACHE_DIR + identifier
       FileUtils.rm_rf(expanded_pkg_path)

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

data/xcode-install.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'claide', '~> 0.9.1'
-  spec.add_dependency 'spaceship', '>= 0.13.0', '< 1.0.0'
+  spec.add_dependency 'claide', '>= 0.9.1', '< 1.1.0'
+  spec.add_dependency 'spaceship', '>= 0.25.1', '< 1.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,75 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: spaceship
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.13.0
-    - - "<"
+        version: 0.25.1
+    - - <
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.13.0
-    - - "<"
+        version: 0.25.1
+    - - <
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Download, install and upgrade Xcodes with ease.
@@ -81,11 +87,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitattributes"
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
+- .gitattributes
+- .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -124,6 +130,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:
@@ -135,12 +142,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -169,4 +176,5 @@ test_files:
 - spec/list_spec.rb
 - spec/prerelease_spec.rb
 - spec/spec_helper.rb
+- spec/uninstall_spec.rb
 has_rdoc: