xcode-install 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb80bb2429a1558044625a956d843691ce65d525
-  data.tar.gz: e7340fe8ba79c3c1a23794abaa2f5359049b39a5
+  metadata.gz: c0cb5346a3d13b6710a60b68ca9099b0f2a55a8f
+  data.tar.gz: 99e5071dcd26f18f76d8d82c52e1bb46f5a4a161
 SHA512:
-  metadata.gz: 03569b84449611a4293b25fb7e81ffb570cfc485ff2fb6556cd11c69d0c14e032c8da9205d5df95cd250a2b0b54f625568e0c9e2ec07df71296c15b4fa7e6e69
-  data.tar.gz: 53861325aafff7a2ddd1273c0afc4b076757793f8a09c9977a06d36ee0891a7aaeedb39146f832e09765de5acab9a0a6f1f90f427277f027f0859899b3745afa
+  metadata.gz: 3c547031019e7cd391bb33cebe55298204ad3494bc36f2a1e9bf88d58986fc009645d6671285db7f862d3b3e2a1a997e080f9c948128bd0ecb22de97a3f04a4c
+  data.tar.gz: 6108652858c7e60ba5d25d19ef9b974ecaf117175ecf754d545a2a19461f13bf97e18ed41937b907bf1bd9bde1d118d82f3400bdd7614db0b0bc3ae81f8bcc57

data/lib/xcode/install.rb

@@ -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
@@ -248,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

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)
@@ -33,7 +35,7 @@ module XcodeInstall
         super
 
         help! 'A VERSION argument is required.' unless @version
-        fail Informative, "Version #{@version} already installed." if @installer.installed?(@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

@@ -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 "xcversion simulators --install=#{candidate.version}"
+          puts "xcversion simulators --install=#{candidate.name}"
         end
         exit 1
       end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

data/xcode-install.gemspec

@@ -20,7 +20,7 @@ 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 'claide', '>= 0.9.1', '< 1.1.0'
   # spec.add_dependency 'spaceship', '>= 0.16.0', '< 1.0.0'
   spec.add_dependency 'spaceship', '= 0.15.1'
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-05 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
@@ -42,28 +48,28 @@ dependencies:
   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.
@@ -75,11 +81,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
@@ -129,12 +135,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: []