fastlane 2.71.0.beta.20171221010003 → 2.71.0.beta.20171222010003

data/fastlane/lib/fastlane/actions/update_project_team.rb

@@ -39,6 +39,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :teamid,
                                        env_name: "FL_PROJECT_TEAM_ID",
                                        description: "The Team ID you want to use",
+                                       code_gen_sensitive: true,
                                        default_value: ENV["TEAM_ID"] || CredentialsManager::AppfileConfig.try_fetch_value(:team_id))
         ]
       end

data/fastlane/lib/fastlane/actions/verify_xcode.rb

@@ -124,6 +124,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :xcode_path,
                                        env_name: "FL_VERIFY_XCODE_XCODE_PATH",
                                        description: "The path to the Xcode installation to test",
+                                       code_gen_sensitive: true,
                                        default_value: File.expand_path('../../', FastlaneCore::Helper.xcode_path),
                                        verify_block: proc do |value|
                                          UI.user_error!("Couldn't find Xcode at path '#{value}'") unless File.exist?(value)

data/fastlane/lib/fastlane/actions/version_bump_podspec.rb

@@ -47,6 +47,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "FL_VERSION_BUMP_PODSPEC_PATH",
                                        description: "You must specify the path to the podspec file to update",
+                                       code_gen_sensitive: true,
                                        default_value: Dir["*.podspec"].last,
                                        verify_block: proc do |value|
                                          UI.user_error!("Please pass a path to the `version_bump_podspec` action") if value.length == 0

data/fastlane/lib/fastlane/actions/version_get_podspec.rb

@@ -25,6 +25,7 @@ module Fastlane
                                        env_name: "FL_VERSION_PODSPEC_PATH",
                                        description: "You must specify the path to the podspec file",
                                        is_string: true,
+                                       code_gen_sensitive: true,
                                        default_value: Dir["*.podspec"].last,
                                        verify_block: proc do |value|
                                          UI.user_error!("Please pass a path to the `version_get_podspec` action") if value.length == 0

data/fastlane/lib/fastlane/actions/xcode_install.rb

@@ -62,6 +62,7 @@ module Fastlane
                                        env_name: "XCODE_INSTALL_TEAM_ID",
                                        description: "The ID of your team if you're in multiple teams",
                                        optional: true,
+                                       code_gen_sensitive: true,
                                        default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_id))
         ]
       end

data/fastlane/lib/fastlane/fast_file.rb

@@ -1,3 +1,5 @@
+require "rubygems/requirement"
+
 module Fastlane
   class FastFile
     # Stores all relevant information from the currently running process
@@ -229,7 +231,7 @@ module Fastlane
     # @param url [String] The git URL to clone the repository from
     # @param branch [String] The branch to checkout in the repository
     # @param path [String] The path to the Fastfile
-    # @param verion [String] Version of the required Fastlane version
+    # @param version [String, Array] Version requirement for repo tags
     def import_from_git(url: nil, branch: 'HEAD', path: 'fastlane/Fastfile', version: nil)
       UI.user_error!("Please pass a path to the `import_from_git` action") if url.to_s.length == 0
 
@@ -251,13 +253,10 @@ module Fastlane
           Actions.sh("GIT_TERMINAL_PROMPT=0 git clone '#{url}' '#{clone_folder}' --depth 1 -n #{branch_option}")
 
           unless version.nil?
-            git_tags = fetch_remote_tags(folder: clone_folder)
-
-            # Separate version from optimistic operator
-            version_number = version(version_string: version)
-            operator = operator(version_string: version)
-
-            checkout_param = checkout_param_for_operator(operator: operator, version: version_number, git_tags: git_tags)
+            req = Gem::Requirement.new(version)
+            all_tags = fetch_remote_tags(folder: clone_folder)
+            checkout_param = all_tags.select { |t| req =~ FastlaneCore::TagVersion.new(t) }.last
+            UI.user_error! "No tag found matching #{version.inspect}" if checkout_param.nil?
           end
 
           Actions.sh("cd '#{clone_folder}' && git checkout #{checkout_param} '#{path}'")
@@ -293,75 +292,10 @@ module Fastlane
       git_tags_string = Actions.sh("cd '#{folder}' && git tag -l")
       git_tags = git_tags_string.split("\n")
 
-      # Delete tags that are not a real version number
-      git_tags.delete_if { |tag| Gem::Version.correct?(tag) != 0 }
-
       # Sort tags based on their version number
-      git_tags.sort_by { |tag| Gem::Version.new(tag) }
-
       return git_tags
-    end
-
-    def checkout_param_for_operator(operator: nil, version: nil, git_tags: nil)
-      # ~> should select the latest version withing constraints.
-      # -> should select a specific version without fallback.
-      if operator == "~>"
-        return checkout_param_twiddle_wakka(version: version, git_tags: git_tags)
-
-      elsif operator == "->" || operator.nil?
-        return checkout_param_specific_version(version: version, git_tags: git_tags)
-
-      else
-        UI.user_error!("The specified operator \"#{operator}\" in \"#{version}\" is unknown. Please use one of these '~> ->'")
-      end
-    end
-
-    def checkout_param_specific_version(version: nil, git_tags: nil)
-      # Search matching version in array
-      matching_git_tags = git_tags.select do |tag|
-        tag == version
-      end
-
-      UI.user_error!("The specified version \"#{version}\" doesn't exist") if matching_git_tags.count == 0
-      return matching_git_tags.last
-    end
-
-    def checkout_param_twiddle_wakka(version: nil, git_tags: nil)
-      # Drop last specified digit in version
-      last_dot_index = version.rindex('.')
-      version_range = version[0..last_dot_index - 1]
-
-      # Search matching version in array
-      matching_git_tags = git_tags.select do |tag|
-        tag.start_with?(version_range)
-      end
-
-      UI.user_error!("No version found within the \"#{version_range}.*\" range") if matching_git_tags.count == 0
-
-      return matching_git_tags.last
-    end
-
-    def operator(version_string: nil)
-      version_info = version_range_info(version_string: version_string)
-
-      # version_info will have 2 elements if an optimistic operator is specified.
-      if version_info.count > 1
-
-        # Optimistic operator is always the first part. e.g.: ["~>", "2.0.0"]
-        return version_info.first
-      end
-
-      return nil
-    end
-
-    def version(version_string: nil)
-      version_info = version_range_info(version_string: version_string)
-      return version_info.last
-    end
-
-    def version_range_info(version_string: nil)
-      # Separate version from optimistic operator
-      return version_string.split(" ")
+             .select { |tag| FastlaneCore::TagVersion.correct?(tag) }
+             .sort_by { |tag| FastlaneCore::TagVersion.new(tag) }
     end
 
     #####################################################

data/fastlane/lib/fastlane/swift_fastlane_api_generator.rb

@@ -233,10 +233,9 @@ func parseInt(fromString: String, function: String = #function) -> Int {
           if ignore_param?(function_name: action_name, param_name: current.key)
             next
           end
-
           keys << current.key.to_s
           key_descriptions << current.description
-          key_default_values << current.default_value
+          key_default_values << current.code_gen_default_value
           key_optionality_values << current.optional
           key_type_overrides << current.data_type
         end

data/fastlane/lib/fastlane/swift_fastlane_function.rb

@@ -23,29 +23,6 @@ module Fastlane
       # class instance?
       @reserved_words = %w[associativity break case catch class continue convenience default deinit didSet do else enum extension fallthrough false final for func get guard if in infix init inout internal lazy let mutating nil operator override postfix precedence prefix private public repeat required return self set static struct subscript super switch throws true try var weak where while willSet].to_set
       # rubocop:enable LineLength
-
-      @default_values_to_ignore = {
-        "cert" => ["keychain_path"].to_set,
-        "get_certificates" => ["keychain_path"].to_set,
-        "set_github_release" => ["api_token"].to_set,
-        "github_api" => ["api_token"].to_set,
-        "create_pull_request" => ["api_token", "head", "api_url"].to_set,
-        "commit_github_file" => ["api_token"].to_set,
-        "verify_xcode" => ["xcode_path"].to_set,
-        "produce" => ["sku"].to_set,
-        "create_app_online" => ["sku"].to_set,
-        "screengrab" => ["android_home"].to_set,
-        "capture_android_screenshots" => ["android_home"].to_set
-      }
-    end
-
-    def ignore_default_value?(function_name: nil, param_name: nil)
-      action_set = @default_values_to_ignore[function_name]
-      unless action_set
-        return false
-      end
-
-      return action_set.include?(param_name)
     end
 
     def sanitize_reserved_word(word: nil)
@@ -106,8 +83,6 @@ module Fastlane
     end
 
     def override_default_value_if_not_correct_type(param_name: nil, param_type: nil, default_value: nil)
-      default_value = nil if ignore_default_value?(function_name: @function_name, param_name: param_name)
-
       return "[]" if param_type == "[String]" && default_value == ""
       return "{_ in }" if param_type == "((String) -> Void)"
 
@@ -124,10 +99,6 @@ module Fastlane
       # if we are optional and don't have a default value, we'll need to use ?
       optional_specifier = "?" if (optional && default_value.nil?) && type != "((String) -> Void)"
 
-      if optional && ignore_default_value?(function_name: @function_name, param_name: param)
-        optional_specifier = "?"
-      end
-
       # If we have a default value of true or false, we can infer it is a Bool
       if default_value.class == FalseClass
         type = "Bool"
@@ -284,9 +255,6 @@ module Fastlane
 
       swift_implementations = @param_names.zip(param_default_values, param_optionality_values, param_type_overrides).map do |param, default_value, optional, param_type_override|
         type = get_type(param: param, default_value: default_value, optional: optional, param_type_override: param_type_override)
-
-        default_value = nil if ignore_default_value?(function_name: @function_name, param_name: param)
-
         param = camel_case_lower(string: param)
         param = sanitize_reserved_word(word: param)
         var_for_parameter_name = param

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.71.0.beta.20171221010003'.freeze
+  VERSION = '2.71.0.beta.20171222010003'.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/Deliverfile.swift

@@ -11,4 +11,4 @@ class Deliverfile: DeliverfileProtocol {
 
 
 
-// Generated with fastlane 2.70.1
+// Generated with fastlane 2.70.3

data/fastlane/swift/Fastlane.swift

@@ -641,7 +641,7 @@ func bundleInstall(binstubs: String? = nil,
                                                                                                 RubyCommand.Argument(name: "with", value: with)])
   _ = runner.executeCommand(command)
 }
-func captureAndroidScreenshots(androidHome: String?,
+func captureAndroidScreenshots(androidHome: String? = nil,
                                buildToolsVersion: String? = nil,
                                locales: [String] = ["en-US"],
                                clearPreviousScreenshots: Bool = false,
@@ -1103,9 +1103,9 @@ func createPullRequest(apiToken: String,
                        repo: String,
                        title: String,
                        body: String? = nil,
-                       head: String?,
+                       head: String? = nil,
                        base: String = "master",
-                       apiUrl: String?) {
+                       apiUrl: String = "https://api.github.com") {
   let command = RubyCommand(commandID: "", methodName: "create_pull_request", className: nil, args: [RubyCommand.Argument(name: "api_token", value: apiToken),
                                                                                                      RubyCommand.Argument(name: "repo", value: repo),
                                                                                                      RubyCommand.Argument(name: "title", value: title),
@@ -1494,7 +1494,7 @@ func getPushCertificate(development: Bool = false,
                         username: String,
                         teamId: String? = nil,
                         teamName: String? = nil,
-                        p12Password: String = "",
+                        p12Password: String,
                         pemName: String? = nil,
                         outputPath: String = ".",
                         newProfile: String? = nil) {
@@ -1513,13 +1513,13 @@ func getPushCertificate(development: Bool = false,
                                                                                                       RubyCommand.Argument(name: "new_profile", value: newProfile)])
   _ = runner.executeCommand(command)
 }
-func getVersionNumber(xcodeproj: String? = nil,
-                      scheme: String? = nil,
-                      target: String? = nil) {
+@discardableResult func getVersionNumber(xcodeproj: String? = nil,
+                                         scheme: String? = nil,
+                                         target: String? = nil) -> String {
   let command = RubyCommand(commandID: "", methodName: "get_version_number", className: nil, args: [RubyCommand.Argument(name: "xcodeproj", value: xcodeproj),
                                                                                                     RubyCommand.Argument(name: "scheme", value: scheme),
                                                                                                     RubyCommand.Argument(name: "target", value: target)])
-  _ = runner.executeCommand(command)
+  return runner.executeCommand(command)
 }
 func gitAdd(path: String? = nil,
             pathspec: String? = nil) {
@@ -1803,7 +1803,7 @@ func importCertificate(keychainName: String,
                        keychainPath: String? = nil,
                        keychainPassword: String? = nil,
                        certificatePath: String,
-                       certificatePassword: String = "",
+                       certificatePassword: String? = nil,
                        logOutput: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "import_certificate", className: nil, args: [RubyCommand.Argument(name: "keychain_name", value: keychainName),
                                                                                                     RubyCommand.Argument(name: "keychain_path", value: keychainPath),
@@ -2154,7 +2154,7 @@ func pem(development: Bool = false,
          username: String,
          teamId: String? = nil,
          teamName: String? = nil,
-         p12Password: String = "",
+         p12Password: String,
          pemName: String? = nil,
          outputPath: String = ".",
          newProfile: String? = nil) {
@@ -2778,7 +2778,7 @@ func setupJenkins(force: Bool = false,
                   addKeychainToSearchList: String = "replace",
                   setDefaultKeychain: Bool = true,
                   keychainPath: String? = nil,
-                  keychainPassword: String = "",
+                  keychainPassword: String,
                   setCodeSigningIdentity: Bool = true,
                   codeSigningIdentity: String? = nil,
                   outputDirectory: String = "./output",
@@ -3661,7 +3661,7 @@ func xcexport() {
                                              botName: String,
                                              integrationNumber: String? = nil,
                                              username: String = "",
-                                             password: String = "",
+                                             password: String? = nil,
                                              targetFolder: String = "./xcs_assets",
                                              keepAllAssets: Bool = false,
                                              trustSelfSignedCerts: Bool = true) -> [String] {

data/fastlane/swift/Gymfile.swift

@@ -11,4 +11,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.70.1
+// Generated with fastlane 2.70.3

data/fastlane/swift/Matchfile.swift

@@ -11,4 +11,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.70.1
+// Generated with fastlane 2.70.3

data/fastlane/swift/Precheckfile.swift

@@ -11,4 +11,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.70.1
+// Generated with fastlane 2.70.3

data/fastlane/swift/Scanfile.swift

@@ -11,4 +11,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.70.1
+// Generated with fastlane 2.70.3

data/fastlane/swift/Screengrabfile.swift

@@ -11,4 +11,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.70.1
+// Generated with fastlane 2.70.3

data/fastlane/swift/Snapshotfile.swift

@@ -11,4 +11,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.70.1
+// Generated with fastlane 2.70.3

data/fastlane_core/lib/fastlane_core.rb

@@ -46,6 +46,7 @@ require 'fastlane_core/analytics/action_launch_context'
 require 'fastlane_core/analytics/analytics_event_builder'
 require 'fastlane_core/analytics/analytics_ingester_client'
 require 'fastlane_core/analytics/analytics_session'
+require 'fastlane_core/tag_version'
 
 # Third Party code
 require 'colored'

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

@@ -15,6 +15,13 @@ module FastlaneCore
     # the value which is used if there was no given values and no environment values
     attr_accessor :default_value
 
+    # the value which is used during Swift code generation
+    #   if the default_value reads from ENV or a file, or from local credentials, we need
+    #   to provide a different default or it might be included in our autogenerated Swift
+    #   as a built-in default for the fastlane gem. This is because when we generate the
+    #   Swift API at deployment time, it fetches the default_value from the config_items
+    attr_accessor :code_gen_default_value
+
     # An optional block which is called when a new value is set.
     #   Check value is valid. This could be type checks or if a folder/file exists
     #   You have to raise a specific exception if something goes wrong. Append .red after the string
@@ -36,8 +43,15 @@ module FastlaneCore
     attr_accessor :deprecated
 
     # [Boolean] Set if the variable is sensitive, such as a password or API token, to prevent echoing when prompted for the parameter
+    # If a default value exists, it won't be used during code generation as default values can read from environment variables.
     attr_accessor :sensitive
 
+    # [Boolean] Set if the default value should never be used during code generation for Swift
+    #   We generate the Swift API at deployment time, and if there is a value that should never be
+    #   included in the Fastlane.swift or other autogenerated classes, we need to strip it out.
+    #   This includes things like API keys that could be read from ENV[]
+    attr_accessor :code_gen_sensitive
+
     # [Boolean] Set if the variable is to be converted to a shell-escaped String when provided as a Hash or Array
     # Allows items expected to be strings used in shell arguments to be alternatively provided as a Hash or Array for better readability and auto-escaped for us.
     attr_accessor :allow_shell_conversion
@@ -77,6 +91,8 @@ module FastlaneCore
                    conflict_block: nil,
                    deprecated: nil,
                    sensitive: nil,
+                   code_gen_sensitive: false,
+                   code_gen_default_value: nil,
                    display_in_shell: true)
       UI.user_error!("key must be a symbol") unless key.kind_of? Symbol
       UI.user_error!("env_name must be a String") unless (env_name || '').kind_of? String
@@ -121,9 +137,24 @@ module FastlaneCore
       @conflict_block = conflict_block
       @deprecated = deprecated
       @sensitive = sensitive
+      @code_gen_sensitive = code_gen_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
+
+      @code_gen_default_value = code_gen_default_value
+
+      update_code_gen_default_value_if_able!
+    end
+
+    # if code_gen_default_value is nil, use the default value if it isn't a `code_gen_sensitive` value
+    def update_code_gen_default_value_if_able!
+      if @code_gen_default_value.nil?
+        unless @code_gen_sensitive
+
+          @code_gen_default_value = @default_value
+        end
+      end
     end
 
     def verify!(value)

data/fastlane_core/lib/fastlane_core/tag_version.rb

@@ -0,0 +1,24 @@
+require "rubygems/version"
+
+module FastlaneCore
+  # Utility class to construct a Gem::Version from a tag.
+  # Accepts vX.Y.Z and X.Y.Z.
+  class TagVersion < Gem::Version
+    class << self
+      def correct?(tag)
+        superclass.correct?(version_number_from_tag(tag))
+      end
+
+      # Gem::Version.new barfs on things like "v0.1.0", which is the style
+      # generated by the rake release task. Just strip off any initial v
+      # to generate a Gem::Version from a tag.
+      def version_number_from_tag(tag)
+        tag.sub(/^v/, "")
+      end
+    end
+
+    def initialize(tag)
+      super(self.class.version_number_from_tag(tag))
+    end
+  end
+end