gym 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5f5e9f45848d646938258084c1063255b3ff116
-  data.tar.gz: 6dbd6b132ba4cedf9458c0bc0091df5aaa6626c8
+  metadata.gz: 132ed6450917f319a13d735ca3eec8e6e0008098
+  data.tar.gz: 3d60b04f50697c5350c8de2b32ca656d1f9ee467
 SHA512:
-  metadata.gz: 214125fc3aa776e2bc01a5f2d21dca7f6c3804029ade500a1a0b1bf08f40f06ac5e3885f946df3c69878763c38b273b4444e792adb0bc795c7ed4aec918b319a
-  data.tar.gz: dda9b35717156348d2bdd9bebb18d21c9b7481672dbb9215e3b8e4651c48484a43e183a97abb3d29405e1679a6b26fa721d0f0a3f4f76a26f9c7e1729d9d5fde
+  metadata.gz: 305c7384722dca916e947d1967884bea07c5e53e4e6169022bca5fe2916f286709358621ab2836fc5d27178a8f858a1ba2b0b94ec7b608926dd8aa9725308a0c
+  data.tar.gz: 8b44624aeff6c7eaae300dfbeaf15138dc688324e4a7b746fcfcd5a5f5701943099126abe7f1c3001c82e873459c1a8ccd9cb3d45be2c3abe0f9626536996fdf

data/README.md

@@ -9,7 +9,7 @@
   <a href="https://github.com/fastlane/deliver">deliver</a> &bull; 
   <a href="https://github.com/fastlane/snapshot">snapshot</a> &bull; 
   <a href="https://github.com/fastlane/frameit">frameit</a> &bull; 
-  <a href="https://github.com/fastlane/PEM">PEM</a> &bull; 
+  <a href="https://github.com/fastlane/pem">pem</a> &bull; 
   <a href="https://github.com/fastlane/sigh">sigh</a> &bull; 
   <a href="https://github.com/fastlane/produce">produce</a> &bull;
   <a href="https://github.com/fastlane/cert">cert</a> &bull;
@@ -17,7 +17,8 @@
   <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
   <a href="https://github.com/fastlane/boarding">boarding</a> &bull;
   <b>gym</b> &bull;
-  <a href="https://github.com/fastlane/scan">scan</a>
+  <a href="https://github.com/fastlane/scan">scan</a> &bull;
+  <a href="https://github.com/fastlane/match">match</a>
 </p>
 -------
 
@@ -233,13 +234,14 @@ Afterwards the `ipa` file is moved to the output folder. The `dSYM` file is comp
 - [`deliver`](https://github.com/fastlane/deliver): Upload screenshots, metadata and your app to the App Store
 - [`snapshot`](https://github.com/fastlane/snapshot): Automate taking localized screenshots of your iOS app on every device
 - [`frameit`](https://github.com/fastlane/frameit): Quickly put your screenshots into the right device frames
-- [`PEM`](https://github.com/fastlane/PEM): Automatically generate and renew your push notification profiles
+- [`pem`](https://github.com/fastlane/pem): Automatically generate and renew your push notification profiles
 - [`produce`](https://github.com/fastlane/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
 - [`cert`](https://github.com/fastlane/cert): Automatically create and maintain iOS code signing certificates
 - [`spaceship`](https://github.com/fastlane/spaceship): Ruby library to access the Apple Dev Center and iTunes Connect
 - [`pilot`](https://github.com/fastlane/pilot): The best way to manage your TestFlight testers and builds from your terminal
 - [`boarding`](https://github.com/fastlane/boarding): The easiest way to invite your TestFlight beta testers 
 - [`scan`](https://github.com/fastlane/scan): The easiest way to run tests of your iOS and Mac app
+- [`match`](https://github.com/fastlane/match): Easily sync your certificates and profiles across your team using git
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 

data/lib/assets/GymfileTemplate

@@ -1,4 +1,4 @@
-# For more information about this configuation visit
+# For more information about this configuration visit
 # https://github.com/fastlane/gym#gymfile
 
 # In general, you can use the options available

data/lib/gym/generators/build_command_generator.rb

@@ -58,7 +58,11 @@ module Gym
       end
 
       def pipe
-        ["| tee '#{xcodebuild_log_path}' | xcpretty"]
+        pipe = []
+        pipe << "| tee '#{xcodebuild_log_path}' | xcpretty"
+        pipe << "> /dev/null" if Gym.config[:suppress_xcode_output]
+
+        pipe
       end
 
       def xcodebuild_log_path

data/lib/gym/options.rb

@@ -152,7 +152,14 @@ module Gym
                                      optional: true,
                                      verify_block: proc do |value|
                                        raise "File not found at path '#{File.expand_path(value)}'".red unless File.exist?(value)
-                                     end)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :suppress_xcode_output,
+                                     short_option: "-r",
+                                     env_name: "SUPPRESS_OUTPUT",
+                                     description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
+                                     optional: true,
+                                     is_string: false
+                                    )
       ]
     end
   end

data/lib/gym/runner.rb

@@ -67,6 +67,7 @@ module Gym
       return unless Gym.config[:use_legacy_build_api]
       Gym::XcodebuildFixes.swift_library_fix
       Gym::XcodebuildFixes.watchkit_fix
+      Gym::XcodebuildFixes.watchkit2_fix
     end
 
     # Builds the app and prepares the archive

data/lib/gym/version.rb

@@ -1,4 +1,4 @@
 module Gym
-  VERSION = "1.1.6"
+  VERSION = "1.2.0"
   DESCRIPTION = "Building your iOS apps has never been easier"
 end

data/lib/gym/xcodebuild_fixes/watchkit2_fix.rb

@@ -0,0 +1,35 @@
+module Gym
+  class XcodebuildFixes
+    class << self
+      # Determine whether this app has WatchKit2 support and manually package up the WatchKit2 framework
+      def watchkit2_fix
+        return unless watchkit2?
+
+        Helper.log.info "Adding WatchKit2 support" if $verbose
+
+        Dir.mktmpdir do |tmpdir|
+          # Make watchkit support directory
+          watchkit_support = File.join(tmpdir, "WatchKitSupport2")
+          Dir.mkdir(watchkit_support)
+
+          # Copy WK from Xcode into WatchKitSupport2
+          FileUtils.copy_file("#{Xcode.xcode_path}/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/Library/Application Support/WatchKit/WK", File.join(watchkit_support, "WK"))
+
+          # Add "WatchKitSupport2" to the .ipa archive
+          Dir.chdir(tmpdir) do
+            abort unless system %(zip --recurse-paths "#{PackageCommandGenerator.ipa_path}" "WatchKitSupport2" > /dev/null)
+          end
+
+          Helper.log.info "Successfully added WatchKit2 support" if $verbose
+        end
+      end
+
+      # Does this application have a WatchKit target
+      def watchkit2?
+        Dir["#{PackageCommandGenerator.appfile_path}/**/*.plist"].any? do |plist_path|
+          `/usr/libexec/PlistBuddy -c 'Print DTSDKName' '#{plist_path}' 2>&1`.strip == 'watchos2.0'
+        end
+      end
+    end
+  end
+end

data/lib/gym/xcodebuild_fixes/watchkit_fix.rb

@@ -3,7 +3,7 @@ module Gym
     class << self
       # Determine whether this app has WatchKit support and manually package up the WatchKit framework
       def watchkit_fix
-        return unless watchkit?
+        return unless should_apply_watchkit1_fix?
 
         Helper.log.info "Adding WatchKit support" if $verbose
 
@@ -30,6 +30,11 @@ module Gym
           `/usr/libexec/PlistBuddy -c 'Print WKWatchKitApp' '#{plist_path}' 2>&1`.strip == 'true'
         end
       end
+
+      # Should only be applied if watchkit app is not a watchkit2 app
+      def should_apply_watchkit1_fix?
+        watchkit? && !(Gym::XcodebuildFixes.watchkit2?)
+      end
     end
   end
 end

data/lib/gym.rb

@@ -34,6 +34,7 @@ module Gym
       # Import all the fixes
       require 'gym/xcodebuild_fixes/swift_fix'
       require 'gym/xcodebuild_fixes/watchkit_fix'
+      require 'gym/xcodebuild_fixes/watchkit2_fix'
       require 'gym/xcodebuild_fixes/package_application_fix'
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -246,6 +246,7 @@ files:
 - lib/gym/xcodebuild_fixes/README.md
 - lib/gym/xcodebuild_fixes/package_application_fix.rb
 - lib/gym/xcodebuild_fixes/swift_fix.rb
+- lib/gym/xcodebuild_fixes/watchkit2_fix.rb
 - lib/gym/xcodebuild_fixes/watchkit_fix.rb
 homepage: https://fastlane.tools
 licenses:
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Building your iOS apps has never been easier