gym 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d8c23f191b23c471b3e47c7531499520841f42
-  data.tar.gz: f0808090ccacdd0b189c85dd999317d0a1b20994
+  metadata.gz: 63bdd2db07c2f8fae8b2242da7fcbfb30699f07d
+  data.tar.gz: 467a75673b7601adeaf29dc30cefaefb8201d8c1
 SHA512:
-  metadata.gz: 6f9b52fabdb2186ea70c896961ecdc8cca91a12c6cc0d906e60cc21da4f4f10c959f7a12de14f762212aa2b4cb6335ed80a4bb15503d33b51923cfd1d3302601
-  data.tar.gz: 58a99d14c47ff55ec0e38276edf3e0727835ced06221aae522ef2a147af91c15e62e144757a0d23595981916ff74f6a050d95de651fb52bb2d23c39d87024a41
+  metadata.gz: 9b6ddb4de656331d37e53445f19a06ed372560746e898908405d8a6eed083f879a43ac1d8b10f4ded8fdc176a094ee96b261388d8a6980731e13430692a9c26e
+  data.tar.gz: 5ff570a4bea8e9f3c0d8135589111470c024c334756c56b00c08e40a62fd9d51612057d8f58718afcf3fd1587cbb935d55cd618a766be29b35dbc039dfaa9e28

data/README.md

@@ -190,9 +190,25 @@ xcodebuild -scheme 'Example' \
 archive | xcpretty
 ```
 
-
 After building the archive it is being checked by `gym`. If it's valid, it gets packaged up and signed into an `ipa` file.
 
+`gym` automatically chooses a different packaging method depending on the version of Xcode you're using.
+
+### Xcode 7 and above
+
+```
+/usr/bin/xcrun xcodebuild -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'
+```
+
+`gym` makes use of the new Xcode 7 API which allows us to specify the export options using a `plist` file. You can find more information about the available options by running `xcodebuild --help`.
+
+Using this method there are no workarounds for WatchKit or Swift required, as it uses the same technique Xcode uses when exporting your binary.
+
+### Xcode 6 and below
+
 ```
 /usr/bin/xcrun /path/to/PackageApplication4Gym -v \
 '/Users/felixkrause/Library/Developer/Xcode/Archives/2015-08-11/ExampleProductName 2015-08-11 18.15.30.xcarchive/Products/Applications/name.app' -o \

data/lib/gym/error_handler.rb

@@ -80,6 +80,10 @@ module Gym
         when /Codesign check fails/
           print "A general code signing error occurred. Make sure you passed a valid"
           print "provisioning profile and code signing identity."
+        when /expected one of \{\}/
+          print "It seems like you ran into this radar"
+          print "https://openradar.appspot.com/radar?id=4952000420642816"
+          print "You can temporary use the :use_legacy_build_api option to get the build to work again"
         end
         raise "Error packaging up the application".red
       end

data/lib/gym/generators/package_command_generator.rb

@@ -28,7 +28,11 @@ module Gym
 
       # The generator we need to use for the currently used Xcode version
       def generator
-        Xcode.pre_7? ? PackageCommandGeneratorLegacy : PackageCommandGeneratorXcode7
+        if Xcode.pre_7? and !Gym.config[:use_legacy_build_api]
+          PackageCommandGeneratorLegacy
+        else
+          PackageCommandGeneratorXcode7
+        end
       end
     end
   end

data/lib/gym/options.rb

@@ -1,6 +1,7 @@
 require "fastlane_core"
 require "credentials_manager"
 
+# rubocop:disable Metrics/AbcSize
 module Gym
   class Options
     def self.available_options
@@ -113,6 +114,16 @@ module Gym
                                      description: "Should the ipa include bitcode?",
                                      default_value: false,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :use_legacy_build_api,
+                                     env_name: "GYM_USE_LEGACY_BUILD_API",
+                                     description: "Don't use the new API because of https://openradar.appspot.com/radar?id=4952000420642816",
+                                     default_value: false,
+                                     is_string: false,
+                                     verify_block: proc do |value|
+                                       if value
+                                         Helper.log.info "Using legacy build system - waiting for radar to be fixed: https://openradar.appspot.com/radar?id=4952000420642816".red
+                                       end
+                                     end),
         FastlaneCore::ConfigItem.new(key: :export_method,
                                      short_option: "-j",
                                      env_name: "GYM_EXPORT_METHOD",
@@ -136,3 +147,4 @@ module Gym
     end
   end
 end
+# rubocop:enable Metrics/AbcSize

data/lib/gym/runner.rb

@@ -67,7 +67,6 @@ module Gym
       return unless Xcode.pre_7?
       Gym::XcodebuildFixes.swift_library_fix
       Gym::XcodebuildFixes.watchkit_fix
-      Gym::XcodebuildFixes.clear_patched_package_application
     end
 
     # Builds the app and prepares the archive

data/lib/gym/version.rb

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

data/lib/gym/xcodebuild_fixes/package_application_fix.rb

@@ -7,8 +7,8 @@ module Gym
 
         # Initialization
         @patched_package_application_path = File.join("/tmp", "PackageApplication4Gym")
-        # Remove any previous patched PackageApplication
-        FileUtils.rm @patched_package_application_path if File.exist?(@patched_package_application_path)
+
+        return @patched_package_application_path if File.exist?(@patched_package_application_path)
 
         Dir.mktmpdir do |tmpdir|
           # Check current PackageApplication MD5
@@ -42,15 +42,6 @@ module Gym
 
         return @patched_package_application_path # Return path to the patched PackageApplication
       end
-
-      # Remove the patched script after it was used
-      def clear_patched_package_application
-        if @patched_package_application_path and File.exist?(@patched_package_application_path)
-          Helper.log.debug "Removing patched PackageApplication file at path '#{@patched_package_application_path}'" if $verbose
-          # force in the unlikely event that the file was deleted (e.g. by a concurrent job)
-          FileUtils.rm @patched_package_application_path, force: true
-        end
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Building your iOS apps has never been easier