xcode-install 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6400b83c001ff5429ba066cb709c7c48a3ee52d3
-  data.tar.gz: d03b8a2ca220319f47e47883cff2b240bcdd6697
+  metadata.gz: 692e7a2d0f5405ba8f1f5d8aed39cc36be68cd91
+  data.tar.gz: af0d1cf4e618a42dc06c540c8c050340757cbcb4
 SHA512:
-  metadata.gz: 7f670c8560447440ae2b048c481a91addf64752bbc083c0f849a92bc46a403eb09f7d58c05eaaa2714a9d7b005287821d01340bf78a4cc91f89be8e0875687b1
-  data.tar.gz: 1c116c302f03f011a924f6bd764967703fcc00af5578554318be11bc96045e28ec210a6e310e8059d04c20473d26af21e763e3b1e57a28986077a92f76f14549
+  metadata.gz: 490d574a7dbfcec4e9c2d7193deb91ed3fe3b29a3497b1b364fe33824c8d75e41cd6e90ff210f5d4f203819b46f760a353c72b618113356351f0d19c7eb572b2
+  data.tar.gz: cf9dcb687e61e0387ccae70536259371fcd6018b2b1c2d61083310fb6e9a89165e156a418915366627597cc16784d2b151b38572cb4637f7f98c94ce49b41131

data/.gitignore

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

data/.rubocop.yml

@@ -1,20 +1,21 @@
-Metrics/AbcSize:
-  Max: 18
-
-Metrics/ClassLength:
-  Max: 130
-
-Metrics/CyclomaticComplexity:
-  Max: 7
+inherit_from: .rubocop_todo.yml
 
 Metrics/LineLength:
   Max: 215
 
-Metrics/MethodLength:
-  Max: 20
+Style/AsciiComments:
+  Enabled: false
 
 Style/Documentation:
   Enabled: false
 
+Style/FileName:
+  Exclude:
+    - bin/🎉
+    - bin/xcode-install
+
+Style/SpecialGlobalVars:
+  Enabled: false
+
 Lint/Void:
   Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,34 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-04-26 22:45:06 -0700 using RuboCop version 0.35.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 11
+Metrics/AbcSize:
+  Max: 39
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 226
+
+# Offense count: 3
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 10
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 40
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 9

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+os: osx
+osx_image: xcode7.3
 rvm: 2.0.0-p598
 cache: bundler
-script: bundle exec rake spec
+script:
+  - bundle exec rake spec
+  - bundle exec rake rubocop

data/Gemfile

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

data/README.md

@@ -7,15 +7,24 @@
 
 Install and update your Xcodes automatically.
 
-```bash
+```
 $ gem install xcode-install
 $ xcversion install 6.3
 ```
 
 ## Installation
 
-```bash
-$ gem install xcversion
+```
+$ 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
@@ -30,7 +39,7 @@ XCODE_INSTALL_PASSWORD
 
 To list available versions:
 
-```bash
+```
 $ xcversion list
 6.0.1
 6.1
@@ -39,11 +48,11 @@ $ 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:
 
-```bash
+```
 $ xcversion install 6.3
 ###########################################################               82.1%
 ######################################################################## 100.0%
@@ -57,7 +66,7 @@ This will download and install that version of Xcode. It will also be automatica
 
 Note: GMs and beta versions usually have special names, e.g.
 
-```bash
+```
 $ xcversion list
 7 GM seed
 7.1 beta
@@ -73,24 +82,28 @@ XcodeInstall can also install Xcode's Command Line Tools by calling `xcversion i
 
 XcodeInstall can also manage your local simulators using the `simulators` command.
 
-```bash
-$ xcode-install simulators
-Xcode 6.4.0 (/Applications/Xcode.app)
+```
+$ xcversion simulators
+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:
 
-```bash
-$ xcode-install simulators --install=8.4
+```
+$ xcversion simulators --install='iOS 8.4'
 ###########################################################               82.1%
 ######################################################################## 100.0%
 Please authenticate to install iOS 8.4 Simulator...

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
 
 def specs(dir)
   FileList["spec/#{dir}/*_spec.rb"].shuffle.join(' ')
@@ -9,4 +10,7 @@ task :spec do
   sh "bundle exec bacon #{specs('**')}"
 end
 
-task default: :spec
+desc 'Lints all the files'
+RuboCop::RakeTask.new(:rubocop)
+
+task default: [:spec, :rubocop]

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,18 +34,15 @@ module XcodeInstall
       def validate!
         super
 
-        return if @version.nil?
-        fail Informative, "Version #{@version} already installed." if @installer.installed?(@version)
-        fail Informative, "Version #{@version} doesn't exist." unless @installer.exist?(@version)
-
-        if @url
-          fail Informative, "Invalid URL: `#{@url}`" unless @url =~ /\A#{URI::regexp}\z/
-        end
+        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 @url || @installer.exist?(@version)
+        fail Informative, "Invalid URL: `#{@url}`" unless !@url || @url =~ /\A#{URI.regexp}\z/
       end
 
       def run
         @installer.install_version(@version, @should_switch, @should_clean, @should_install,
-          @progress, @url)
+                                   @progress, @url)
       end
     end
   end

data/lib/xcode/install/installed.rb

@@ -4,10 +4,19 @@ module XcodeInstall
       self.command = 'installed'
       self.summary = 'List installed Xcodes.'
 
+      def self.options
+        [['--uuid', 'Show DVTPlugInCompatibilityUUIDs in the list.']].concat(super)
+      end
+
+      def initialize(argv)
+        @uuid = argv.flag?('uuid', false)
+        super
+      end
+
       def run
         installer = XcodeInstall::Installer.new
         installer.installed_versions.each do |xcode|
-          puts "#{xcode.version}\t(#{xcode.path})"
+          puts "#{xcode.version}\t(#{xcode.path})\t#{@uuid ? xcode.uuid : ''}"
         end
       end
     end

data/lib/xcode/install/select.rb

@@ -17,7 +17,7 @@ module XcodeInstall
       def validate!
         super
 
-        fail Informative, "Please specify a version to select." if @version.nil?
+        fail Informative, 'Please specify a version to select.' if @version.nil?
         fail Informative, "Version #{@version} not installed." unless @installer.installed?(@version)
       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,23 +24,24 @@ module XcodeInstall
     :private
 
     def install
-      filtered_simulators = @installed_xcodes.map { |x| x.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
-      if filtered_simulators.count == 0
+      case filtered_simulators.count
+      when 0
         puts "[!] No simulator matching #{@install} was found. Please specify a version from the following available simulators:".ansi.red
         list
         exit 1
-      elsif filtered_simulators.count == 1
+      when 1
         simulator = filtered_simulators.first
         fail Informative, "#{simulator.name} is already installed." if simulator.installed?
         puts "Installing #{simulator.name} for Xcode #{simulator.xcode.bundle_version}..."
         simulator.install
       else
         puts "[!] More than one simulator matching #{@install} was found. Please specify the full version.".ansi.red
-        filtered_simulators.each do |simulator|
-          puts "Xcode #{simulator.xcode.bundle_version} (#{simulator.xcode.path})".ansi.green
-          puts "xcode-install simulator --install=#{simulator.version}"
+        filtered_simulators.each do |candidate|
+          puts "Xcode #{candidate.xcode.bundle_version} (#{candidate.xcode.path})".ansi.green
+          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
 
@@ -25,10 +27,9 @@ module XcodeInstall
 
         `sudo rm -rf #{installed_path.path}`
 
-        if @installer.symlinks_to == installed_path.path
-          newest_version = @installer.installed_versions.last
-          @installer.symlink(newest_version)
-        end
+        return unless @installer.symlinks_to == installed_path.path
+        newest_version = @installer.installed_versions.last
+        @installer.symlink(newest_version)
       end
     end
   end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'.freeze
 end