Fix installed list can distinguish beta version (#386)

fix: #384

Author: Kesin11

lib/xcode/install.rb

@@ -300,12 +300,16 @@ def open_release_notes_url(version)
     end
 
     def list_annotated(xcodes_list)
-      installed = installed_versions.map(&:version)
+      installed = installed_versions.map(&:appname_version)
+
       xcodes_list.map do |x|
-        xcode_version = x.split(' ').first # exclude "beta N", "for Lion".
-        xcode_version << '.0' unless xcode_version.include?('.')
+        xcode_version = x.split(' ') # split version and "beta N", "for Lion"
+        xcode_version[0] << '.0' unless xcode_version[0].include?('.')
+
+        # to match InstalledXcode.appname_version format
+        version = Gem::Version.new(xcode_version.join('.'))
 
-        installed.include?(xcode_version) ? "#{x} (installed)" : x
+        installed.include?(version) ? "#{x} (installed)" : x
       end.join("\n")
     end
 
@@ -601,6 +605,12 @@ def bundle_version
       @bundle_version ||= Gem::Version.new(bundle_version_string)
     end
 
+    def appname_version
+      appname = @path.basename('.app').to_s
+      version_string = appname.split('-').last
+      Gem::Version.new(version_string)
+    end
+
     def uuid
       @uuid ||= plist_entry(':DVTPlugInCompatibilityUUID')
     end

spec/list_spec.rb

@@ -23,8 +23,9 @@ def fake_xcodes(*names)
     end
 
     def fake_installed_xcode(name)
-      xcode_path = "/Applications/Xcode-#{name}.app"
-      xcode_version = name
+      installed_name = name.split(' ').join('.')
+      xcode_path = "/Applications/Xcode-#{installed_name}.app"
+      xcode_version = name.split(' ').first
       xcode_version << '.0' unless name.include? '.'
 
       installed_xcode = InstalledXcode.new(xcode_path)
@@ -49,9 +50,21 @@ def fake_installed_xcodes(*names)
     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'
+        fake_installed_xcodes '2.3', '4.3.1 for Lion', '10 beta'
         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
+
+      it 'distinguish between beta and official_version' do
+        fake_xcodes '11.4', '11.4 beta'
+        fake_installed_xcodes '11.4'
+        installer.list.should == "11.4 (installed)\n11.4 beta"
+      end
+
+      it 'distinguish each beta versions' do
+        fake_xcodes '11.4 beta', '11.4 beta 3'
+        fake_installed_xcodes '11.4 beta'
+        installer.list.should == "11.4 beta (installed)\n11.4 beta 3"
+      end
     end
   end
 end