gym 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2a18d2f0297efde728ac6e00fecd9ecd38f82bc
-  data.tar.gz: 933ff160cfaee41f0388d33ae9735495ca615d05
+  metadata.gz: a8bddec4eefadb03f7101efb31470e229e97b256
+  data.tar.gz: d117764cec0e9985ba4814e415f28873b89771c9
 SHA512:
-  metadata.gz: 433ca518ab8adb50eed1b5057cab7dba891b5a37272d2b1075a556457fd23f142bb2c698edd80bd9ea4618fbb69df622682446ec0c9aa7e737625ce4ce65fa95
-  data.tar.gz: 2cd7bc32f4772f48552e520374f816bd20d6cdc82edef35655f878ae16b415113458fd7589e9c0ff26e2dd9db5e805921071cb00d9f2fc75e8253f5e1d38c7cb
+  metadata.gz: 9e8c5af75a48db478c218fea0470a1aa095300359f868b23dde81c21b513a058faa430a86496bef48e12466b38141afa0baac912be4dcd4dca3db089c85a4ed4
+  data.tar.gz: 4297f002c14cbd9efe12a0bcc93dcf5fbcef4087164d486d728686cfbbcf7a4161d86ddbd94a18fb3e0569835532fe1961bce932823d8d29285eb91c7735874f

data/README.md

@@ -119,6 +119,11 @@ For a list of all available parameters use
 
     gym --help
 
+If you run into any issues, use the `verbose` mode to get more information
+
+
+    gym --verbose
+
 # Gymfile
 
 Since you might want to manually trigger a new build but don't want to specify all the parameters every time, you can store your defaults in a so called `Gymfile`.
@@ -130,6 +135,8 @@ scheme "Example"
 
 sdk "9.0"
 
+clean true
+
 output_directory "./build"    # store the ipa in this folder
 output_name "MyApp"           # the name of the ipa file
 ```
@@ -190,8 +197,7 @@ Afterwards the `ipa` file is moved to the output folder. The `dSYM` file is comp
 Download and install the [Provisioning Plugin](https://github.com/chockenberry/Provisioning).
 
 # Need help?
-- If there is a technical problem with `gym`, submit an issue.
-- I'm available for contract work - drop me an email: gym@krausefx.com
+Please submit an issue on GitHub and provide information about your setup
 
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.

data/bin//360/237/222/252

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.push File.expand_path("../../lib", __FILE__)
+
+require "gym"
+require "gym/commands_generator"
+Gym::CommandsGenerator.start

data/lib/gym.rb

@@ -8,7 +8,11 @@ require 'gym/runner'
 require 'gym/error_handler'
 require 'gym/options'
 require 'gym/detect_values'
-require 'gym/xcode_fix'
+
+# Import all the fixes
+require 'gym/xcodebuild_fixes/swift_fix'
+require 'gym/xcodebuild_fixes/watchkit_fix'
+require 'gym/xcodebuild_fixes/package_application_fix'
 
 require 'fastlane_core'
 require 'terminal-table'
@@ -27,6 +31,10 @@ module Gym
     def gymfile_name
       "Gymfile"
     end
+
+    def xcode_path
+      @path ||= `xcode-select --print-path`.strip
+    end
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore

data/lib/gym/error_handler.rb

@@ -18,11 +18,18 @@ module Gym
           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"
-        when /provisioning profiles matching the bundle identifier “(.*)”/
+        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"
+        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"
+
+        # 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"

data/lib/gym/manager.rb

@@ -17,6 +17,7 @@ module Gym
       rows << ["Workspace", config[:workspace]] if config[:workspace]
       rows << ["Scheme", config[:scheme]] if config[:scheme]
       rows << ["Configuration", config[:configuration]] if config[:configuration]
+      rows << ["Xcode path", Gym.xcode_path]
 
       puts ""
       puts Terminal::Table.new(

data/lib/gym/options.rb

@@ -49,10 +49,7 @@ module Gym
                                      short_option: "-o",
                                      env_name: "GYM_OUTPUT_DIRECTORY",
                                      description: "The directory in which the ipa file should be stored in",
-                                     default_value: ".",
-                                     verify_block: proc do |value|
-                                       raise "Directory not found at path '#{File.expand_path(value)}'".red unless File.directory?(value)
-                                     end),
+                                     default_value: "."),
         FastlaneCore::ConfigItem.new(key: :output_name,
                                      short_option: "-n",
                                      env_name: "GYM_OUTPUT_NAME",

data/lib/gym/package_command_generator.rb

@@ -6,12 +6,9 @@ module Gym
   class PackageCommandGenerator
     class << self
       def generate
-        @patched_package_application = XcodeFix.patch_package_application
-
-        parts = ["/usr/bin/xcrun #{@patched_package_application} -v"]
+        parts = ["/usr/bin/xcrun #{XcodebuildFixes.patch_package_application} -v"]
         parts += options
         parts += pipe
-        parts += postfix
 
         parts
       end
@@ -38,13 +35,8 @@ module Gym
         [""]
       end
 
-      def postfix
-        # Remove the patched PackageApplication file after the export is finished
-        ["&& rm '#{@patched_package_application}'"]
-      end
-
       def appfile_path
-        Dir.glob("#{BuildCommandGenerator.archive_path}/Products/Applications/*.app").first
+        Dir[BuildCommandGenerator.archive_path + "/**/*.app"].last
       end
 
       # We export it to the temporary folder and move it over to the actual output once it's finished and valid
@@ -54,7 +46,7 @@ module Gym
 
       # The path the the dsym file for this app. Might be nil
       def dsym_path
-        Dir[BuildCommandGenerator.archive_path + "/**/*.dSYM"].last
+        Dir[BuildCommandGenerator.archive_path + "/**/*.app.dSYM"].last
       end
     end
   end

data/lib/gym/runner.rb

@@ -9,7 +9,9 @@ module Gym
       build_app
       verify_archive
       package_app
-      swift_library_fix
+      Gym::XcodebuildFixes.swift_library_fix
+      Gym::XcodebuildFixes.watchkit_fix
+      Gym::XcodebuildFixes.clear_patched_package_application
       move_results
     end
 
@@ -23,12 +25,12 @@ module Gym
         current = c.to_s.dup
         next unless current.length > 0
 
-        if current.include? "-" and current.to_s.split(" '").count == 2
+        match_default_parameter = current.match(/(-.*) '(.*)'/)
+        if match_default_parameter
           # That's a default parameter, like `-project 'Name'`
-          # We use " '" to not split by spaces within the value (e.g. path)
-          current.split(" '")
+          match_default_parameter[1, 2]
         else
-          current.gsub!("| ", "") # as the | will somehow break the terminal table
+          current.gsub!("| ", "\| ") # as the | will somehow break the terminal table
           [current, ""]
         end
       end
@@ -86,50 +88,11 @@ module Gym
                                               end)
     end
 
-    # Determine whether it is a Swift project and, eventually, include all required libraries to copy from Xcode's toolchain directory.
-    # Since there's no "xcodebuild" target to do just that, it is done post-build when exporting an archived build.
-    def swift_library_fix
-      require 'fileutils'
-
-      ipa_swift_frameworks = Dir["#{PackageCommandGenerator.appfile_path}/Frameworks/libswift*"]
-
-      unless ipa_swift_frameworks.empty?
-        Dir.mktmpdir do |tmpdir|
-          # Copy all necessary Swift libraries to a temporary "SwiftSupport" directory so that we can
-          # easily add it to the .ipa later.
-          swift_support = File.join(tmpdir, "SwiftSupport")
-
-          Dir.mkdir(swift_support)
-
-          developer_dir = `xcode-select --print-path`.strip
-          ipa_swift_frameworks.each do |path|
-            framework = File.basename(path)
-
-            FileUtils.copy_file("#{developer_dir}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos/#{framework}", File.join(swift_support, framework))
-          end
-
-          # Add "SwiftSupport" to the .ipa archive
-          Dir.chdir(tmpdir) do
-            command_parts = ["zip --recurse-paths #{PackageCommandGenerator.ipa_path} SwiftSupport"]
-            command_parts << "> /dev/null" unless $verbose
-            print_command(command_parts, "Fix Swift embedded code if needed") if $verbose
-
-            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
-    end
-
     # Moves over the binary and dsym file to the output directory
     # @return (String) The path to the resulting ipa file
     def move_results
       require 'fileutils'
-
+      FileUtils.mkdir_p(Gym.config[:output_directory])
       FileUtils.mv(PackageCommandGenerator.ipa_path, Gym.config[:output_directory], force: true)
 
       if PackageCommandGenerator.dsym_path

data/lib/gym/version.rb

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

data/lib/gym/xcodebuild_fixes/README.md

@@ -0,0 +1,9 @@
+## Fixes
+
+This directory contains all the (hopefully temporary) work-arounds to make the `ipa` export work. 
+
+`xcodebuild` doesn't get the same set of features as Xcode does (e.g. WatchKit app export, Swift export and more)
+
+This directory should be empty as soon as all those `xcodebuild` issues are fixed.
+
+In the mean-time we have all the workarounds in one central place

data/lib/gym/{xcode_fix.rb → xcodebuild_fixes/package_application_fix.rb}

@@ -1,15 +1,14 @@
 module Gym
-  class XcodeFix
+  class XcodebuildFixes
     class << self
       # Fix PackageApplication Perl script by Xcode to create the IPA from the archive
       def patch_package_application
         require 'fileutils'
 
         # Initialization
-        developer_dir = `xcode-select --print-path`.strip
-        patched_package_application_path = File.join("/tmp", "PackageApplication4Gym")
+        @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)
+        FileUtils.rm @patched_package_application_path if File.exist?(@patched_package_application_path)
 
         Dir.mktmpdir do |tmpdir|
           # Check current PackageApplication MD5
@@ -19,29 +18,37 @@ module Gym
           expected_md5 = File.read(path)
 
           # If that location changes, search it using xcrun --sdk iphoneos -f PackageApplication
-          package_application_path = "#{developer_dir}/Platforms/iPhoneOS.platform/Developer/usr/bin/PackageApplication"
+          package_application_path = "#{Gym.xcode_path}/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(package_application_path, 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}"]
+            Helper.log.info "Applying Package Application patch: #{File.basename(patch)}" if $verbose
+            command = ["patch #{@patched_package_application_path} < #{patch}"]
             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],
+                                            print_command: $verbose,
                                                     error: proc do |output|
                                                       ErrorHandler.handle_package_error(output)
                                                     end)
           end
         end
 
-        return patched_package_application_path # Return path to the patched PackageApplication
+        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
+          File.delete(@patched_package_application_path)
+        end
       end
     end
   end

data/lib/gym/xcodebuild_fixes/swift_fix.rb

@@ -0,0 +1,45 @@
+module Gym
+  class XcodebuildFixes
+    class << self
+      # Determine whether it is a Swift project and, eventually, include all required libraries to copy from Xcode's toolchain directory.
+      # Since there's no "xcodebuild" target to do just that, it is done post-build when exporting an archived build.
+      def swift_library_fix
+        require 'fileutils'
+
+        ipa_swift_frameworks = Dir["#{PackageCommandGenerator.appfile_path}/Frameworks/libswift*"]
+        Helper.log.info "Checking for Swift framework" if $verbose
+
+        return if ipa_swift_frameworks.empty?
+        Helper.log.info "Packaging up the Swift Framework as the current app is a Swift app" if $verbose
+
+        Dir.mktmpdir do |tmpdir|
+          # Copy all necessary Swift libraries to a temporary "SwiftSupport" directory so that we can
+          # easily add it to the .ipa later.
+          swift_support = File.join(tmpdir, "SwiftSupport")
+
+          Dir.mkdir(swift_support)
+
+          ipa_swift_frameworks.each do |path|
+            framework = File.basename(path)
+
+            FileUtils.copy_file("#{Gym.xcode_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos/#{framework}", File.join(swift_support, framework))
+          end
+
+          # Add "SwiftSupport" to the .ipa archive
+          Dir.chdir(tmpdir) do
+            command_parts = ["zip --recurse-paths #{PackageCommandGenerator.ipa_path} SwiftSupport"]
+            command_parts << "> /dev/null" unless $verbose
+            print_command(command_parts, "Fix Swift embedded code if needed") if $verbose
+
+            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
+    end
+  end
+end

data/lib/gym/xcodebuild_fixes/watchkit_fix.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -183,12 +183,14 @@ email:
 - gym@krausefx.com
 executables:
 - gym
+- "\U0001F4AA"
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
 - bin/gym
+- "bin/\U0001F4AA"
 - lib/assets/GymfileTemplate
 - lib/assets/package_application_patches/0001_codesign_args_patch.diff
 - lib/assets/package_application_patches/0002_no_strict_parameter_patch.diff
@@ -204,7 +206,10 @@ files:
 - lib/gym/project.rb
 - lib/gym/runner.rb
 - lib/gym/version.rb
-- lib/gym/xcode_fix.rb
+- 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/watchkit_fix.rb
 homepage: https://fastlane.tools
 licenses:
 - MIT
@@ -225,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Building your iOS apps has never been easier