xcode-install 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f61fb89ee9fecddefddd87b1df67c29cf5c371f
-  data.tar.gz: 2d6dde670a447ae9a11c9e631a295d7d87efb963
+  metadata.gz: 42dac883f70abe088d3de8820a9f465b097bd121
+  data.tar.gz: 29abe4bcda93cc9d5da4fd38b594c527f06fd57f
 SHA512:
-  metadata.gz: 144ae8e0f03074a598f387715650e2661b9e0d9defb2bf47f522c1ab423e79b70dd3a6c657a9490d58c3587f915b6e0324ff96b6022ee31f6c62d4ecd1339603
-  data.tar.gz: 3eaf14c307554b72074c0dc2c5e1ae9b670e253ddc34f982983ecbfa8fdf4ea013b38202cf68b5da47f9e9fbedd67c1e7077f69b84cd26c6aa3b93cb15a8b53b
+  metadata.gz: e060a74eb4a236a12cd19d14c76a04dada5e8343f4318664187fec2d0bb2c5c22455621b4c705241bca4674a36bbbf4b7125b055a38ab1da49fc78711d2f0822
+  data.tar.gz: 4a9f4578d366f38d424838bab7d99ba766db809088863281e2d4d69561bbdc0220c90818cf3c0c734884657bafc11f7449eba27184027b6777cab20cf3fcb7af

data/lib/xcode/install.rb

@@ -57,10 +57,6 @@ module XcodeInstall
       list_versions.include?(version)
     end
 
-    def install_components(xcode_path)
-      `#{xcode_path}/Contents/MacOS/Xcode -installComponents`
-    end
-
     def installed?(version)
       installed_versions.map(&:version).include?(version)
     end
@@ -71,7 +67,7 @@ module XcodeInstall
       end
     end
 
-    def install_dmg(dmgPath, suffix = '', switch = true, clean = true, components = true)
+    def install_dmg(dmgPath, suffix = '', switch = true, clean = true)
       xcode_path = "/Applications/Xcode#{suffix}.app"
 
       `hdiutil mount -nobrowse -noverify #{dmgPath}`
@@ -92,11 +88,11 @@ HELP
 
       if not verify_integrity(xcode_path)
         `sudo rm -f #{xcode_path}`
+        return
       end
 
       enable_developer_mode
-      `sudo xcodebuild -license` unless xcode_license_approved?
-      install_components(xcode_path) if components
+      `sudo xcodebuild -license accept` unless xcode_license_approved?
 
       if switch
         `sudo rm -f #{SYMLINK_PATH}` unless current_symlink.nil?
@@ -109,13 +105,12 @@ HELP
       FileUtils.rm_f(dmgPath) if clean
     end
 
-    def install_version(version, switch = true, clean = true, install = true, progress = true,
-          components = true)
+    def install_version(version, switch = true, clean = true, install = true, progress = true)
       return if version.nil?
       dmg_path = get_dmg(version, progress)
       fail Informative, "Failed to download Xcode #{version}." if dmg_path.nil?
 
-      install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean, components) if install
+      install_dmg(dmg_path, "-#{version.split(' ')[0]}", switch, clean) if install
     end
 
     def list_current
@@ -245,7 +240,7 @@ HELP
     end
 
     def verify_integrity(path)
-      puts `codesign --verify --verbose #{path}`
+      puts `/usr/sbin/spctl --assess --verbose=4 --type execute #{path}`
       $?.exitstatus == 0
     end
 

data/lib/xcode/install/install.rb

@@ -12,7 +12,6 @@ module XcodeInstall
         [['--no-switch', 'Don’t switch to this version after installation'],
          ['--no-install', 'Only download DMG, but do not install it.'],
          ['--no-progress', 'Don’t show download progress.'],
-         ['--no-install-components', 'Don’t install additional components.'],
          ['--no-clean', 'Don’t delete DMG after installation.']].concat(super)
       end
 
@@ -23,7 +22,6 @@ module XcodeInstall
         @should_install = argv.flag?('install', true)
         @should_switch = argv.flag?('switch', true)
         @progress = argv.flag?('progress', true)
-        @components = argv.flag?('components', true)
         super
       end
 
@@ -38,7 +36,7 @@ module XcodeInstall
       def run
         return if @version.nil?
         @installer.install_version(@version, @should_switch, @should_clean, @should_install,
-          @progress, @components)
+          @progress)
       end
     end
   end

data/lib/xcode/install/version.rb

@@ -1,3 +1,3 @@
 module XcodeInstall
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/spec/install_spec.rb

@@ -12,26 +12,20 @@ module XcodeInstall
 
     it 'downloads and installs' do
       Installer.any_instance.expects(:download).with('6.3', true).returns('/some/path')
-      Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true, true)
+      Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
       Command::Install.run(['6.3'])
     end
 
     it 'downloads and installs and does not switch if --no-switch given' do
       Installer.any_instance.expects(:download).with('6.3', true).returns('/some/path')
-      Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', false, true, true)
+      Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', false, true)
       Command::Install.run(['6.3', '--no-switch'])
     end
 
     it 'downloads without progress if switch --no-progress is given' do
       Installer.any_instance.expects(:download).with('6.3', false).returns('/some/path')
-      Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true, true)
+      Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true)
       Command::Install.run(['6.3', '--no-progress'])
     end
-
-    it 'does not install components if switch --no-components is given' do
-      Installer.any_instance.expects(:download).with('6.3', true).returns('/some/path')
-      Installer.any_instance.expects(:install_dmg).with('/some/path', '-6.3', true, true, false)
-      Command::Install.run(['6.3', '--no-components'])
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcode-install
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide