fastlane_core 0.50.3 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96d82ed677bd4751568e0936cb6b729d8a64e73
-  data.tar.gz: 7e7a3f90bd8de431f1427148a958faf103db97dc
+  metadata.gz: fd9d8635178694a33d1b84e4bc9ec6169cdccc98
+  data.tar.gz: 95004a8b16ad7fe2fe2095ed70037b6978206c42
 SHA512:
-  metadata.gz: f2637e750148dd81c2964ae76d62bec4b29ec74f065d45092d5a8f64551edfc5039019f7911748081361b4f225b2df1ca9a100855f60793bdaee935e17ecd3dd
-  data.tar.gz: cad4a1dddec39691cdb6599d076038b784fded7df8bfa78e54036a0e780e86e25f339c495e89df2c1a7d1be2ee80605e102c8046077f897fe5e5071da637379a
+  metadata.gz: bf19eb51582311a5e087439e686fe24d83867228795c5f6f30fc08d6be2326509e49fe0a4565e922fac21a10b011c10f18020e7d0c4b2fd5ee6f31927db662f1
+  data.tar.gz: b9cebd1cd4252a66fbb0f5a3e81cfbacd1566bf8f8a611763994cdda24224538f523d99690cd284504e9a64f6be5b0a74a3a2c0af83a8480e0abccb57f13d1d9

data/lib/fastlane_core.rb

@@ -34,4 +34,5 @@ require 'commander'
 require 'fastlane_core/ui/fastlane_runner' # monkey patch
 
 module FastlaneCore
+  ROOT = Pathname.new(File.expand_path('../..', __FILE__))
 end

data/lib/fastlane_core/configuration/config_item.rb

@@ -58,7 +58,7 @@ module FastlaneCore
 
     # This will raise an exception if the value is not valid
     def verify!(value)
-      UI.user_error!("Invalid value '#{value}' for option '#{self}'") unless valid? value
+      UI.user_error!("Invalid value '#{value}' for option '#{self}'") unless valid?(value)
       true
     end
 

data/lib/fastlane_core/helper.rb

@@ -140,8 +140,13 @@ module FastlaneCore
       @enabled ||= (File.directory?("./fastlane") || File.directory?("./.fastlane"))
     end
 
+    # <b>DEPRECATED:</b> Use the `ROOT` constant from the appropriate tool module instead
+    # e.g. File.join(Sigh::ROOT, 'lib', 'assets', 'resign.sh')
+    #
     # Path to the installed gem to load resources (e.g. resign.sh)
     def self.gem_path(gem_name)
+      UI.deprecated('`Helper.gem_path` is deprecated. Use the `ROOT` constant from the appropriate tool module instead.')
+
       if !Helper.is_test? and Gem::Specification.find_all_by_name(gem_name).any?
         return Gem::Specification.find_by_name(gem_name).gem_dir
       else

data/lib/fastlane_core/ipa_upload_package_builder.rb

@@ -12,8 +12,6 @@ module FastlaneCore
       FileUtils.rm_rf self.package_path if File.directory?(self.package_path)
       FileUtils.mkdir_p self.package_path
 
-      lib_path = Helper.gem_path("fastlane_core")
-
       ipa_path = copy_ipa(ipa_path)
       @data = {
         apple_id: app_id,
@@ -24,7 +22,7 @@ module FastlaneCore
         platform: (platform || "ios") # pass "appletvos" for Apple TV's IPA
       }
 
-      xml_path = File.join(lib_path, "lib/assets/XMLTemplate.xml.erb")
+      xml_path = File.join(FastlaneCore::ROOT, "lib/assets/XMLTemplate.xml.erb")
       xml = ERB.new(File.read(xml_path)).result(binding) # http://www.rrn.dk/rubys-erb-templating-system
 
       File.write(File.join(self.package_path, METADATA_FILE_NAME), xml)

data/lib/fastlane_core/pkg_upload_package_builder.rb

@@ -12,8 +12,6 @@ module FastlaneCore
       FileUtils.rm_rf(self.package_path) if File.directory?(self.package_path)
       FileUtils.mkdir_p self.package_path
 
-      lib_path = Helper.gem_path('fastlane_core')
-
       pkg_path = copy_pkg(pkg_path)
       @data = {
         apple_id: app_id,
@@ -24,7 +22,7 @@ module FastlaneCore
         platform: 'osx'
       }
 
-      xml_path = File.join(lib_path, 'lib/assets/XMLTemplate.xml.erb')
+      xml_path = File.join(FastlaneCore::ROOT, 'lib/assets/XMLTemplate.xml.erb')
       xml = ERB.new(File.read(xml_path)).result(binding) # http://www.rrn.dk/rubys-erb-templating-system
 
       File.write(File.join(self.package_path, METADATA_FILE_NAME), xml)

data/lib/fastlane_core/project.rb

@@ -204,8 +204,11 @@ module FastlaneCore
     #####################################################
 
     def build_xcodebuild_showbuildsettings_command
-      # We also need to pass the workspace and scheme to this command
-      command = "xcodebuild -showBuildSettings #{xcodebuild_parameters.join(' ')}"
+      # We also need to pass the workspace and scheme to this command.
+      #
+      # The 'clean' portion of this command is a workaround for an xcodebuild bug with Core Data projects.
+      # See: https://github.com/fastlane/fastlane/pull/5626
+      command = "xcodebuild clean -showBuildSettings #{xcodebuild_parameters.join(' ')}"
       command += " 2> /dev/null" if xcodebuild_suppress_stderr
       command
     end
@@ -216,7 +219,17 @@ module FastlaneCore
     def build_settings(key: nil, optional: true)
       unless @build_settings
         command = build_xcodebuild_showbuildsettings_command
-        @build_settings = Helper.backticks(command, print: false)
+
+        # xcode might hang here and retrying fixes the problem, see fastlane#4059
+        begin
+          timeout = FastlaneCore::Project.xcode_build_settings_timeout
+          retries = FastlaneCore::Project.xcode_build_settings_retries
+          @build_settings = FastlaneCore::Project.run_command(command, timeout: timeout, retries: retries, print: !self.xcodebuild_list_silent)
+        rescue Timeout::Error
+          UI.crash!("xcodebuild -showBuildSettings timed-out after #{timeout} seconds and #{retries} retries." \
+            " You can override the timeout value with the environment variable FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT," \
+            " and the number of retries with the environment variable FASTLANE_XCODEBUILD_SETTINGS_RETRIES ")
+        end
       end
 
       begin
@@ -279,14 +292,14 @@ module FastlaneCore
       return @raw if @raw
 
       command = build_xcodebuild_list_command
-      UI.important(command) unless silent
 
       # xcode >= 6 might hang here if the user schemes are missing
       begin
         timeout = FastlaneCore::Project.xcode_list_timeout
-        @raw = FastlaneCore::Project.run_command(command, timeout: timeout)
+        retries = FastlaneCore::Project.xcode_list_retries
+        @raw = FastlaneCore::Project.run_command(command, timeout: timeout, retries: retries, print: !silent)
       rescue Timeout::Error
-        UI.user_error!("xcodebuild -list timed-out after #{timeout} seconds. You might need to recreate the user schemes." \
+        UI.user_error!("xcodebuild -list timed-out after #{timeout * retries} seconds. You might need to recreate the user schemes." \
           " You can override the timeout value with the environment variable FASTLANE_XCODE_LIST_TIMEOUT")
       end
 
@@ -301,13 +314,55 @@ module FastlaneCore
     end
 
     # @internal to module
-    # runs the specified command and kills it if timeouts
-    # @raises Timeout::Error if timeout is passed
-    # @returns the output
-    # Note: currently affected by fastlane/fastlane_core#102
-    def self.run_command(command, timeout: 0)
+    def self.xcode_list_retries
+      (ENV['FASTLANE_XCODE_LIST_RETRIES'] || 3).to_i
+    end
+
+    # @internal to module
+    def self.xcode_build_settings_timeout
+      (ENV['FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT'] || 10).to_i
+    end
+
+    # @internal to module
+    def self.xcode_build_settings_retries
+      (ENV['FASTLANE_XCODEBUILD_SETTINGS_RETRIES'] || 3).to_i
+    end
+
+    # @internal to module
+    # runs the specified command with the specified number of retries, killing each run if it times out
+    # @raises Timeout::Error if all tries result in a timeout
+    # @returns the output of the command
+    # Note: - currently affected by https://github.com/fastlane/fastlane/issues/1504
+    #       - retry feature added to solve https://github.com/fastlane/fastlane/issues/4059
+    def self.run_command(command, timeout: 0, retries: 0, print: true)
       require 'timeout'
-      @raw = Timeout.timeout(timeout) { `#{command}`.to_s }
+
+      UI.command(command) if print
+
+      result = ''
+
+      total_tries = retries + 1
+      try = 1
+      begin
+        Timeout.timeout(timeout) do
+          # Using Helper.backticks didn't work here. `Timeout` doesn't time out, and the command hangs forever
+          result = `#{command}`.to_s
+        end
+      rescue Timeout::Error
+        try_limit_reached = try >= total_tries
+
+        message = "Command timed out after #{timeout} seconds on try #{try} of #{total_tries}"
+        message += ", trying again..." unless try_limit_reached
+
+        UI.important(message)
+
+        raise if try_limit_reached
+
+        try += 1
+        retry
+      end
+
+      return result
     end
 
     private

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.50.3".freeze
+  VERSION = "0.51.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.50.3
+  version: 0.51.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json