xcode-install 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd49f95272394358487c0eed4f39884120ea0717
-  data.tar.gz: f6dc4b73867986caaa06811a2c91e90f6741ec21
+  metadata.gz: f963f106ba542c0705d573d9262d8fb92595df9d
+  data.tar.gz: ac247b88aba2b1548179b04c7e7a6eb6358c5004
 SHA512:
-  metadata.gz: 97e5d324c43f25f40f1b1682eac49544f6d695f44f2e27a942eb9782b635fb770bc271ef5ec81c93f4ace20523fa4cb2ad6dfb7dee03a446923d04feccae663e
-  data.tar.gz: 3ee8b79219737c56cb9d9a8050be6bc88aa15d74b94329907ec742e11bf95341268517ce8aff4218a14192638b465441896bfbd77412fc28bae3615800d2dd9b
+  metadata.gz: e525ac44989fb47d31f0b976228eb1952f4d710fef60def7c3aaee7059312332c9d29e258b3a3a0760f6d39d2a1b067af9f3b3fc622c49a3780a14bd8fd61593
+  data.tar.gz: e630821045db39f07f64840f17e6d96df9ba3cfaeca05cc3391f9b9dc8843d48038382580b96743c3ea5868afda8aed92e8135153bea24320680b99f4f7933c9

data/README.md

@@ -149,9 +149,11 @@ XcodeInstall automatically installs additional components so that it is immediat
 commandline. Unfortunately, Xcode will load third-party plugins even in that situation, which leads
 to a dialog popping up. Feel free to dupe [the radar][5]. 📡
 
-XcodeInstall uses the Spotlight index to locate installed versions of Xcode. If you use it while
+XcodeInstall normally relies on the Spotlight index to locate installed versions of Xcode. If you use it while
 indexing is happening, it might show inaccurate results and it will not be able to see installed
-versions on unindexed volumes.
+versions on unindexed volumes. 
+
+To workaround the Spotlight limitation, XcodeInstall searches `/Applications` folder to locate Xcodes when Spotlight is disabled on the machine, or when Spotlight query for Xcode does not return any results. But it still won't work if your Xcodes are not located under `/Applications` folder.
 
 ## Thanks
 

data/lib/xcode/install/install.rb

@@ -23,6 +23,7 @@ module XcodeInstall
       def initialize(argv)
         @installer = Installer.new
         @version = argv.shift_argument
+        @version ||= File.read('.xcode-version') if File.exist?('.xcode-version')
         @url = argv.option('url')
         @force = argv.flag?('force', false)
         @should_clean = argv.flag?('clean', true)
@@ -37,7 +38,10 @@ module XcodeInstall
         super
 
         help! 'A VERSION argument is required.' unless @version
-        fail Informative, "Version #{@version} already installed." if @installer.installed?(@version) && !@force
+        if @installer.installed?(@version) && !@force
+          print "Version #{@version} already installed."
+          exit(0)
+        end
         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

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.5.0'.freeze
 end

data/lib/xcode/install.rb

@@ -95,7 +95,7 @@ module XcodeInstall
 
           # Call back the block for other processes that might be interested
           matched = progress_content.match(/^\s*(\d+)/)
-          next unless matched.length == 2
+          next unless matched && matched.length == 2
           percent = matched[1].to_i
           progress_block.call(percent) if progress_block
         end
@@ -277,7 +277,7 @@ HELP
       fail Informative, "Failed to download Xcode #{version}." if dmg_path.nil?
 
       if install
-        install_dmg(dmg_path, "-#{version.to_s.split(' ')[0]}", switch, clean)
+        install_dmg(dmg_path, "-#{version.to_s.split(' ').join('.')}", switch, clean)
       else
         puts "Downloaded Xcode #{version} to '#{dmg_path}'"
       end
@@ -293,11 +293,16 @@ HELP
 
     def list_annotated(xcodes_list)
       installed = installed_versions.map(&:version)
-      xcodes_list.map { |x| installed.include?(x) ? "#{x} (installed)" : x }.join("\n")
+      xcodes_list.map do |x|
+        xcode_version = x.split(' ').first # exclude "beta N", "for Lion".
+        xcode_version << '.0' unless xcode_version.include?('.')
+
+        installed.include?(xcode_version) ? "#{x} (installed)" : x
+      end.join("\n")
     end
 
     def list
-      list_annotated(list_versions.sort)
+      list_annotated(list_versions.sort_by(&:to_f))
     end
 
     def rm_list_cache
@@ -381,11 +386,13 @@ HELP
     end
 
     def installed
-      unless (`mdutil -s /` =~ /disabled/).nil?
-        raise 'Please enable Spotlight indexing for /Applications.'
+      result = `mdfind "kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'" 2>/dev/null`.split("\n")
+      if result.empty?
+        result = `find /Applications -maxdepth 1 -name '*.app' -type d -exec sh -c \
+        'if [ "$(/usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" \
+        "{}/Contents/Info.plist" 2>/dev/null)" == "com.apple.dt.Xcode" ]; then echo "{}"; fi' ';'`.split("\n")
       end
-
-      `mdfind "kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'" 2>/dev/null`.split("\n")
+      result
     end
 
     def parse_seedlist(seedlist)
@@ -433,7 +440,7 @@ HELP
         return [] if scan.empty?
 
         version = scan.first.gsub(/<.*?>/, '').gsub(/.*Xcode /, '')
-        link = body.scan(%r{<button .*"(.+?.xip)".*</button>}).first.first
+        link = body.scan(%r{<button .*"(.+?.(dmg|xip))".*</button>}).first.first
         notes = body.scan(%r{<a.+?href="(/go/\?id=xcode-.+?)".*>(.*)</a>}).first.first
         links << Xcode.new(version, link, notes)
       end
@@ -587,7 +594,7 @@ HELP
     end
 
     def bundle_version
-      @bundle_version ||= Gem::Version.new(plist_entry(':DTXcode').to_i.to_s.split(//).join('.'))
+      @bundle_version ||= Gem::Version.new(bundle_version_string)
     end
 
     def uuid
@@ -628,7 +635,7 @@ HELP
     def install_components
       # starting with Xcode 9, we have `xcodebuild -runFirstLaunch` available to do package
       # postinstalls using a documented option
-      if Gem::Version.new(@version) >= Gem::Version.new('9')
+      if Gem::Version.new(version) >= Gem::Version.new('9')
         `sudo #{@path}/Contents/Developer/usr/bin/xcodebuild -runFirstLaunch`
       else
         Dir.glob("#{@path}/Contents/Resources/Packages/*.pkg").each do |pkg|
@@ -650,6 +657,15 @@ HELP
 
     :private
 
+    def bundle_version_string
+      digits = plist_entry(':DTXcode').to_i.to_s
+      if digits.length < 3
+        digits.split(//).join('.')
+      else
+        "#{digits[0..-3]}.#{digits[-2]}.#{digits[-1]}"
+      end
+    end
+
     def plist_entry(keypath)
       `/usr/libexec/PlistBuddy -c "Print :#{keypath}" "#{path}/Contents/Info.plist"`.chomp
     end

data/spec/install_spec.rb

@@ -35,6 +35,14 @@ module XcodeInstall
         Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
         Command::Install.run(['6.3', '--no-progress'])
       end
+
+      it 'reads .xcode-version' do
+        Installer.any_instance.expects(:download).with('6.3', true, nil, nil).returns('/some/path')
+        Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
+        File.expects(:exist?).with('.xcode-version').returns(true)
+        File.expects(:read).returns('6.3')
+        Command::Install.run([])
+      end
     end
 
     it 'parses hdiutil output' do

data/spec/list_spec.rb

@@ -4,7 +4,6 @@ module XcodeInstall
   describe Command::List do
     before do
       installer.stubs(:exists).returns(true)
-      installer.stubs(:installed_versions).returns([])
     end
 
     def installer
@@ -23,10 +22,35 @@ module XcodeInstall
       installer.stubs(:xcodes).returns(xcodes)
     end
 
+    def fake_installed_xcode(name)
+      xcode_path = "/Applications/Xcode-#{name}.app"
+      xcode_version = name
+      xcode_version << '.0' unless name.include? '.'
+
+      installed_xcode = InstalledXcode.new(xcode_path)
+      installed_xcode.stubs(:version).returns(xcode_version)
+      installed_xcode.stubs(:bundle_version).returns(Gem::Version.new(xcode_version))
+      installed_xcode
+    end
+
+    def fake_installed_xcodes(*names)
+      xcodes = names.map { |name| fake_installed_xcode(name) }
+      installer.stubs(:installed_versions).returns(xcodes)
+    end
+
     describe '#list' do
       it 'lists all versions' do
-        fake_xcodes '1', '2.3', '3 some', '4 beta'
-        installer.list.should == "1\n2.3\n3 some\n4 beta"
+        fake_xcodes '1', '2.3', '2.3.1', '2.3.2', '3 some', '4 beta', '10 beta'
+        fake_installed_xcodes
+        installer.list.should == "1\n2.3\n2.3.1\n2.3.2\n3 some\n4 beta\n10 beta"
+      end
+    end
+
+    describe '#list_annotated' do
+      it 'lists all versions with annotations' do
+        fake_xcodes '1', '2.3', '2.3.1', '2.3.2', '3 some', '4.3.1 for Lion', '9.4.1', '10 beta'
+        fake_installed_xcodes '2.3', '4.3.1', '10'
+        installer.list.should == "1\n2.3 (installed)\n2.3.1\n2.3.2\n3 some\n4.3.1 for Lion (installed)\n9.4.1\n10 beta (installed)"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Xcode installation manager.