xcode-install 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe119d0e500ca2bd3f40878365d9feccc766d78
-  data.tar.gz: 8e910ab1e30bbc5b66b21ea20a25b40647ebc646
+  metadata.gz: d60d0d71fe266fff0ea23311a158463ac4a5c651
+  data.tar.gz: bf22abf6675d40970ae51a1b2a13a40b18659ce8
 SHA512:
-  metadata.gz: 7d3de0a500322bc15c834d00093a05cf206e0040b7dbd71a7d722dda859e9349e9a76f5fb8a65afdb11977c120c623bacc4721a7d512e9b0b9e94d30ac47984f
-  data.tar.gz: a890daa46eddcfdb241b2dc07fef0fda2f3683ca056f7d36d62a75683374d50942ce0229619776331b4307e268f1bfc5fb1fdb4792f2dec46f530cc7ee445a7f
+  metadata.gz: 1ac4de5ae34601cf0295aceda5c0f0d2923baf4856def93bb687a52c7cc7475ea68326daa39313810d5997e6e8f4e16877924f29e9f630aac2ad61c63fba1ba2
+  data.tar.gz: 1d9d696ea778b7c91c62d30d10ecfc1d4932a20d518b723ffdf2fc1c7ab4c101c9662dad286663e44b5135159fada9077fb785a671e098f4ac0c2093874f54e8

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-11-04 13:49:25 +0100 using RuboCop version 0.34.2.
+# on 2016-04-26 22:45:06 -0700 using RuboCop version 0.35.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,11 +13,11 @@ Metrics/AbcSize:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 250
+  Max: 206
 
-# Offense count: 1
+# Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Max: 8
 
 # Offense count: 10
 # Configuration parameters: CountComments.
@@ -29,7 +29,6 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 6
 
-# FIXME: for spaceship workaround
-Lint/HandleExceptions:
-  Exclude:
-    - 'lib/xcode/install.rb'
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 8

data/lib/xcode/install.rb

@@ -49,8 +49,8 @@ module XcodeInstall
     end
 
     def download(version, progress, url = nil)
-      return unless exist?(version) || url
-      xcode = seedlist.find { |x| x.name == version }
+      return unless url || exist?(version)
+      xcode = seedlist.find { |x| x.name == version } unless url
       dmg_file = Pathname.new(File.basename(url || xcode.path))
 
       result = Curl.new.fetch(url || xcode.url, CACHE_DIR, url ? nil : spaceship.cookie, dmg_file, progress)
@@ -75,7 +75,6 @@ module XcodeInstall
       xcode_path = "/Applications/Xcode#{suffix}.app"
 
       mount_dir = mount(dmg_path)
-      puts 'Please authenticate for Xcode installation...'
       source = Dir.glob(File.join(mount_dir, 'Xcode*.app')).first
 
       if source.nil?
@@ -88,7 +87,8 @@ HELP
         return
       end
 
-      `sudo ditto "#{source}" "#{xcode_path}"`
+      prompt = "Please authenticate for Xcode installation.\nPassword: "
+      `sudo -p "#{prompt}" ditto "#{source}" "#{xcode_path}"`
       `umount "/Volumes/Xcode"`
 
       unless verify_integrity(xcode_path)
@@ -118,7 +118,7 @@ HELP
 
       install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean) if install
 
-      open_release_notes_url(version)
+      open_release_notes_url(version) unless url
     end
 
     def open_release_notes_url(version)
@@ -436,7 +436,9 @@ HELP
     end
 
     def install_components
-      `sudo installer -pkg #{@path}/Contents/Resources/Packages/MobileDevice.pkg -target /`
+      Dir.glob("#{@path}/Contents/Resources/Packages/*.pkg").each do |pkg|
+        `sudo installer -pkg #{pkg} -target /`
+      end
       osx_build_version = `sw_vers -buildVersion`.chomp
       tools_version = `/usr/libexec/PlistBuddy -c "Print :ProductBuildVersion" "#{@path}/Contents/version.plist"`.chomp
       cache_dir = `getconf DARWIN_USER_CACHE_DIR`.chomp

data/lib/xcode/install/install.rb

@@ -36,7 +36,7 @@ module XcodeInstall
 
         help! 'A VERSION argument is required.' unless @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, "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/installed.rb

@@ -4,10 +4,19 @@ module XcodeInstall
       self.command = 'installed'
       self.summary = 'List installed Xcodes.'
 
+      def self.options
+        [['--uuid', 'Show DVTPlugInCompatibilityUUIDs in the list.']].concat(super)
+      end
+
+      def initialize(argv)
+        @uuid = argv.flag?('uuid', false)
+        super
+      end
+
       def run
         installer = XcodeInstall::Installer.new
         installer.installed_versions.each do |xcode|
-          puts "#{xcode.version}\t(#{xcode.path})"
+          puts "#{xcode.version}\t(#{xcode.path})\t#{@uuid ? xcode.uuid : ''}"
         end
       end
     end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide