gym 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397fb653f19ab23011a6adc4e4868b3cf3685a13
-  data.tar.gz: 4f43ac4c7427a7a1ec0189552a1579029c929d50
+  metadata.gz: ecdf543565a216c0837ae272dbebead624abef24
+  data.tar.gz: f14774d2d1fa01982560de4cb21d1f78bb4f391f
 SHA512:
-  metadata.gz: a54112ec43584b099105130a45079e38328d8ee5c3dcf9e279d9228d3da2bce5dc0af2b176246b93172840303e8965667976f1a9272ded70fdd264525159d274
-  data.tar.gz: a69f4ca6ec8f5409fedaedc6b36e6bcc788132e5f8ae9bc809d40f923d2144c18526724ab4a48ca7e5c5b296d623f71e02f4f8bea6aa331f844dbee4fc2c632c
+  metadata.gz: f3f8e0538f17a22c9deaf007d008ffb369ec8e1502bcbff5656653710717a46d16885691defab16d04fa986ce46e5f05241193510365d9d8e5245959fd88326e
+  data.tar.gz: 90b2dd43c1b4da294623218796562a4833bc1c09b4b4ee50fe1124e83bc774a9c7ea26cd2ac6c63c2ee283fa0da757723fe6a8917e15ef815695f0e8e0a6f123

data/README.md

@@ -159,12 +159,14 @@ 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.
 
 ```
-/usr/bin/xcrun -sdk iphoneos PackageApplication -v \
+/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 \
 '/Users/felixkrause/Library/Developer/Xcode/Archives/2015-08-11/ExampleProductName.ipa' \ 
 --sign "identity" --embed "provProfile"
 ```
 
+Note: the official PackageApplication script is replaced by a custom PackageApplication4Gym script. This script is obtained by applying a [set of patches](https://github.com/fastlane/gym/tree/master/lib/assets/package_application_patches) on the fly to fix some known issues in the official Xcode PackageApplication script.
+
 Afterwards the `ipa` file is moved to the output folder. The `dSYM` file is compressed and moved to the output folder as well.
 
 # Tips

data/lib/assets/package_application_patches/{codesign_args_patch.diff → 0001_codesign_args_patch.diff}

@@ -3,6 +3,11 @@ From: Fabio Milano
 Date: Thu, 13 Aug 2015 15:02:41 +0200
 Subject: [PATCH] Fixed codesign_args
 
+Code signatures made in Mavericks and later do not support altering which files are sealed by a code signature.
+The --resource-rules option to codesign isn't supported anymore
+
+See https://developer.apple.com/library/mac/technotes/tn2206/_index.html#//apple_ref/doc/uid/DTS40007919-CH1-TNTAG206
+
 ---
  PackageApplication4Gym | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)

data/lib/assets/package_application_patches/{no_strict_parameter_patch.diff → 0002_no_strict_parameter_patch.diff}

@@ -3,6 +3,14 @@ From: Fabio Milano
 Date: Thu, 13 Aug 2015 16:03:26 +0200
 Subject: [PATCH] Added no-strict parameter
 
+The command line tool “codesign” has changed in 10.9.5 and 10.10, you need to
+pass “--no-strict” option to the command, (the problem has been reported and
+will be fixed). To workaround the problem, please save a copy and modify
+PackageApplication to pass “—no-strict” to codesign, you can locate PackageApplication
+by running the following:- xcrun -sdk iphoneos -f PackageApplication
+
+See http://stackoverflow.com/questions/26008449/xcodebuild-codesign-vvvv-saysresource-envelope-is-obsolete
+
 ---
  PackageApplication4Gym | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

data/lib/gym.rb

@@ -4,7 +4,6 @@ require 'gym/manager'
 require 'gym/project'
 require 'gym/build_command_generator'
 require 'gym/package_command_generator'
-require 'gym/commands_executor'
 require 'gym/runner'
 require 'gym/error_handler'
 require 'gym/options'

data/lib/gym/runner.rb

@@ -13,8 +13,6 @@ module Gym
       move_results
     end
 
-    private
-
     #####################################################
     # @!group Printing out things
     #####################################################
@@ -42,6 +40,8 @@ module Gym
       )
     end
 
+    private
+
     #####################################################
     # @!group The individual steps
     #####################################################
@@ -56,9 +56,12 @@ module Gym
     def build_app
       command = BuildCommandGenerator.generate
       print_command(command, "Generated Build Command") if $verbose
-      Gym::CommandsExecutor.execute(command: command, print_all: true, error: proc do |output|
-        ErrorHandler.handle_build_error(output)
-      end)
+      FastlaneCore::CommandExecutor.execute(command: command,
+                                          print_all: true,
+                                      print_command: !Gym.config[:silent],
+                                              error: proc do |output|
+                                                ErrorHandler.handle_build_error(output)
+                                              end)
 
       Helper.log.info("Successfully stored the archive. You can find it in the Xcode Organizer.".green)
       Helper.log.info("Stored the archive in: ".green + BuildCommandGenerator.archive_path) if $verbose
@@ -75,9 +78,12 @@ module Gym
       command = PackageCommandGenerator.generate
       print_command(command, "Generated Package Command") if $verbose
 
-      Gym::CommandsExecutor.execute(command: command, print_all: false, error: proc do |output|
-        ErrorHandler.handle_package_error(output)
-      end)
+      FastlaneCore::CommandExecutor.execute(command: command,
+                                          print_all: false,
+                                      print_command: !Gym.config[:silent],
+                                              error: proc do |output|
+                                                ErrorHandler.handle_package_error(output)
+                                              end)
     end
 
     # Determine whether it is a Swift project and, eventually, include all required libraries to copy from Xcode's toolchain directory.
@@ -108,9 +114,12 @@ module Gym
             command_parts << "> /dev/null" unless $verbose
             print_command(command_parts, "Fix Swift embedded code if needed") if $verbose
 
-            Gym::CommandsExecutor.execute(command: command_parts, print_all: false, error: proc do |output|
-              ErrorHandler.handle_package_error(output)
-            end)
+            FastlaneCore::CommandExecutor.execute(command: command_parts,
+                                                print_all: false,
+                                            print_command: !Gym.config[:silent],
+                                                    error: proc do |output|
+                                                      ErrorHandler.handle_package_error(output)
+                                                    end)
           end
         end
       end
@@ -136,8 +145,7 @@ module Gym
 
         puts "" # new line
 
-        Helper.log.info "Successfully exported and compressed dSYM file: ".green
-        Helper.log.info File.join(Gym.config[:output_directory], File.basename(PackageCommandGenerator.dsym_path))
+        Helper.log.info "Successfully exported and compressed dSYM file.".green
       end
 
       ipa_path = File.join(Gym.config[:output_directory], File.basename(PackageCommandGenerator.ipa_path))

data/lib/gym/version.rb

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

data/lib/gym/xcode_fix.rb

@@ -18,20 +18,26 @@ module Gym
           path = File.join(Helper.gem_path("gym"), "lib/assets/package_application_patches/PackageApplication_MD5")
           expected_md5 = File.read(path)
 
-          raise "Found an invalid `PackageApplication` script. This is not supported." unless expected_md5 == Digest::MD5.file("#{developer_dir}/Platforms/iPhoneOS.platform/Developer/usr/bin/PackageApplication").hexdigest
+          # If that location changes, search it using xcrun --sdk iphoneos -f PackageApplication
+          package_application_path = "#{developer_dir}/Platforms/iPhoneOS.platform/Developer/usr/bin/PackageApplication"
+
+          raise "Unable to patch the `PackageApplication` script bundled in XCode. This is not supported." unless expected_md5 == Digest::MD5.file(package_application_path).hexdigest
 
           # Duplicate PackageApplication script to PackageApplication4Gym
-          FileUtils.copy_file("#{developer_dir}/Platforms/iPhoneOS.platform/Developer/usr/bin/PackageApplication", patched_package_application_path)
+          FileUtils.copy_file(package_application_path, patched_package_application_path)
 
           # Apply patches to PackageApplication4Gym from patches folder
           Dir[File.join(Helper.gem_path("gym"), "lib/assets/package_application_patches/*.diff")].each do |patch|
             Helper.log.info "Applying Package Application patch: #{File.basename(patch)}" unless Gym.config[:silent]
             command = ["patch #{patched_package_application_path} < #{patch}"]
-            print_command(command, "Applying Package Application patch: #{File.basename(patch)}") if $verbose
-
-            Gym::CommandsExecutor.execute(command: command, print_all: false, error: proc do |output|
-              ErrorHandler.handle_build_error(output)
-            end)
+            Runner.new.print_command(command, "Applying Package Application patch: #{File.basename(patch)}") if $verbose
+
+            FastlaneCore::CommandExecutor.execute(command: command,
+                                                print_all: false,
+                                            print_command: !Gym.config[:silent],
+                                                    error: proc do |output|
+                                                      ErrorHandler.handle_package_error(output)
+                                                    end)
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Felix Krause
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
@@ -190,12 +190,11 @@ files:
 - README.md
 - bin/gym
 - lib/assets/GymfileTemplate
+- 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/package_application_patches/codesign_args_patch.diff
-- lib/assets/package_application_patches/no_strict_parameter_patch.diff
 - lib/gym.rb
 - lib/gym/build_command_generator.rb
-- lib/gym/commands_executor.rb
 - lib/gym/commands_generator.rb
 - lib/gym/detect_values.rb
 - lib/gym/error_handler.rb

data/lib/gym/commands_executor.rb

@@ -1,53 +0,0 @@
-module Gym
-  # Executes commands and takes care of error handling and more
-  module CommandsExecutor
-    # @param command [String] The command to be executed
-    # @param print_all [Boolean] Do we want to print out the command output while building?
-    #   If set to false, nothing will be printed
-    # @param error [Block] A block that's called if an error occurs
-    # @return [String] All the output as string
-    def self.execute(command: nil, print_all: false, error: nil)
-      print_all = true if $verbose
-
-      output = []
-      command = command.join(" ")
-      Helper.log.info command.yellow.strip unless Gym.config[:silent]
-
-      puts "\n-----".cyan if print_all
-
-      last_length = 0
-      begin
-        PTY.spawn(command) do |stdin, stdout, pid|
-          stdin.each do |l|
-            line = l.strip # strip so that \n gets removed
-            output << line
-
-            next unless print_all
-
-            current_length = line.length
-            spaces = [last_length - current_length, 0].max
-            print((line + " " * spaces + "\r").cyan)
-            last_length = current_length
-          end
-          Process.wait(pid)
-          puts "-----\n".cyan if print_all
-        end
-      rescue => ex
-        # This could happen when the environment is wrong:
-        # > invalid byte sequence in US-ASCII (ArgumentError)
-        output << ex.to_s
-        o = output.join("\n")
-        puts o
-        error.call(o)
-      end
-
-      # Exit status for build command, should be 0 if build succeeded
-      # Disabled Rubocop, since $CHILD_STATUS just is not the same
-      if $?.exitstatus != 0 # rubocop:disable Style/SpecialGlobalVars
-        o = output.join("\n")
-        puts o # the user has the right to see the raw output
-        error.call(o)
-      end
-    end
-  end
-end