fastlane 2.71.0.beta.20171219010003 → 2.71.0.beta.20171220010004

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fd252b22d17a46eaec58c8a919ac167ac5f852
-  data.tar.gz: 2785ab29b9e222048881ab02ef16eaae06373234
+  metadata.gz: 5b0f28e3d854336011733cad2052ccf36787cb3f
+  data.tar.gz: 32ab90aa7fc301ecc5025ba4bcb6ccdad23d7a38
 SHA512:
-  metadata.gz: b7a1c6c6ab62d30df653c582a0736939fe4bf174f5757c2e4f4907e534678bd257d6bb59e1b60bb4dc6f63aa3712b0ff29738481d7d7155d0407ddbe29131ae7
-  data.tar.gz: ddec52067646e9f0e33d7641e1cac5f9ea3d8d81a07a6bfc139546c9932f6b5fa2dc65083ac284dca54fa121d8d08a555fdefac342fd6b5f5b97a862e4d6e8d2
+  metadata.gz: 9d746c80610c2316b7f52070b5d7316a34a53048b5bf22d135fa9ce4c7d55465c69fc7c197871c62d35c03b7d87c089da17a86d2dcf49fc9ea1b204a11256073
+  data.tar.gz: 8d3afe3ef6d4e1eb40aeb7a581856f6ece407b417be4b9895eb3690537a6f8f6a0081df8534220a79a1e3ea9a4163b7fc6f4259e98be1e432267978684017cb1

data/fastlane/lib/fastlane/actions/danger.rb

@@ -13,12 +13,14 @@ module Fastlane
         dangerfile = params[:dangerfile]
         base = params[:base]
         head = params[:head]
+        pr = params[:pr]
         cmd << "--danger_id=#{danger_id}" if danger_id
         cmd << "--dangerfile=#{dangerfile}" if dangerfile
         cmd << "--fail-on-errors=true" if params[:fail_on_errors]
         cmd << "--new-comment" if params[:new_comment]
         cmd << "--base=#{base}" if base
         cmd << "--head=#{head}" if head
+        cmd << "pr #{pr}" if pr
 
         ENV['DANGER_GITHUB_API_TOKEN'] = params[:github_api_token] if params[:github_api_token]
 
@@ -85,6 +87,11 @@ module Fastlane
                                        env_name: "FL_DANGER_HEAD",
                                        description: "A branch/tag/commit to use as the head. [master|dev|stable]",
                                        is_string: true,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :pr,
+                                       env_name: "FL_DANGER_PR",
+                                       description: "Run danger on a specific pull request. e.g. \"https://github.com/danger/danger/pull/518\"",
+                                       is_string: true,
                                        optional: true)
         ]
       end

data/fastlane/lib/fastlane/actions/get_build_number.rb

@@ -85,6 +85,10 @@ module Fastlane
         ]
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.category
         :project
       end

data/fastlane/lib/fastlane/actions/git_branch.rb

@@ -44,6 +44,10 @@ module Fastlane
         ]
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.category
         :source_control
       end

data/fastlane/lib/fastlane/actions/slack.rb

@@ -38,15 +38,24 @@ module Fastlane
 
         return [notifier, slack_attachment] if Helper.is_test? # tests will verify the slack attachments and other properties
 
-        result = notifier.ping '',
-                               icon_url: icon_url,
-                               attachments: [slack_attachment]
-
-        if result.code.to_i == 200
-          UI.success('Successfully sent Slack notification')
-        else
-          UI.verbose(result)
-          UI.user_error!("Error pushing Slack message, maybe the integration has no permission to post on this channel? Try removing the channel parameter in your Fastfile, this is usually caused by a misspelled or changed group/channel name or an expired SLACK_URL")
+        begin
+          result = notifier.ping '',
+                                 icon_url: icon_url,
+                                 attachments: [slack_attachment]
+        rescue => exception
+          UI.error("Exception: #{exception}")
+        ensure
+          if !result.nil? && result.code.to_i == 200
+            UI.success('Successfully sent Slack notification')
+          else
+            UI.verbose(result) unless result.nil?
+            message = "Error pushing Slack message, maybe the integration has no permission to post on this channel? Try removing the channel parameter in your Fastfile, this is usually caused by a misspelled or changed group/channel name or an expired SLACK_URL"
+            if options[:fail_on_error]
+              UI.user_error!(message)
+            else
+              UI.error(message)
+            end
+          end
         end
       end
 
@@ -109,6 +118,12 @@ module Fastlane
                                        description: "Was this build successful? (true/false)",
                                        optional: true,
                                        default_value: true,
+                                       is_string: false),
+          FastlaneCore::ConfigItem.new(key: :fail_on_error,
+                                       env_name: "FL_SLACK_FAIL_ON_ERROR",
+                                       description: "Should an error sending the slack notification cause a failure? (true/false)",
+                                       optional: true,
+                                       default_value: true,
                                        is_string: false)
         ]
       end

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.71.0.beta.20171219010003'.freeze
+  VERSION = '2.71.0.beta.20171220010004'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Fastlane.swift

@@ -1393,9 +1393,9 @@ func gcovr() {
   let command = RubyCommand(commandID: "", methodName: "gcovr", className: nil, args: [])
   _ = runner.executeCommand(command)
 }
-func getBuildNumber(xcodeproj: String? = nil) {
+@discardableResult func getBuildNumber(xcodeproj: String? = nil) -> String {
   let command = RubyCommand(commandID: "", methodName: "get_build_number", className: nil, args: [RubyCommand.Argument(name: "xcodeproj", value: xcodeproj)])
-  _ = runner.executeCommand(command)
+  return runner.executeCommand(command)
 }
 func getBuildNumberRepository(useHgRevisionNumber: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "get_build_number_repository", className: nil, args: [RubyCommand.Argument(name: "use_hg_revision_number", value: useHgRevisionNumber)])
@@ -1525,9 +1525,9 @@ func gitAdd(path: String? = nil,
                                                                                          RubyCommand.Argument(name: "pathspec", value: pathspec)])
   _ = runner.executeCommand(command)
 }
-func gitBranch() {
+@discardableResult func gitBranch() -> String {
   let command = RubyCommand(commandID: "", methodName: "git_branch", className: nil, args: [])
-  _ = runner.executeCommand(command)
+  return runner.executeCommand(command)
 }
 func gitCommit(path: String,
                message: String) {

data/fastlane_core/lib/fastlane_core/analytics/action_launch_context.rb

@@ -20,7 +20,7 @@ module FastlaneCore
       app_id_guesser = FastlaneCore::AppIdentifierGuesser.new(args: args)
       return self.new(
         action_name: action_name,
-        p_hash: app_id_guesser.p_hash,
+        p_hash: app_id_guesser.p_hash || UNKNOWN_P_HASH,
         platform: app_id_guesser.platform,
         configuration_language: configuration_language
       )

data/fastlane_core/lib/fastlane_core/configuration/configuration.rb

@@ -163,14 +163,9 @@ module FastlaneCore
 
       self.config_file_name = config_file_name
 
-      paths = []
-      paths += Dir["./fastlane/#{self.config_file_name}"]
-      paths += Dir["./.fastlane/#{self.config_file_name}"]
-      paths += Dir["./#{self.config_file_name}"]
-      paths += Dir["./fastlane_core/spec/fixtures/#{self.config_file_name}"] if Helper.is_test?
-      return if paths.count == 0
+      path = FastlaneCore::Configuration.find_configuration_file_path(config_file_name: config_file_name)
+      return if path.nil?
 
-      path = paths.first
       begin
         configuration_file = ConfigurationFile.new(self, path, block_for_missing, skip_printing_values)
         options = configuration_file.options
@@ -196,6 +191,16 @@ module FastlaneCore
       configuration_file
     end
 
+    def self.find_configuration_file_path(config_file_name: nil)
+      paths = []
+      paths += Dir["./fastlane/#{config_file_name}"]
+      paths += Dir["./.fastlane/#{config_file_name}"]
+      paths += Dir["./#{config_file_name}"]
+      paths += Dir["./fastlane_core/spec/fixtures/#{config_file_name}"] if Helper.is_test?
+      return nil if paths.count == 0
+      return paths.first
+    end
+
     #####################################################
     # @!group Actually using the class
     #####################################################

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -141,7 +141,7 @@ module FastlaneCore
     # @return the full path to the Xcode developer tools of the currently
     #  running system
     def self.xcode_path
-      return "" if self.is_test? and !self.is_mac?
+      return "" unless self.is_mac?
       `xcode-select -p`.delete("\n") + "/"
     end
 

data/fastlane_core/lib/fastlane_core/ios_app_identifier_guesser.rb

@@ -1,5 +1,6 @@
 module FastlaneCore
   class IOSAppIdentifierGuesser
+    APP_ID_REGEX = /var\s*appIdentifier:\s*String\?{0,1}\s*\[?\]?\s*{\s*return\s*\[?\s*"(\s*[a-zA-Z.-]+\s*)"\s*\]?\s*}/
     class << self
       def guess_app_identifier_from_args(args)
         # args example: ["-a", "com.krausefx.app", "--team_id", "5AA97AAHK2"]
@@ -24,7 +25,7 @@ module FastlaneCore
         CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
       end
 
-      def fetch_app_identifier_from_file(file_name)
+      def fetch_app_identifier_from_ruby_file(file_name)
         # we only care about the app_identifier item in the configuration file, so
         # build an options array & Configuration with just that one key and it will
         # be fetched if it is present in the config file
@@ -41,12 +42,52 @@ module FastlaneCore
         nil
       end
 
+      def fetch_app_identifier_from_swift_file(file_name)
+        swift_config_file_path = FastlaneCore::Configuration.find_configuration_file_path(config_file_name: file_name)
+        return nil if swift_config_file_path.nil?
+
+        # Deliverfile.swift, Snapfile.swift, Appfile.swift all look like:
+        #   var appIdentifier: String? { return nil }
+        #   var appIdentifier: String { return "" }
+
+        # Matchfile.swift is the odd one out
+        #   var appIdentifier: [String] { return [] }
+        #
+
+        swift_config_file_path = File.expand_path(swift_config_file_path)
+        swift_config_content = File.read(swift_config_file_path)
+
+        swift_config_content.split("\n").reject(&:empty?).each do |line|
+          application_id = match_swift_application_id(text_line: line)
+          return application_id if application_id
+        end
+        return nil
+      rescue
+        # any option/file error here should just be treated as identifier not found
+        return nil
+      end
+
+      def match_swift_application_id(text_line: nil)
+        text_line.strip!
+        application_id_match = APP_ID_REGEX.match(text_line)
+        return application_id_match[1].strip if application_id_match
+
+        return nil
+      end
+
       def guess_app_identifier_from_config_files
         ["Deliverfile", "Gymfile", "Snapfile", "Matchfile"].each do |current|
-          app_identifier = self.fetch_app_identifier_from_file(current)
+          app_identifier = self.fetch_app_identifier_from_ruby_file(current)
           return app_identifier if app_identifier
         end
-        nil
+
+        # if we're swifty, let's look there
+        # this isn't the same list as above
+        ["Deliverfile.swift", "Snapfile.swift", "Appfile.swift", "Matchfile.swift"].each do |current|
+          app_identifier = self.fetch_app_identifier_from_swift_file(current)
+          return app_identifier if app_identifier
+        end
+        return nil
       end
 
       # make a best-guess for the app_identifier for this project, using most-reliable signals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.71.0.beta.20171219010003
+  version: 2.71.0.beta.20171220010004
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier