fastlane 2.69.0.beta.20171212010004 → 2.69.0

data/fastlane/lib/fastlane/tools.rb

@@ -17,4 +17,17 @@ module Fastlane
     :gym,
     :precheck
   ]
+
+  # a list of all the config files we currently expect
+  TOOL_CONFIG_FILES = [
+    "Appfile",
+    "Deliverfile",
+    "Fastfile",
+    "Gymfile",
+    "Matchfile",
+    "Precheckfile",
+    "Scanfile",
+    "Screengrabfile",
+    "Snapshotfile"
+  ]
 end

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.69.0.beta.20171212010004'.freeze
+  VERSION = '2.69.0'.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_core/lib/fastlane_core.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'fastlane/version'
+require 'fastlane/boolean'
 
 require 'fastlane_core/globals'
 # Ruby monkey-patches - should be before almost all else
@@ -53,6 +54,8 @@ require 'commander'
 # after commander import
 require 'fastlane_core/ui/fastlane_runner' # monkey patch
 
+Boolean = Fastlane::Boolean
+
 module FastlaneCore
   ROOT = Pathname.new(File.expand_path('../..', __FILE__))
 

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

@@ -7,19 +7,22 @@ module FastlaneCore
     attr_accessor :action_name
     attr_accessor :p_hash
     attr_accessor :platform
+    attr_accessor :configuration_language # example: ruby fastfile, swift fastfile
 
-    def initialize(action_name: nil, p_hash: UNKNOWN_P_HASH, platform: nil)
+    def initialize(action_name: nil, p_hash: UNKNOWN_P_HASH, platform: nil, configuration_language: nil)
       @action_name = action_name
       @p_hash = p_hash
       @platform = platform
+      @configuration_language = configuration_language
     end
 
-    def self.context_for_action_name(action_name, args: nil)
+    def self.context_for_action_name(action_name, configuration_language: "ruby", args: nil)
       app_id_guesser = FastlaneCore::AppIdentifierGuesser.new(args: args)
       return self.new(
         action_name: action_name,
         p_hash: app_id_guesser.p_hash,
-        platform: app_id_guesser.platform
+        platform: app_id_guesser.platform,
+        configuration_language: configuration_language
       )
     end
 

data/fastlane_core/lib/fastlane_core/analytics/analytics_session.rb

@@ -54,6 +54,13 @@ module FastlaneCore
         }
       )
 
+      @events << builder.launched_event(
+        primary_target_hash: {
+          name: 'configuration_language',
+          detail: launch_context.configuration_language
+        }
+      )
+
       @events << builder.launched_event(
         primary_target_hash: {
           name: 'install_method',

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

@@ -21,6 +21,19 @@ module FastlaneCore
 
         type = option.data_type
 
+        # We added type: Hash to code generation, but Ruby's OptionParser doesn't like that
+        # so we need to switch that to something that is supported, luckily, we have an `is_string`
+        # property and if that is false, we'll default to nil
+        if type == Hash
+          type = option.is_string ? String : nil
+        end
+
+        # Boolean is a fastlane thing, it's either TrueClass, or FalseClass, but we won't know
+        # that until runtime, so nil is the best we get
+        if type == Boolean
+          type = nil
+        end
+
         # This is an important bit of trickery to solve the boolean option situation.
         #
         # Typically, boolean command line flags do not accept trailing values. If the flag

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

@@ -67,6 +67,7 @@ module FastlaneCore
                    verify_block: nil,
                    is_string: true,
                    type: nil,
+                   skip_type_validation: false,
                    optional: nil,
                    conflicting_options: nil,
                    conflict_block: nil,
@@ -118,20 +119,45 @@ module FastlaneCore
       @sensitive = sensitive
       @allow_shell_conversion = (type == :shell_string)
       @display_in_shell = display_in_shell
+      @skip_type_validation = skip_type_validation # sometimes we allow multiple types which causes type validation failures, e.g.: export_options in gym
     end
 
     def verify!(value)
       valid?(value)
     end
 
+    def ensure_generic_type_passes_validation(value)
+      if @skip_type_validation
+        return
+      end
+
+      if data_type != :string_callback && data_type && !value.kind_of?(data_type)
+        UI.user_error!("'#{self.key}' value must be a #{data_type}! Found #{value.class} instead.")
+      end
+    end
+
+    def ensure_boolean_type_passes_validation(value)
+      if @skip_type_validation
+        return
+      end
+
+      # We need to explicity test against Fastlane::Boolean, TrueClass/FalseClass
+      if value.class != FalseClass && value.class != TrueClass
+        UI.user_error!("'#{self.key}' value must be either `true` or `false`! Found #{value.class} instead.")
+      end
+    end
+
     # Make sure, the value is valid (based on the verify block)
     # Raises an exception if the value is invalid
     def valid?(value)
       # we also allow nil values, which do not have to be verified.
       if value
         # Verify that value is the type that we're expecting, if we are expecting a type
-        if data_type && !value.kind_of?(data_type)
-          UI.user_error!("'#{self.key}' value must be a #{data_type}! Found #{value.class} instead.")
+
+        if data_type == Boolean
+          ensure_boolean_type_passes_validation(value)
+        else
+          ensure_generic_type_passes_validation(value)
         end
 
         if @verify_block
@@ -189,6 +215,11 @@ module FastlaneCore
       data_type == String
     end
 
+    # it's preferred to use self.string? In most cases, except in commander_generator.rb, cause... reasons
+    def is_string
+      return @is_string
+    end
+
     def to_s
       [@key, @description].join(": ")
     end

data/fastlane_core/lib/fastlane_core/fastlane_folder.rb

@@ -6,15 +6,47 @@ module FastlaneCore
     def self.path
       value ||= "./#{FOLDER_NAME}/" if File.directory?("./#{FOLDER_NAME}/")
       value ||= "./.#{FOLDER_NAME}/" if File.directory?("./.#{FOLDER_NAME}/") # hidden folder
+      value ||= "./" if File.basename(Dir.getwd) == FOLDER_NAME && File.exist?('Fastfile.swift') # inside the folder
+      value ||= "./" if File.basename(Dir.getwd) == ".#{FOLDER_NAME}" && File.exist?('Fastfile.swift') # inside the folder and hidden
       value ||= "./" if File.basename(Dir.getwd) == FOLDER_NAME && File.exist?('Fastfile') # inside the folder
       value ||= "./" if File.basename(Dir.getwd) == ".#{FOLDER_NAME}" && File.exist?('Fastfile') # inside the folder and hidden
       return value
     end
 
+    # path to the Swift runner executable if it has been built
+    def self.swift_runner_path
+      return File.join(self.path, 'FastlaneRunner')
+    end
+
+    def self.swift?
+      return self.fastfile_path.downcase.end_with?(".swift")
+    end
+
+    def self.swift_folder_path
+      return File.join(self.path, 'swift')
+    end
+
+    def self.swift_runner_project_path
+      return File.join(self.swift_folder_path, 'FastlaneSwiftRunner', 'FastlaneSwiftRunner.xcodeproj')
+    end
+
+    def self.swift_runner_built?
+      swift_runner_path = self.swift_runner_path
+      if swift_runner_path.nil?
+        return false
+      end
+
+      return File.exist?(swift_runner_path)
+    end
+
     # Path to the Fastfile inside the fastlane folder. This is nil when none is available
     def self.fastfile_path
       return nil if self.path.nil?
 
+      # Check for Swift first, because Swift is #1
+      path = File.join(self.path, 'Fastfile.swift')
+      return path if File.exist?(path)
+
       path = File.join(self.path, 'Fastfile')
       return path if File.exist?(path)
       return nil

data/gym/lib/assets/GymfileTemplate.swift

@@ -0,0 +1,13 @@
+// For more information about this configuration visit
+// https://docs.fastlane.tools/actions/gym/#gymfile
+
+// In general, you can use the options available
+// fastlane gym --help
+
+// Remove the // in front of the line to enable the option
+
+class Gymfile: GymfileProtocol {
+  //var sdk: String { return "iphoneos9.0" }
+  //var scheme: String { return "Example" }
+  var outputDirectory: String { return "./" }
+}

data/gym/lib/gym/commands_generator.rb

@@ -45,11 +45,23 @@ module Gym
       command :init do |c|
         c.syntax = "fastlane gym init"
         c.description = "Creates a new Gymfile for you"
-        c.action do |_args, options|
+        c.action do |args, options|
           containing = FastlaneCore::Helper.fastlane_enabled_folder_path
           path = File.join(containing, Gym.gymfile_name)
           UI.user_error! "Gymfile already exists" if File.exist?(path)
-          template = File.read("#{Gym::ROOT}/lib/assets/GymfileTemplate")
+
+          is_swift_fastfile = args.include?("swift")
+          if is_swift_fastfile
+            path = File.join(containing, Gym.gymfile_name + ".swift")
+            UI.user_error! "Gymfile.swift already exists" if File.exist?(path)
+          end
+
+          if is_swift_fastfile
+            template = File.read("#{Gym::ROOT}/lib/assets/GymfileTemplate.swift")
+          else
+            template = File.read("#{Gym::ROOT}/lib/assets/GymfileTemplate")
+          end
+
           File.write(path, template)
           UI.success "Successfully created '#{path}'. Open the file using a code editor."
         end

data/gym/lib/gym/generators/build_command_generator.rb

@@ -37,7 +37,7 @@ module Gym
         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.shellescape}"
+        options << "-archivePath #{archive_path.shellescape}" unless config[:skip_archive]
         options << "-derivedDataPath '#{config[:derived_data_path]}'" if config[:derived_data_path]
         options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
         options << config[:xcargs] if config[:xcargs]
@@ -51,7 +51,7 @@ module Gym
 
         actions = []
         actions << :clean if config[:clean]
-        actions << :archive
+        actions << :archive unless config[:skip_archive]
 
         actions
       end

data/gym/lib/gym/options.rb

@@ -92,12 +92,14 @@ module Gym
                                      env_name: "GYM_INCLUDE_SYMBOLS",
                                      description: "Should the ipa file include symbols?",
                                      is_string: false,
+                                     type: Boolean,
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :include_bitcode,
                                      short_option: "-z",
                                      env_name: "GYM_INCLUDE_BITCODE",
                                      description: "Should the ipa file include bitcode?",
                                      is_string: false,
+                                     type: Boolean,
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :export_method,
                                      short_option: "-j",
@@ -114,6 +116,8 @@ module Gym
                                      description: "Specifies path to export options plist. Use 'xcodebuild -help' to print the full set of available options",
                                      is_string: false,
                                      optional: true,
+                                     type: Hash,
+                                     skip_type_validation: true,
                                      conflict_block: proc do |value|
                                        UI.user_error!("'#{value.key}' must be false to use 'export_options'")
                                      end),
@@ -129,6 +133,13 @@ module Gym
                                      env_name: "GYM_SKIP_BUILD_ARCHIVE",
                                      description: "Export ipa from previously built xarchive. Uses archive_path as source",
                                      is_string: false,
+                                     type: Boolean,
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :skip_archive,
+                                     env_name: "GYM_SKIP_ARCHIVE",
+                                     description: "After building, don't archive, effectively not including -archivePath param",
+                                     is_string: false,
+                                     type: Boolean,
                                      optional: true),
         # Very optional
         FastlaneCore::ConfigItem.new(key: :build_path,

data/match/lib/assets/MatchfileTemplate.swift

@@ -0,0 +1,9 @@
+class Matchfile: MatchfileProtocol {
+    var gitUrl: String { return "[[GIT_URL]]" }
+    var type: String { return "development" } // The default type, can be: appstore, adhoc, enterprise or development
+    // var appIdentifier: [String] { return ["tools.fastlane.app", "tools.fastlane.app2"] }
+		// cat username:String { return "user@fastlane.tools" } // Your Apple Developer Portal username
+}
+
+// For all available options run `fastlane match --help`
+// Remove the // in the beginning of the line to enable the other options

data/match/lib/match/commands_generator.rb

@@ -62,14 +62,20 @@ module Match
         c.description = 'Create the Matchfile for you'
         c.action do |args, options|
           containing = FastlaneCore::Helper.fastlane_enabled_folder_path
-          path = File.join(containing, "Matchfile")
+          is_swift_fastfile = args.include?("swift")
+
+          if is_swift_fastfile
+            path = File.join(containing, "Matchfile.swift")
+          else
+            path = File.join(containing, "Matchfile")
+          end
 
           if File.exist?(path)
-            FastlaneCore::UI.user_error!("You already got a Matchfile in this directory")
+            FastlaneCore::UI.user_error!("You already have a Matchfile in this directory (#{path})")
             return 0
           end
 
-          Match::Setup.new.run(path)
+          Match::Setup.new.run(path, is_swift_fastfile: is_swift_fastfile)
         end
       end
 

data/match/lib/match/options.rb

@@ -33,6 +33,7 @@ module Match
                                      env_name: "MATCH_APP_IDENTIFIER",
                                      description: "The bundle identifier(s) of your app (comma-separated)",
                                      is_string: false,
+                                     type: Array,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)),
         FastlaneCore::ConfigItem.new(key: :username,
                                      short_option: "-u",

data/match/lib/match/setup.rb

@@ -1,7 +1,11 @@
 module Match
   class Setup
-    def run(path)
-      template = File.read("#{Match::ROOT}/lib/assets/MatchfileTemplate")
+    def run(path, is_swift_fastfile: false)
+      if is_swift_fastfile
+        template = File.read("#{Match::ROOT}/lib/assets/MatchfileTemplate.swift")
+      else
+        template = File.read("#{Match::ROOT}/lib/assets/MatchfileTemplate")
+      end
 
       UI.important "Please create a new, private git repository"
       UI.important "to store the certificates and profiles there"

data/precheck/lib/assets/PrecheckfileTemplate

@@ -13,7 +13,7 @@
 # :warn
 # when triggered, this rule will warn you of a potential problem
 
-# :fail
+# :error
 # when triggered, this rule will cause an error to be displayed and it will prevent any further fastlane commands from running after precheck finishes
 
 # Examples:

data/precheck/lib/assets/PrecheckfileTemplate.swift

@@ -0,0 +1,19 @@
+// For more information about this configuration visit
+// https://docs.fastlane.tools/actions/precheck/#precheckfile
+
+// In general, you can use the options available
+// fastlane precheck --help
+
+class Precheckfile: PrecheckfileProtocol {
+    //var defaultRuleLevel: String { return "error" }
+}
+
+// You have three possible values for defaultRuleLevel
+// "skip"
+// indicates that your metadata will not be checked by this rule
+
+// "warn"
+// when triggered, this rule will warn you of a potential problem
+
+// "error"
+// when triggered, this rule will cause an error to be displayed and it will prevent any further fastlane commands from running after precheck finishes

data/precheck/lib/precheck/commands_generator.rb

@@ -38,11 +38,22 @@ module Precheck
       command :init do |c|
         c.syntax = "fastlane precheck init"
         c.description = "Creates a new Precheckfile for you"
-        c.action do |_args, options|
+        c.action do |args, options|
           containing = FastlaneCore::Helper.fastlane_enabled_folder_path
           path = File.join(containing, Precheck.precheckfile_name)
           UI.user_error! "Precheckfile already exists" if File.exist?(path)
-          template = File.read("#{Precheck::ROOT}/lib/assets/PrecheckfileTemplate")
+
+          is_swift_fastfile = args.include?("swift")
+          if is_swift_fastfile
+            path = File.join(containing, Precheck.precheckfile_name + ".swift")
+            UI.user_error! "Precheckfile.swift already exists" if File.exist?(path)
+          end
+
+          if is_swift_fastfile
+            template = File.read("#{Precheck::ROOT}/lib/assets/PrecheckfileTemplate.swift")
+          else
+            template = File.read("#{Precheck::ROOT}/lib/assets/PrecheckfileTemplate")
+          end
           File.write(path, template)
           UI.success "Successfully created '#{path}'. Open the file using a code editor."
         end

data/scan/lib/assets/ScanfileTemplate.swift

@@ -0,0 +1,13 @@
+// For more information about this configuration visit
+// https://docs.fastlane.tools/actions/scan/#scanfile
+
+// In general, you can use the options available
+// fastlane scan --help
+
+// Remove the // in front of the line to enable the option
+
+class Scanfile: ScanfileProtocol {
+    //var scheme: String? { return "Example" }
+    //var openReport: Bool { return true }
+    //var clean: Bool { return true }
+}