gym 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51ccfb15ad789256bd2a6c0deed09836bfefc1b7
-  data.tar.gz: 7403f758d8fe7b9c82fc40b6929209835ba4a607
+  metadata.gz: 378f10d0a08b2c15f6363308f7283df7df4ecfe3
+  data.tar.gz: 3e8786dbc86d23826a378d00d73b24e868ab7fc0
 SHA512:
-  metadata.gz: e81a226ff214a7eaacaa91f8e72562a7f033d1d34fde6aa4dacd11f4efda4070fc22bfcb8d5167c91f676423694e4a1d9f8f7c10d995b9cd02851ed1ba8c6a5c
-  data.tar.gz: c7ab8a3465999084474c0bfdea6358eb1f9cdeb1a0d1a78cfad84c8f90204221b1ef27de784afce1ab12e53e30697d3f52436cbe0c15837e3b76ee05fa4a9e28
+  metadata.gz: 0fd65c7716687b32d54762e17b9a920d1ba271dd788308584a5a9b2b263e7398654fd50e94e1963f4256525dd3a45205f7faadb0ca9219e227a6138e46d99008
+  data.tar.gz: 4cd197f9fb6535496c5b6e287cb5739615c45112467a211f5d538b3ab8d9ac51b8177ec8b964bafcb84078674ca7a9bf513e7c591af5c542b159f298a90e0fc0

data/README.md

@@ -49,11 +49,11 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 
 -------
 
-<h5 align="center"><code>gym</code> is part of <a href="https://fastlane.tools">fastlane</a>: connect all deployment tools into one streamlined workflow.</h5>
+<h5 align="center"><code>gym</code> is part of <a href="https://fastlane.tools">fastlane</a>: The easiest way to automate building and releasing your iOS and Android apps.</h5>
 
 # What's gym?
 
-`gym` builds and packages iOS apps for you. It takes care of all the heavy lifting and makes it super easy to generate a signed `ipa` file :muscle:
+`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` is a replacement for [shenzhen](https://github.com/nomad/shenzhen).
 
@@ -254,7 +254,7 @@ Afterwards the `ipa` file is moved to the output folder. The `dSYM` file is comp
 # Tips
 ## [`fastlane`](https://fastlane.tools) Toolchain
 
-- [`fastlane`](https://fastlane.tools): Connect all deployment tools into one streamlined workflow
+- [`fastlane`](https://fastlane.tools): The easiest way to automate building and releasing your iOS and Android apps
 - [`deliver`](https://github.com/fastlane/fastlane/tree/master/deliver): Upload screenshots, metadata and your app to the App Store
 - [`snapshot`](https://github.com/fastlane/fastlane/tree/master/snapshot): Automate taking localized screenshots of your iOS app on every device
 - [`frameit`](https://github.com/fastlane/fastlane/tree/master/frameit): Quickly put your screenshots into the right device frames

data/lib/gym.rb

@@ -35,6 +35,7 @@ module Gym
       require 'gym/xcodebuild_fixes/swift_fix'
       require 'gym/xcodebuild_fixes/watchkit_fix'
       require 'gym/xcodebuild_fixes/watchkit2_fix'
+      require 'gym/xcodebuild_fixes/generic_archive_fix'
       require 'gym/xcodebuild_fixes/package_application_fix'
     end
   end

data/lib/gym/detect_values.rb

@@ -40,7 +40,7 @@ module Gym
             profile = File.expand_path(profiles.last)
           elsif profiles.count > 1
             UI.message "Found more than one provisioning profile in the project directory:"
-            profile = choose(*(profiles))
+            profile = choose(*profiles)
           end
 
           Gym.config[:provisioning_profile_path] = profile

data/lib/gym/error_handler.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Gym
   # This classes methods are called when something goes wrong in the building process
   class ErrorHandler
@@ -11,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/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
         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/docs/CodeSigning.md"
+          print "You can follow this guide: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
         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/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/fastlane/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/fastlane/fastlane/tree/master/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/fastlane/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"
           print "Additionally make sure you have a code signing identity set"
-          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
+          print "Follow this guide: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
         when /US\-ASCII/
           print "Your shell environment is not correctly configured"
           print "Instead of UTF-8 your shell uses US-ASCII"
@@ -98,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/docs/CodeSigning.md"
+        print "Follow this guide to setup code signing https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
         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/package_command_generator_legacy.rb

@@ -40,16 +40,21 @@ module Gym
         [""]
       end
 
+      # Place where the IPA file will be created, so it can be safely moved to the destination folder
+      def temporary_output_path
+        Gym.cache[:temporary_output_path] ||= Dir.mktmpdir('gym_output')
+      end
+
       def appfile_path
         path = Dir.glob("#{BuildCommandGenerator.archive_path}/Products/Applications/*.app").first
-        path ||= Dir[BuildCommandGenerator.archive_path + "/**/*.app"].last
+        path ||= Dir[BuildCommandGenerator.archive_path + "/**/*.app"].first
 
         return path
       end
 
       # We export it to the temporary folder and move it over to the actual output once it's finished and valid
       def ipa_path
-        File.join(BuildCommandGenerator.build_path, "#{Gym.config[:output_name]}.ipa")
+        File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
       end
 
       # The path the the dsym file for this app. Might be nil

data/lib/gym/generators/package_command_generator_xcode7.rb

@@ -37,23 +37,24 @@ module Gym
 
       # We export the ipa into this directory, as we can't specify the ipa file directly
       def temporary_output_path
-        Gym.cache[:temporary_output_path] ||= "#{Tempfile.new('gym').path}.gym_output"
+        Gym.cache[:temporary_output_path] ||= Dir.mktmpdir('gym_output')
       end
 
       def ipa_path
         unless Gym.cache[:ipa_path]
           path = Dir[File.join(temporary_output_path, "*.ipa")].last
+          # We need to process generic IPA
           if path
             # Try to find IPA file in the output directory, used when app thinning was not set
             Gym.cache[:ipa_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
-            FileUtils.mv(path, Gym.cache[:ipa_path]) if File.expand_path(path).downcase != File.expand_path(Gym.cache[:ipa_path]).downcase
+            FileUtils.mv(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:ipa_path]).downcase).zero?
           elsif Dir.exist?(apps_path)
             # Try to find "generic" IPA file inside "Apps" folder, used when app thinning was set
             files = Dir[File.join(apps_path, "*.ipa")]
             # Generic IPA file doesn't have suffix so its name is the shortest
             path = files.min_by(&:length)
             Gym.cache[:ipa_path] = File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
-            FileUtils.cp(path, Gym.cache[:ipa_path]) if File.expand_path(path).downcase != File.expand_path(Gym.cache[:ipa_path]).downcase
+            FileUtils.cp(path, Gym.cache[:ipa_path]) unless File.expand_path(path).casecmp(File.expand_path(Gym.cache[:ipa_path]).downcase).zero?
           else
             ErrorHandler.handle_empty_archive unless path
           end
@@ -68,7 +69,7 @@ module Gym
 
       # The path the config file we use to sign our app
       def config_path
-        Gym.cache[:config_path] ||= "#{Tempfile.new('gym').path}_config.plist"
+        Gym.cache[:config_path] ||= "#{Tempfile.new('gym_config').path}.plist"
         return Gym.cache[:config_path]
       end
 
@@ -162,7 +163,7 @@ module Gym
       def print_legacy_information
         if Gym.config[:provisioning_profile_path]
           UI.important "You're using Xcode 7, the `provisioning_profile_path` value will be ignored"
-          UI.important "Please follow the Code Signing Guide: https://github.com/fastlane/fastlane/blob/master/docs/CodeSigning.md"
+          UI.important "Please follow the Code Signing Guide: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/CodeSigning.md"
         end
       end
     end

data/lib/gym/runner.rb

@@ -16,6 +16,7 @@ module Gym
       FileUtils.mkdir_p(Gym.config[:output_directory])
 
       if Gym.project.ios? || Gym.project.tvos?
+        fix_generic_archive # See https://github.com/fastlane/fastlane/pull/4325
         package_app
         fix_package
         compress_and_move_dsym
@@ -72,6 +73,11 @@ module Gym
       end
     end
 
+    def fix_generic_archive
+      return if ENV["GYM_USE_GENERIC_ARCHIVE_FIX"].nil?
+      Gym::XcodebuildFixes.generic_archive_fix
+    end
+
     def fix_package
       return unless Gym.config[:use_legacy_build_api]
       Gym::XcodebuildFixes.swift_library_fix
@@ -96,7 +102,7 @@ module Gym
                                               end)
 
       mark_archive_as_built_by_gym(BuildCommandGenerator.archive_path)
-      UI.success "Successfully stored the archive. You can find it in the Xcode Organizer."
+      UI.success "Successfully stored the archive. You can find it in the Xcode Organizer." unless Gym.config[:archive_path].nil?
       UI.verbose("Stored the archive in: " + BuildCommandGenerator.archive_path)
     end
 
@@ -210,8 +216,6 @@ module Gym
       end
     end
 
-    private
-
     def find_archive_path
       if Gym.config[:use_legacy_build_api]
         BuildCommandGenerator.archive_path

data/lib/gym/version.rb

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

data/lib/gym/xcode.rb

@@ -11,6 +11,7 @@ module Gym
 
       # Below Xcode 7 (which offers a new nice API to sign the app)
       def pre_7?
+        UI.user_error!("Unable to locate Xcode. Please make sure to have Xcode installed on your machine") if xcode_version.nil?
         v = xcode_version
         is_pre = v.split('.')[0].to_i < 7
         is_pre

data/lib/gym/xcodebuild_fixes/generic_archive_fix.rb

@@ -0,0 +1,32 @@
+require 'shellwords'
+
+module Gym
+  class XcodebuildFixes
+    class << self
+      # Determine IPAs for the Watch App which aren't inside of a containing
+      # iOS App and removes them.
+      #
+      # In the future it may be nice to modify the plist file for the archive
+      # itself so that it points to the correct IPA as well.
+      #
+      # This is a workaround for this bug
+      # https://github.com/CocoaPods/CocoaPods/issues/4178
+      def generic_archive_fix
+        UI.verbose "Looking For Orphaned WatchKit2 Applications"
+
+        Dir.glob("#{BuildCommandGenerator.archive_path}/Products/Applications/*.app").each do |app_path|
+          if is_watchkit_app?(app_path)
+            UI.verbose "Removing Orphaned WatchKit2 Application #{app_path}"
+            FileUtils.rm_rf(app_path)
+          end
+        end
+      end
+
+      # Does this application have a WatchKit target
+      def is_watchkit_app?(app_path)
+        plist_path = "#{app_path}/Info.plist"
+        `/usr/libexec/PlistBuddy -c 'Print :DTSDKName' #{plist_path.shellescape} 2>&1`.match(/^\s*watchos2\.\d+\s*$/) != nil
+      end
+    end
+  end
+end

data/lib/gym/xcodebuild_fixes/watchkit_fix.rb

@@ -33,7 +33,7 @@ module Gym
 
       # Should only be applied if watchkit app is not a watchkit2 app
       def should_apply_watchkit1_fix?
-        watchkit? && !(Gym::XcodebuildFixes.watchkit2?)
+        watchkit? && !Gym::XcodebuildFixes.watchkit2?
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-05-07 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.36.1
+        version: 0.43.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: 0.43.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +259,7 @@ files:
 - lib/gym/version.rb
 - lib/gym/xcode.rb
 - lib/gym/xcodebuild_fixes/README.md
+- lib/gym/xcodebuild_fixes/generic_archive_fix.rb
 - lib/gym/xcodebuild_fixes/package_application_fix.rb
 - lib/gym/xcodebuild_fixes/swift_fix.rb
 - lib/gym/xcodebuild_fixes/watchkit2_fix.rb
@@ -269,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Building your iOS apps has never been easier