update_xcode_plugins 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4c8f15764baf5b6abcc5987933aff96e9ac3b44
-  data.tar.gz: 08f4b1549988bc40de7b63c31cb3f7d9bc4fdae2
+  metadata.gz: 1ba1526a18aa0ff1dc1d4257f24f96eaf5d76d0a
+  data.tar.gz: eafea9c77568919a725cb17cfeb850ee8c2dbc26
 SHA512:
-  metadata.gz: 24e196c7d18665d7603e0ba64a3282a83c1e37ed7c0ac78c8612097e666775262977d6656ed05220b334cfb52574cec1ef4da3a86cd4db9c1ea11aa434ca1935
-  data.tar.gz: d8da91bc440b22980b5d4ff19c3325128dd2740a661adb1c13b3630b411dc42427fb4b5b46bd828ba56e34155889db18df65aba3368153bf05f075fbdfd14f50
+  metadata.gz: e2a65e86f6c305a9c509c4e611ec032fe738667b1f572377276a2a30bafa368e00e5a6169d0666674b6c4e48c1b364fe1f3d9f1de89b97f17f0dc1efdcc0730b
+  data.tar.gz: 1a1b3dd52ea2ea28164a5bd6c4fd8a8c91a5c984eb2e059102a83e71e0ce98e5c07eb611a0ac23dff85452dcbdb7268c2ae624fa3fe8117dd2a470669066cc25

data/README.md

@@ -1,3 +1,5 @@
+![](https://travis-ci.org/inket/update_xcode_plugins.svg?branch=master)
+
 ### $ update\_xcode\_plugins
 
 This tool adds the missing UUIDs into the installed Xcode plug-ins so that they can be loaded by newer versions of Xcode.

data/bin/update_xcode_plugins

@@ -12,6 +12,13 @@ else
   elsif CLI.unsign_xcode?
     XcodeUnsigner.unsign_xcode
   else
+    if CLI.non_interactive?
+      # This tool is ran by launchctl whenever a plugin is added/modified,
+      # which presents a race condition if the plugin is still in the process
+      # of being modified. Counter that by sleeping for a few seconds.
+      sleep 2
+    end
+
     PluginsUpdater.update_plugins
   end
 end

data/lib/cli.rb

@@ -15,6 +15,14 @@ module CLI
     ARGV.include?('--unsign')
   end
 
+  def self.no_colors?
+    ARGV.include?('--no-colors')
+  end
+
+  def self.non_interactive?
+    ARGV.include?('--non-interactive')
+  end
+
   def self.codesign_exists?
     `which codesign` && $CHILD_STATUS.exitstatus == 0
   end
@@ -26,7 +34,11 @@ module CLI
     error: :red,
     success: :green
   }.each do |type, color|
-    define_method type.to_sym do |str| puts str.colorize(color) end
+    if CLI.no_colors?
+      define_method type.to_sym do |str| puts str end
+    else
+      define_method type.to_sym do |str| puts str.colorize(color) end
+    end
   end
 
   def separator

data/lib/launch_agent.rb

@@ -106,6 +106,8 @@ class LaunchAgent
           <string>/usr/bin/env</string>
           <string>ruby</string>
           <string>#{bin_path}</string>
+          <string>--no-colors</string>
+          <string>--non-interactive</string>
         </array>
         <key>RunAtLoad</key>
         <false/>

data/lib/plugins_updater.rb

@@ -42,6 +42,8 @@ class PluginsUpdater
     separator
     success 'Finished! 🎉'
 
+    return if CLI.no_colors?
+
     if xcodes.any? { |xcode| xcode.version.to_f >= 8 }
       separator
       warning 'It seems that you have Xcode 8+ installed!'

data/lib/update_xcode_plugins.rb

@@ -1,7 +1,8 @@
 require 'English'
 require 'fileutils'
-require 'colorize'
-require 'inquirer'
+require_relative 'cli'
+require 'colorize' unless CLI.no_colors?
+require 'inquirer' unless CLI.non_interactive?
 require_relative 'version'
 require_relative 'plugins_updater'
 require_relative 'xcode_unsigner'

data/lib/version.rb

@@ -1,3 +1,3 @@
 class UpdateXcodePlugins
-  VERSION = '0.2'.freeze
+  VERSION = '0.3'.freeze
 end

data/lib/xcode.rb

@@ -31,11 +31,12 @@ class Xcode < Bundle
     signed
   end
 
-  def unsign!
-    `#{unsign_path} "#{binary_path}"` &&
-      $CHILD_STATUS.exitstatus == 0 &&
-      File.exist?(unsigned_binary_path) &&
-      FileUtils.mv(unsigned_binary_path, binary_path)
+  def unsign_binary!
+    unsign!(binary_path)
+  end
+
+  def unsign_xcodebuild!
+    unsign!(xcodebuild_path)
   end
 
   def uuid
@@ -56,8 +57,8 @@ class Xcode < Bundle
     "#{path}/Contents/MacOS/Xcode"
   end
 
-  def unsigned_binary_path
-    "#{binary_path}.unsigned"
+  def xcodebuild_path
+    "#{path}/Contents/Developer/usr/bin/xcodebuild"
   end
 
   def unsign_path
@@ -65,4 +66,13 @@ class Xcode < Bundle
 
     "#{lib_path}/bin/unsign"
   end
+
+  def unsign!(target)
+    unsigned_target = "#{target}.unsigned"
+
+    `#{unsign_path} "#{target}"` &&
+      $CHILD_STATUS.exitstatus == 0 &&
+      File.exist?(unsigned_target) &&
+      FileUtils.mv(unsigned_target, target)
+  end
 end

data/lib/xcode_unsigner.rb

@@ -33,6 +33,8 @@ class XcodeUnsigner
 
     xcode = xcodes[selection - 1]
 
+    unsign_xcodebuild = Ask.confirm "Unsign xcodebuild too?"
+
     new_xcode_path = '/Applications/Xcode-unsigned.app'
     if Dir.exist?(new_xcode_path)
       error 'Xcode-unsigned.app already exists.'
@@ -44,7 +46,9 @@ class XcodeUnsigner
 
     process 'Unsigning...'
     new_xcode = Xcode.new(new_xcode_path)
-    if new_xcode.unsign!
+
+    if new_xcode.unsign_binary! &&
+       (!unsign_xcodebuild || (unsign_xcodebuild && new_xcode.unsign_xcodebuild!))
       success 'Finished! 🎉'
     else
       error "Could not unsign Xcode-unsigned.app\n"\

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: update_xcode_plugins
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Mahdi Bchetnia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize