gym 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb5dfb0c034f1f176aa33c251efe825fc565588
-  data.tar.gz: ad83beb96bae35108114fba5b82ceef5beb20582
+  metadata.gz: 590508ca78d6b207af7e7c309199a22a1d53064d
+  data.tar.gz: c98dd273ef0aea8914568bc655998415ee1fbe28
 SHA512:
-  metadata.gz: 7b2ef7b42f1ac411b048ab1d31a31fdc224aa81d286bb19dab22c2775815863089010b02d52cc6d602f77de69aa95be1e5147b6a72ab57eb4f6bd60ccbc74549
-  data.tar.gz: 8e9661c7de9d06cbfd85a752085ea01b31df8cad059d51de6b48bee97f5a466e726be94e1812821d032caf1b83f83f2d04ac31a09da6c0d4773e5e2d5c4b969e
+  metadata.gz: afb5c65b4055fe1f08bd5fef2263a15bad603d1cfda84fb69a0466f353f6d7144cd9d27d5e551937a8cc7c49cf636b41da60305d617998b282b7699a023fd4ba
+  data.tar.gz: 994c7872045e8af70d6d7b507e1ada9741e3c5a525dae10938bf297887299082a40365248b67fe8c55b08fbe8e283ebde0e63371d9e61822b356b692753f64f1

data/README.md

@@ -53,7 +53,7 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 
 # What's gym?
 
-`gym` builds and packages iOS and OS X apps for you. It takes care of all the heavy lifting and makes it super easy to generate a signed `ipa` or `app` file :muscle:
+`gym` builds and packages iOS and macOS apps for you. It takes care of all the heavy lifting and makes it super easy to generate a signed `ipa` or `app` file :muscle:
 
 `gym` is a replacement for [shenzhen](https://github.com/nomad/shenzhen).
 
@@ -193,7 +193,7 @@ Using `fastlane` you can define a configuration like
 
 ```ruby
 lane :beta do
-  xctool
+  scan
   gym(scheme: "MyApp")
   crashlytics
 end

data/lib/gym.rb

@@ -43,6 +43,7 @@ module Gym
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
   UI = FastlaneCore::UI
+  ROOT = Pathname.new(File.expand_path('../..', __FILE__))
 
   Gym.init_libs
 end

data/lib/gym/commands_generator.rb

@@ -50,7 +50,7 @@ module Gym
           containing = (File.directory?("fastlane") ? 'fastlane' : '.')
           path = File.join(containing, Gym.gymfile_name)
           UI.user_error! "Gymfile already exists" if File.exist?(path)
-          template = File.read("#{Helper.gem_path('gym')}/lib/assets/GymfileTemplate")
+          template = File.read("#{Gym::ROOT}/lib/assets/GymfileTemplate")
           File.write(path, template)
           UI.success "Successfully created '#{path}'. Open the file using a code editor."
         end

data/lib/gym/detect_values.rb

@@ -56,11 +56,15 @@ module Gym
       Gym.project.select_scheme
     end
 
+    def self.min_xcode8?
+      Helper.xcode_version.split(".").first.to_i >= 8
+    end
+
     # Is it an iOS device or a Mac?
     def self.detect_platform
       return if Gym.config[:destination]
       platform = if Gym.project.mac?
-                   "OS X"
+                   min_xcode8? ? "macOS" : "OS X"
                  elsif Gym.project.tvos?
                    "tvOS"
                  else

data/lib/gym/error_handler.rb

@@ -12,30 +12,30 @@ module Gym
           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/fastlane/fastlane/tree/master/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
         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/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
+          print "You can follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
         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/fastlane/fastlane/tree/master/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
         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/fastlane/fastlane/tree/master/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
 
         # 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/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
         when /US\-ASCII/
           print "Your shell environment is not correctly configured"
           print "Instead of UTF-8 your shell uses US-ASCII"
@@ -99,7 +99,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/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
+        print "Follow this guide to setup code signing https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
         print "If your intention was only to export an ipa be sure to provide a valid archive at the archive path."
         UI.user_error!("Archive invalid")
       end

data/lib/gym/generators/build_command_generator.rb

@@ -35,6 +35,7 @@ module Gym
         options += project_path_array
         options << "-configuration '#{config[:configuration]}'" if config[:configuration]
         options << "-sdk '#{config[:sdk]}'" if config[:sdk]
+        options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
         options << "-destination '#{config[:destination]}'" if config[:destination]
         options << "-xcconfig '#{config[:xcconfig]}'" if config[:xcconfig]
         options << "-archivePath '#{archive_path}'"
@@ -63,8 +64,28 @@ module Gym
 
       def pipe
         pipe = []
-        pipe << "| tee #{xcodebuild_log_path.shellescape} | xcpretty"
-        pipe << "--no-color" if Helper.colors_disabled?
+        pipe << "| tee #{xcodebuild_log_path.shellescape}"
+        unless Gym.config[:disable_xcpretty]
+          formatter = Gym.config[:xcpretty_formatter]
+          pipe << "| xcpretty"
+          pipe << " --test" if Gym.config[:xcpretty_test_format]
+          pipe << " --no-color" if Helper.colors_disabled?
+          pipe << " --formatter " if formatter
+          pipe << formatter if formatter
+          report_output_junit = Gym.config[:xcpretty_report_junit]
+          report_output_html = Gym.config[:xcpretty_report_html]
+          report_output_json = Gym.config[:xcpretty_report_json]
+          if report_output_junit
+            pipe << " --report junit --output "
+            pipe << report_output_junit
+          elsif report_output_html
+            pipe << " --report html --output "
+            pipe << report_output_html
+          elsif report_output_json
+            pipe << " --report json-compilation-database --output "
+            pipe << report_output_json
+          end
+        end
         pipe << "> /dev/null" if Gym.config[:suppress_xcode_output]
 
         pipe

data/lib/gym/generators/package_command_generator_legacy.rb

@@ -96,6 +96,10 @@ module Gym
         if Gym.config[:export_method].to_s.length > 0
           UI.important "Legacy build api is enabled, the `export_method` value will be ignored"
         end
+
+        if Gym.config[:toolchain].to_s.length > 0
+          UI.important "Legacy build api is enabled, the `toolchain` value will be ignored"
+        end
       end
     end
   end

data/lib/gym/generators/package_command_generator_xcode7.rb

@@ -28,6 +28,10 @@ module Gym
         options << "-archivePath '#{BuildCommandGenerator.archive_path}'"
         options << "-exportPath '#{temporary_output_path}'"
 
+        if Gym.config[:toolchain]
+          options << "-toolchain '#{Gym.config[:toolchain]}'"
+        end
+
         options
       end
 
@@ -164,7 +168,7 @@ module Gym
         return if Gym.config[:provisioning_profile_path].to_s.length == 0
 
         UI.error "You're using Xcode 7, the `provisioning_profile_path` value will be ignored"
-        UI.error "Please follow the Code Signing Guide: https://codesigning.guide (for match) or https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
+        UI.error "Please follow the Code Signing Guide: https://codesigning.guide (for match) or https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
       end
     end
   end

data/lib/gym/options.rb

@@ -152,12 +152,16 @@ module Gym
                                      short_option: "-l",
                                      env_name: "GYM_BUILDLOG_PATH",
                                      description: "The directory where to store the build log",
-                                     default_value: "~/Library/Logs/gym"),
+                                     default_value: "#{FastlaneCore::Helper.buildlog_path}/gym"),
         FastlaneCore::ConfigItem.new(key: :sdk,
                                      short_option: "-k",
                                      env_name: "GYM_SDK",
                                      description: "The SDK that should be used for building the application",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :toolchain,
+                                     env_name: "GYM_TOOLCHAIN",
+                                     description: "The toolchain that should be used for building the application (e.g. com.apple.dt.toolchain.Swift_2_3, org.swift.30p620160816a)",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :provisioning_profile_path,
                                      short_option: "-e",
                                      env_name: "GYM_PROVISIONING_PROFILE_PATH",
@@ -195,7 +199,45 @@ module Gym
                                      env_name: "SUPPRESS_OUTPUT",
                                      description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
                                      optional: true,
-                                     is_string: false)
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :disable_xcpretty,
+                                     env_name: "DISABLE_XCPRETTY",
+                                     description: "Disable xcpretty formatting of build output",
+                                     optional: true,
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_test_format,
+                                     env_name: "XCPRETTY_TEST_FORMAT",
+                                     description: "Use the test (RSpec style) format for build output",
+                                     optional: true,
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_formatter,
+                                     env_name: "XCPRETTY_FORMATTER",
+                                     description: "A custom xcpretty formatter to use",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Formatter file not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_report_junit,
+                                     env_name: "XCPRETTY_REPORT_JUNIT",
+                                     description: "Have xcpretty create a JUnit-style XML report at the provided path",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Report output location not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_report_html,
+                                     env_name: "XCPRETTY_REPORT_HTML",
+                                     description: "Have xcpretty create a simple HTML report at the provided path",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Report output location not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_report_json,
+                                     env_name: "XCPRETTY_REPORT_JSON",
+                                     description: "Have xcpretty create a JSON compilation database at the provided path",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Report output location not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                                     end)
       ]
     end
   end

data/lib/gym/version.rb

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

data/lib/gym/xcodebuild_fixes/package_application_fix.rb

@@ -14,7 +14,7 @@ module Gym
           # Check current set of PackageApplication MD5 hashes
           require 'digest'
 
-          path = File.join(Helper.gem_path("gym"), "lib/assets/package_application_patches/PackageApplication_MD5")
+          path = File.join(Gym::ROOT, "lib/assets/package_application_patches/PackageApplication_MD5")
           expected_md5_hashes = File.read(path).split("\n")
 
           # If that location changes, search it using xcrun --sdk iphoneos -f PackageApplication
@@ -26,7 +26,7 @@ module Gym
           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|
+          Dir[File.join(Gym::ROOT, "lib/assets/package_application_patches/*.diff")].each do |patch|
             UI.verbose "Applying Package Application patch: #{File.basename(patch)}"
             command = ["patch '#{@patched_package_application_path}' < '#{patch}'"]
             Runner.new.print_command(command, "Applying Package Application patch: #{File.basename(patch)}") if $verbose
@@ -46,7 +46,7 @@ module Gym
       # 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")
+        @wrapped_xcodebuild_path ||= File.join(Gym::ROOT, "lib/assets/wrap_xcodebuild/xcbuild-safe.sh")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-08-29 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.43.3
+        version: 0.50.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.43.3
+        version: 0.50.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Building your iOS apps has never been easier