gym 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c76a24f7879f86175a8a39ce9679116e669d9c5
-  data.tar.gz: ad0f0ce1ff3e9da26eea7a1e17754f6c6e4c1963
+  metadata.gz: 30a7b849f783846aa81e20f82a41ba031c9aabef
+  data.tar.gz: bcdf8bb5946c5bad1f28c104d5f739674d6bda8a
 SHA512:
-  metadata.gz: 04f9486f03e74325e53c66a3fcc21a2d60d4650e2eb530a28cd7592e2dcdc5573fe4c74fffd6b747617a516277279cae82d450db56010c50d04a12642c2b446a
-  data.tar.gz: 9f36f4679516d67dcf4fe49488bf58760ba226b1369fe13731c817cbf1f67092deee928d82c12e83e7c3bffd4d32e02c09d043084a2494c6f1db92c786ffb03f
+  metadata.gz: 70ef804df96c4bdae6d005ba422c2cc7676998c9a8573427038473fe67d8ea4f44a50f3b4eb55227763ad78e4742834dbafe81ff4f6ac0f027b76e845fde1c3a
+  data.tar.gz: edca9aacc075e79583f7642c6277bfb10b71cd95b1223aa4a5fa9af3df99b86c5f2459e5cbfd6d7efe31eb3059c26655b05e4e65691cf4d088f3bd2c65a5ae8b

data/README.md

@@ -116,6 +116,10 @@ That's all you need to build your application. If you want more control, here ar
 
     gym --workspace "Example.xcworkspace" --scheme "AppName" --clean
 
+If you need to use a different xcode install, use xcode-select or define DEVELOPER_DIR:
+
+    DEVELOPER_DIR="/Applications/Xcode6.2.app" gym
+
 For a list of all available parameters use
 
     gym --help
@@ -125,6 +129,11 @@ If you run into any issues, use the `verbose` mode to get more information
 
     gym --verbose
 
+To pass boolean parameters make sure to use `gym` like this:
+
+    gym --upload_bitcode true --upload_symbols true
+
+
 # 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`.

data/lib/assets/GymfileTemplate

@@ -9,6 +9,6 @@
 
 # scheme "Example"
 
-# sdk "9.0"
+# sdk "iphoneos9.0"
 
 output_directory "./"

data/lib/gym.rb

@@ -2,17 +2,13 @@ require 'json'
 require 'gym/version'
 require 'gym/manager'
 require 'gym/project'
-require 'gym/build_command_generator'
-require 'gym/package_command_generator'
+require 'gym/generators/build_command_generator'
+require 'gym/generators/package_command_generator'
 require 'gym/runner'
 require 'gym/error_handler'
 require 'gym/options'
 require 'gym/detect_values'
-
-# Import all the fixes
-require 'gym/xcodebuild_fixes/swift_fix'
-require 'gym/xcodebuild_fixes/watchkit_fix'
-require 'gym/xcodebuild_fixes/package_application_fix'
+require 'gym/xcode'
 
 require 'fastlane_core'
 require 'terminal-table'
@@ -32,10 +28,16 @@ module Gym
       "Gymfile"
     end
 
-    def xcode_path
-      @path ||= `xcode-select --print-path`.strip
+    def init_libs
+      return unless Xcode.pre_7?
+      # Import all the fixes
+      require 'gym/xcodebuild_fixes/swift_fix'
+      require 'gym/xcodebuild_fixes/watchkit_fix'
+      require 'gym/xcodebuild_fixes/package_application_fix'
     end
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+
+  Gym.init_libs
 end

data/lib/gym/generators/README.md

@@ -0,0 +1 @@
+All the classes that generate commands we want to execute

data/lib/gym/generators/package_command_generator.rb

@@ -0,0 +1,34 @@
+require 'shellwords'
+
+# The concrete implementations
+require 'gym/generators/package_command_generator_legacy'
+require 'gym/generators/package_command_generator_xcode7'
+
+module Gym
+  class PackageCommandGenerator
+    class << self
+      def generate
+        generator.generate
+      end
+
+      def appfile_path
+        generator.appfile_path
+      end
+
+      def ipa_path
+        generator.ipa_path
+      end
+
+      def dsym_path
+        generator.dsym_path
+      end
+
+      private
+
+      # The generator we need to use for the currently used Xcode version
+      def generator
+        Xcode.pre_7? ? PackageCommandGeneratorLegacy : PackageCommandGeneratorXcode7
+      end
+    end
+  end
+end

data/lib/gym/{package_command_generator.rb → generators/package_command_generator_legacy.rb}

@@ -1,11 +1,9 @@
-require 'shellwords'
-
 module Gym
-  # Responsible for building the fully working xcodebuild command
+  # Responsible for building the fully working xcodebuild command on Xcode < 7
   #
   # Because of a known bug in PackageApplication Perl script used by Xcode the packaging process is performed with
   # a patched version of the script.
-  class PackageCommandGenerator
+  class PackageCommandGeneratorLegacy
     class << self
       def generate
         parts = ["/usr/bin/xcrun #{XcodebuildFixes.patch_package_application} -v"]

data/lib/gym/generators/package_command_generator_xcode7.rb

@@ -0,0 +1,64 @@
+module Gym
+  # Responsible for building the fully working xcodebuild command
+  class PackageCommandGeneratorXcode7
+    class << self
+      def generate
+        if Gym.config[:provisioning_profile_path]
+          Helper.log.info "You're using Xcode 7, the `provisioning_profile_path` value will be ignored".yellow
+          Helper.log.info "Please follow the Code Signing Guide: https://github.com/KrauseFx/fastlane/blob/master/docs/CodeSigning.md".yellow
+        end
+
+        parts = ["/usr/bin/xcrun xcodebuild -exportArchive"]
+        parts += options
+        parts += pipe
+
+        File.write(config_path, config_content) # overwrite everytime. Could be optimized
+
+        parts
+      end
+
+      def options
+        options = []
+
+        options << "-exportOptionsPlist '#{config_path}'"
+        options << "-archivePath '#{BuildCommandGenerator.archive_path}'"
+        options << "-exportPath '#{BuildCommandGenerator.build_path}'" # we move it once the binary is finished
+
+        options
+      end
+
+      def pipe
+        [""]
+      end
+
+      def ipa_path
+        File.join(BuildCommandGenerator.build_path, "#{Gym.config[:output_name]}.ipa")
+      end
+
+      # The path the the dsym file for this app. Might be nil
+      def dsym_path
+        Dir[BuildCommandGenerator.archive_path + "/**/*.app.dSYM"].last
+      end
+
+      # The path the config file we use to sign our app
+      def config_path
+        @config_path ||= "/tmp/gym_config_#{Time.now.to_i}.plist"
+        return @config_path
+      end
+
+      private
+
+      def config_content
+        require 'plist'
+        symbols = (Gym.config[:upload_symbols] ? true : false)
+        bitcode = (Gym.config[:upload_bitcode] ? true : false)
+
+        {
+          method: 'app-store',
+          uploadSymbols: symbols,
+          uploadBitcode: bitcode
+        }.to_plist
+      end
+    end
+  end
+end

data/lib/gym/manager.rb

@@ -19,7 +19,7 @@ module Gym
       rows << ["Configuration", config[:configuration]] if config[:configuration]
       rows << ["Archive Path", config[:archive_path]] if config[:archive_path]
       rows << ["Platform", Gym.project.ios? ? "iOS" : "Mac"]
-      rows << ["Xcode Path", Gym.xcode_path.gsub("/Contents/Developer", "")]
+      rows << ["Xcode Path", Xcode.xcode_path.gsub("/Contents/Developer", "")]
 
       puts ""
       puts Terminal::Table.new(

data/lib/gym/options.rb

@@ -101,6 +101,16 @@ module Gym
                                      verify_block: proc do |value|
                                        raise "File not found at path '#{File.expand_path(value)}'".red unless File.exist?(value)
                                      end),
+        FastlaneCore::ConfigItem.new(key: :upload_symbols,
+                                     short_option: "-m",
+                                     env_name: "GYM_UPLOAD_SYMBOLS",
+                                     description: "Should the ipa file include symbols?",
+                                     default_value: true),
+        FastlaneCore::ConfigItem.new(key: :upload_bitcode,
+                                     short_option: "-z",
+                                     env_name: "GYM_UPLOAD_BITCODE",
+                                     description: "Should the ipa include bitcode?",
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :provisioning_profile_path,
                                      short_option: "-e",
                                      env_name: "GYM_PROVISIONING_PROFILE_PATH",

data/lib/gym/runner.rb

@@ -14,10 +14,7 @@ module Gym
 
       if Gym.project.ios?
         package_app
-        Gym::XcodebuildFixes.swift_library_fix
-        Gym::XcodebuildFixes.watchkit_fix
-        Gym::XcodebuildFixes.clear_patched_package_application
-
+        fix_package
         compress_and_move_dsym
         move_ipa
       elsif Gym.project.mac?
@@ -60,11 +57,19 @@ module Gym
     #####################################################
 
     def clear_old_files
-      if File.exist? PackageCommandGenerator.ipa_path
+      return unless Xcode.pre_7?
+      if File.exist?(PackageCommandGenerator.ipa_path)
         File.delete(PackageCommandGenerator.ipa_path)
       end
     end
 
+    def fix_package
+      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
     def build_app
       command = BuildCommandGenerator.generate
@@ -114,7 +119,7 @@ module Gym
 
       puts "" # new line
 
-      Helper.log.info "Successfully exported and compressed dSYM file.".green
+      Helper.log.info "Successfully exported and compressed dSYM file".green
     end
 
     # Moves over the binary and dsym file to the output directory
@@ -141,5 +146,15 @@ module Gym
       Helper.log.info app_path
       app_path
     end
+
+    private
+
+    def find_archive_path
+      if Xcode.pre_7?
+        BuildCommandGenerator.archive_path
+      else
+        Dir.glob(File.join(BuildCommandGenerator.build_path, "*.ipa")).last
+      end
+    end
   end
 end

data/lib/gym/version.rb

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

data/lib/gym/xcode.rb

@@ -0,0 +1,20 @@
+module Gym
+  class Xcode
+    class << self
+      def xcode_path
+        Helper.xcode_path
+      end
+
+      def xcode_version
+        Helper.xcode_version
+      end
+
+      # Below Xcode 7 (which offers a new nice API to sign the app)
+      def pre_7?
+        v = xcode_version
+        is_pre = v.split('.')[0].to_i < 7
+        is_pre
+      end
+    end
+  end
+end

data/lib/gym/xcodebuild_fixes/package_application_fix.rb

@@ -18,7 +18,7 @@ module Gym
           expected_md5 = File.read(path)
 
           # If that location changes, search it using xcrun --sdk iphoneos -f PackageApplication
-          package_application_path = "#{Gym.xcode_path}/Platforms/iPhoneOS.platform/Developer/usr/bin/PackageApplication"
+          package_application_path = "#{Xcode.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
 

data/lib/gym/xcodebuild_fixes/swift_fix.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# from http://stackoverflow.com/a/9857493/445598
+# because of
+# `incompatible encoding regexp match (UTF-8 regexp with ASCII-8BIT string) (Encoding::CompatibilityError)`
 require 'zip'
 
 module Gym
@@ -23,7 +27,7 @@ module Gym
           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))
+            FileUtils.copy_file("#{Xcode.xcode_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos/#{framework}", File.join(swift_support, framework))
           end
 
           # Add "SwiftSupport" to the .ipa archive

data/lib/gym/xcodebuild_fixes/watchkit_fix.rb

@@ -13,7 +13,7 @@ module Gym
           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"))
+          FileUtils.copy_file("#{Xcode.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -216,16 +230,20 @@ files:
 - lib/assets/package_application_patches/0002_no_strict_parameter_patch.diff
 - lib/assets/package_application_patches/PackageApplication_MD5
 - lib/gym.rb
-- lib/gym/build_command_generator.rb
 - lib/gym/commands_generator.rb
 - lib/gym/detect_values.rb
 - lib/gym/error_handler.rb
+- lib/gym/generators/README.md
+- lib/gym/generators/build_command_generator.rb
+- lib/gym/generators/package_command_generator.rb
+- lib/gym/generators/package_command_generator_legacy.rb
+- lib/gym/generators/package_command_generator_xcode7.rb
 - lib/gym/manager.rb
 - lib/gym/options.rb
-- lib/gym/package_command_generator.rb
 - lib/gym/project.rb
 - lib/gym/runner.rb
 - lib/gym/version.rb
+- lib/gym/xcode.rb
 - lib/gym/xcodebuild_fixes/README.md
 - lib/gym/xcodebuild_fixes/package_application_fix.rb
 - lib/gym/xcodebuild_fixes/swift_fix.rb