xcode-install 2.4.2 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c5dd5a3b77294226cee2517e8c1fdcc61b06e33
-  data.tar.gz: b6e24762b17103dcefe53bda890d2123ffd8813f
+  metadata.gz: 4c43c13e228edd82063837dec15bef00af49fb63
+  data.tar.gz: f64ad23b9c1f0170f105a545d6d961bc4aafb11b
 SHA512:
-  metadata.gz: e15a742d06e79df749d1fd985e3fe98ac1433284f684c1ffc745b781f53fe219d007ab8a93b0b1c0346da7f59b9f9a599759061680b2ec6e1ca121348a188efe
-  data.tar.gz: feb6df4ef068d01fa076b45d7b184ffad1277567775f47c1320ac6618f3766e37f59179e029411a811eb28cfc08895f40b688604f28f3f091e54dc56ef4a1cbe
+  metadata.gz: 1c879eb96b5d2e6dbe2ee8f804d59453a13885a41a317c3e21dcb78f08d99a67a492f0d90e1365516cd593ff0ebd17e868cf1b78cae097ba7ae0cc1fb442c793
+  data.tar.gz: 8c3db34c1552b25f9b37dc30f2776932f57633151978efdfefc02064e79b6306ea9e7b6b7c679dd819f33be1327860791352756c6699c1ac2a29bcdc6f0ed85f

data/lib/xcode/install.rb

@@ -293,7 +293,12 @@ 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
@@ -589,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
@@ -652,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/lib/xcode/install/install.rb

@@ -37,7 +37,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.2'.freeze
+  VERSION = '2.4.4'.freeze
 end

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,11 +22,36 @@ 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', '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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.4
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-27 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.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Xcode installation manager.