xcode-install 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a7ead8e362add2bbf5738284d738293203b985
-  data.tar.gz: 14da9635b40e2ad6c83a2fa1272c99fda3f2cbe5
+  metadata.gz: 95ef7ef854f22068da4b6d17fbd0eeec9bd7083b
+  data.tar.gz: a2f55e7e0ae0110d06c2cfac22645e31d696b06e
 SHA512:
-  metadata.gz: 8b81b941c3d34ec102d3f565dc3a098654deadcc2adeddfb77c860963a5af00d610d6d54d0deba1cbc80c9014bba5ac587755ba057b1053f6b8a81d82e78846b
-  data.tar.gz: f832a860866c3069d4b319b737891d0a6a6fe726b4ffb4968fb7c7d56234d8dca6efaabe6681b961b4094c438a816c2527689ef042060101593d880733948c91
+  metadata.gz: 39598493738e22334ffee03e5c4e96cb3aac39d2cdb1640441a24a038f8e6cbf7a00c441783f6d44e83ec630cca68a51f45f0cc6ead5e59a6228fbb4aadf8d4a
+  data.tar.gz: 34467afe0c9238147e88bbd0e1e47a08c5537758688d09b01680c97004bc48b00e943f01d92766ed081217c1524e9faa519f4d4690c943131bd865aded32c984

data/lib/xcode/install.rb

@@ -74,12 +74,26 @@ module XcodeInstall
     def install_dmg(dmg_path, suffix = '', switch = true, clean = true)
       archive_util = '/System/Library/CoreServices/Applications/Archive Utility.app/Contents/MacOS/Archive Utility'
       prompt = "Please authenticate for Xcode installation.\nPassword: "
-      xcode_beta_path = dmg_path.dirname + 'Xcode-beta.app'
       xcode_path = "/Applications/Xcode#{suffix}.app"
 
       if dmg_path.extname == '.xip'
         `'#{archive_util}' #{dmg_path}`
-        `sudo -p "#{prompt}" mv "#{xcode_beta_path}" "#{xcode_path}"`
+        xcode_orig_path = dmg_path.dirname + 'Xcode.app'
+        xcode_beta_path = dmg_path.dirname + 'Xcode-beta.app'
+        if Pathname.new(xcode_orig_path).exist?
+          `sudo -p "#{prompt}" mv "#{xcode_orig_path}" "#{xcode_path}"`
+        elsif Pathname.new(xcode_beta_path).exist?
+          `sudo -p "#{prompt}" mv "#{xcode_beta_path}" "#{xcode_path}"`
+        else
+          out = <<-HELP
+No `Xcode.app(or Xcode-beta.app)` found in XIP. Please remove #{dmg_path} if you
+suspect a corrupted download or run `xcversion update` to see if the version
+you tried to install has been pulled by Apple. If none of this is true,
+please open a new GH issue.
+HELP
+          $stderr.puts out.tr("\n", ' ')
+          return
+        end
       else
         mount_dir = mount(dmg_path)
         source = Dir.glob(File.join(mount_dir, 'Xcode*.app')).first

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide