gym 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10cc2e463895aae84301abdfff342aecdfd98ff
-  data.tar.gz: b7032609daac7cca71fb70ced86a7df2bb5fd555
+  metadata.gz: dbcb824805c7ee57886bb0a000719352b185e540
+  data.tar.gz: 8a61ea32da66fd658dd42fd19af16b8ff869ca7c
 SHA512:
-  metadata.gz: 013a309cb2f63cb0662c895afc71028e12f5e2f34fc4172f95823c49b746f29dc65378010f2fd8fccc0e882ddd6c7615b6f5bc37b4559558e3a7f0490463b60b
-  data.tar.gz: ff749e5ec91d619bfde150c445717f9a5319ec7c3e301a55b33be74dc230aa99bf4cb18b4dcf7987df05e8226defc3435dcbab2097f7d226abefabb304fc14b3
+  metadata.gz: 4a833a0ddf354e75da612a6a834e2aa08346901af5b556faf8db5117fa693d693964cd7ff197915504e134f9e8222aff7f8ce8b5f94f4ae52dc39bbdd0097451
+  data.tar.gz: 6c3471f5ae11c9e5dfedbea0e9834d374a4730bda2e29f080d49544ba363fc0e704a5147affec28b0a3530d1584a775ba81c8e421012165d42cdb6d2f0537b54

data/README.md

@@ -29,14 +29,14 @@
 gym
 ============
 
-[![Twitter: @KauseFx](https://img.shields.io/badge/contact-@KrauseFx-blue.svg?style=flat)](https://twitter.com/KrauseFx)
+[![Twitter: @KauseFx](https://img.shields.io/badge/contact-@FastlaneTools-blue.svg?style=flat)](https://twitter.com/FastlaneTools)
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/gym/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/gym.svg?style=flat)](http://rubygems.org/gems/gym)
 [![Build Status](https://img.shields.io/travis/fastlane/gym/master.svg?style=flat)](https://travis-ci.org/fastlane/gym)
 
 ###### Building your app has never been easier
 
-Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
+Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.com/FastlaneTools)
 
 -------
 <p align="center">
@@ -204,7 +204,7 @@ After building the archive it is being checked by `gym`. If it's valid, it gets
 ### Xcode 7 and above
 
 ```
-/usr/bin/xcrun xcodebuild -exportArchive \
+/usr/bin/xcrun path/to/xcbuild-safe.sh -exportArchive \
 -exportOptionsPlist '/tmp/gym_config_1442852529.plist' \
 -archivePath '/Users/fkrause/Library/Developer/Xcode/Archives/2015-09-21/App 2015-09-21 09.21.56.xcarchive' \
 -exportPath '/tmp/1442852529'
@@ -214,6 +214,8 @@ After building the archive it is being checked by `gym`. If it's valid, it gets
 
 Using this method there are no workarounds for WatchKit or Swift required, as it uses the same technique Xcode uses when exporting your binary.
 
+Note: the [xcbuild-safe.sh script](https://github.com/fastlane/gym/tree/master/lib/assets/wrap_xcodebuild/xcbuild-safe.sh) wraps around xcodebuild to workaround some incompatibilities.
+
 ### Xcode 6 and below
 
 ```

data/lib/assets/wrap_xcodebuild/xcbuild-safe.sh

@@ -0,0 +1,49 @@
+#!/bin/bash --login
+
+# Originally from, http://stackoverflow.com/questions/33041109
+# Modified to work in RVM and non RVM environments
+#
+# Xcode 7 (incl. 7.0.1) seems to have a dependency on the system ruby.
+# xcodebuild is screwed up by using rvm to map to another non-system
+# ruby†. This script is a fix that allows you call xcodebuild in a
+# "safe" rvm environment, but will not (AFAIK) affect the "external"
+# rvm setting.
+#
+# The script is a drop in replacement for your xcodebuild call.
+#
+#   xcodebuild arg1 ... argn
+#
+# would become
+#
+#   path/to/xcbuild-safe.sh arg1 ... argn
+#
+# -----
+# † Because, you know, that *never* happens when you are building
+# Xcode projects, say with abstruse tools like Rake or CocoaPods.
+
+which rvm > /dev/null
+
+if [[ $? -eq 0 ]]; then
+  echo "RVM detected, forcing to use system ruby"
+  # This allows you to use rvm in a script. Otherwise you get a BS
+  # error along the lines of "cannot use rvm as function". Jeez.
+  [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+
+  # Cause rvm to use system ruby. AFAIK, this is effective only for
+  # the scope of this script.
+  rvm use system
+
+  # rvm doesn't unset itself properly without doing this
+  unset RUBYLIB
+  unset RUBYOPT
+  unset BUNDLE_BIN_PATH
+  unset _ORIGINAL_GEM_PATH
+  unset BUNDLE_GEMFILE
+fi
+
+# to help troubleshooting
+# env | sort > /tmp/env.wrapper
+# rvm info >> /tmp/env.wrapper
+
+set -x          # echoes commands
+xcodebuild "$@" # calls xcodebuild with all the arguments passed to this

data/lib/gym/error_handler.rb

@@ -10,31 +10,31 @@ module Gym
         when /Your build settings specify a provisioning profile with the UUID/
           print "Invalid code signing settings"
           print "Your project defines a provisioning profile which doesn't exist on your local machine"
-          print "You can use sigh (https://github.com/KrauseFx/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md"
+          print "You can use sigh (https://github.com/fastlane/sigh) to download and install the provisioning profile"
+          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
         when /Provisioning profile does not match bundle identifier/
           print "Invalid code signing settings"
           print "Your project defines a provisioning profile that doesn't match the bundle identifier of your app"
           print "Make sure you use the correct provisioning profile for this app"
           print "Take a look at the ouptput above for more information"
-          print "You can follow this guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md"
+          print "You can follow this guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
         when /provisioning profiles matching the bundle identifier .(.*)./ # the . around the (.*) are for the strange "
           print "You don't have the provisioning profile for '#{$1}' installed on the local machine"
           print "Make sure you have the profile on this computer and it's properly installed"
-          print "You can use sigh (https://github.com/KrauseFx/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md"
+          print "You can use sigh (https://github.com/fastlane/sigh) to download and install the provisioning profile"
+          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
         when /matching the bundle identifier .(.*). were found/ # the . around the (.*) are for the strange "
           print "You don't have a provisioning profile for the bundle identifier '#{$1}' installed on the local machine"
           print "Make sure you have the profile on this computer and it's properly installed"
-          print "You can use sigh (https://github.com/KrauseFx/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md"
+          print "You can use sigh (https://github.com/fastlane/sigh) to download and install the provisioning profile"
+          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
 
         # Insert more code signing specific errors here
         when /code signing is required/
           print "Your project settings define invalid code signing settings"
           print "To generate an ipa file you need to enable code signing for your project"
           print "Additionally make sure you have a code signing identity set"
-          print "Follow this guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
         when /US\-ASCII/
           print "Your shell environment is not correctly configured"
           print "Instead of UTF-8 your shell uses US-ASCII"
@@ -98,7 +98,7 @@ module Gym
         print "Usually it's caused by the `Skip Install` option in Xcode, set it to `NO`"
         print "For more information visit https://developer.apple.com/library/ios/technotes/tn2215/_index.html"
         print "Also, make sure to have a valid code signing identity and provisioning profile installed"
-        print "Follow this guide to setup code signing https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md"
+        print "Follow this guide to setup code signing https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
         raise "Archive invalid"
       end
 

data/lib/gym/generators/package_command_generator_xcode7.rb

@@ -3,6 +3,8 @@
 # because of
 # `incompatible encoding regexp match (UTF-8 regexp with ASCII-8BIT string) (Encoding::CompatibilityError)`
 
+require 'tempfile'
+
 module Gym
   # Responsible for building the fully working xcodebuild command
   class PackageCommandGeneratorXcode7
@@ -10,7 +12,7 @@ module Gym
       def generate
         print_legacy_information unless Helper.fastlane_enabled?
 
-        parts = ["/usr/bin/xcrun xcodebuild -exportArchive"]
+        parts = ["/usr/bin/xcrun #{XcodebuildFixes.wrap_xcodebuild} -exportArchive"]
         parts += options
         parts += pipe
 
@@ -35,7 +37,7 @@ module Gym
 
       # We export the ipa into this directory, as we can't specify the ipa file directly
       def temporary_output_path
-        Gym.cache[:temporary_output_path] ||= File.join("/tmp", Time.now.to_i.to_s)
+        Gym.cache[:temporary_output_path] ||= "#{Tempfile.new('gym').path}.gym_output"
       end
 
       def ipa_path
@@ -56,7 +58,7 @@ module Gym
 
       # The path the config file we use to sign our app
       def config_path
-        Gym.cache[:config_path] ||= "/tmp/gym_config_#{Time.now.to_i}.plist"
+        Gym.cache[:config_path] ||= "#{Tempfile.new('gym').path}_config.plist"
         return Gym.cache[:config_path]
       end
 
@@ -79,7 +81,7 @@ module Gym
       def print_legacy_information
         if Gym.config[:provisioning_profile_path]
           UI.important "You're using Xcode 7, the `provisioning_profile_path` value will be ignored"
-          UI.important "Please follow the Code Signing Guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md"
+          UI.important "Please follow the Code Signing Guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
         end
       end
     end

data/lib/gym/runner.rb

@@ -17,7 +17,7 @@ module Gym
 
       FileUtils.mkdir_p(Gym.config[:output_directory])
 
-      if Gym.project.ios?
+      if Gym.project.ios? || Gym.project.tvos?
         package_app
         fix_package
         compress_and_move_dsym

data/lib/gym/version.rb

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

data/lib/gym/xcodebuild_fixes/package_application_fix.rb

@@ -42,6 +42,12 @@ module Gym
 
         return @patched_package_application_path # Return path to the patched PackageApplication
       end
+
+      # Wrap xcodebuild to work-around ipatool dependecy to system ruby
+      def wrap_xcodebuild
+        require 'fileutils'
+        @wrapped_xcodebuild_path ||= File.join(Helper.gem_path("gym"), "lib/assets/wrap_xcodebuild/xcbuild-safe.sh")
+      end
     end
   end
 end

data/lib/gym/xcodebuild_fixes/watchkit2_fix.rb

@@ -27,7 +27,7 @@ module Gym
       # 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'
+          `/usr/libexec/PlistBuddy -c 'Print DTSDKName' '#{plist_path}' 2>&1`.match(/^\s*watchos2\.\d+\s*$/)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -229,6 +229,7 @@ files:
 - lib/assets/package_application_patches/0001_codesign_args_patch.diff
 - lib/assets/package_application_patches/0002_no_strict_parameter_patch.diff
 - lib/assets/package_application_patches/PackageApplication_MD5
+- lib/assets/wrap_xcodebuild/xcbuild-safe.sh
 - lib/gym.rb
 - lib/gym/commands_generator.rb
 - lib/gym/detect_values.rb
@@ -268,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Building your iOS apps has never been easier