fastlane 2.60.0.beta.20171002010004 → 2.60.0.beta.20171003010003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00cc61a0fde36d402aff41fe7755076cbc6c1609
-  data.tar.gz: ec991523fe16c9c650eccb5f6abb0a9567593260
+  metadata.gz: 790b0387d44023f9553c452fb1882209294de7bc
+  data.tar.gz: 68cda47f53a256bd990be4bc2331e889075ef759
 SHA512:
-  metadata.gz: 72db96cea2ded8d230d36702e41a69e1698a80db3dbe72129e207f237a44e7f2bf3c1afb7b7bd147d96ec1605a83a59e6aefa2d6255714e0b13ed468e48771c3
-  data.tar.gz: 852ccbd46a9a2043952e1b8b0c0a80739405fbd18eda77732d5fb67fa49ce2d6a3d9ad167666c59ed02fe92d81e9af76e346d7d1476539c66ae1791d5bf703a9
+  metadata.gz: feb072975461efd0c496e94315bcbbe6f4d393c7c039b1f991aee7dc0dfb2dd600f149983ee4c920b9614bc299001eba578f54882c87ce7b3ddd93f2b25867ba
+  data.tar.gz: 66b232a7b6622ddc05bf3f2145a49fa6f332766eb93a47712b0ded475596b5101bd30db73bfd1b5d676b8bdccc8dc9e9dfc1d83303b84c3534f20791bf5688b3

data/fastlane/lib/assets/DefaultFastfileTemplate

@@ -1,5 +1,5 @@
 # Customise this file, documentation can be found here:
-# https://github.com/fastlane/fastlane/tree/master/fastlane/docs
+# https://docs.fastlane.tools/actions/
 # All available actions: https://docs.fastlane.tools/actions
 # can also be listed using the `fastlane actions` command
 

data/fastlane/lib/assets/FastfileTemplateAndroid

@@ -1,5 +1,5 @@
 # Customise this file, documentation can be found here:
-# https://github.com/fastlane/fastlane/tree/master/fastlane/docs
+# https://docs.fastlane.tools/actions/
 # All available actions: https://docs.fastlane.tools/actions
 # can also be listed using the `fastlane actions` command
 

data/fastlane/lib/fastlane/lane.rb

@@ -85,7 +85,7 @@ module Fastlane
       def ensure_name_not_conflicts(name)
         # First, check if there is a predefined method in the actions folder
         return unless Actions.action_class_ref(name)
-        UI.error("Name of the lane '#{name}' is already taken by the action named '#{name}'")
+        UI.important("Name of the lane '#{name}' is already taken by the action named '#{name}'")
       end
     end
   end

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.60.0.beta.20171002010004'.freeze
+  VERSION = '2.60.0.beta.20171003010003'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
 end

data/fastlane_core/lib/fastlane_core/android_package_name_guesser.rb

@@ -0,0 +1,74 @@
+module FastlaneCore
+  class AndroidPackageNameGuesser
+    class << self
+      def android_package_name_arg?(gem_name, arg)
+        return arg == "--package_name" ||
+               arg == "--app_package_name" ||
+               (arg == '-p' && gem_name == 'supply') ||
+               (arg == '-a' && gem_name == 'screengrab')
+      end
+
+      def guess_package_name_from_args(gem_name, args)
+        # args example: ["-a", "com.krausefx.app"]
+        package_name = nil
+        args.each_with_index do |current, index|
+          next unless android_package_name_arg?(gem_name, current)
+          # argument names are followed by argument values in the args array;
+          # use [index + 1] to find the package name (range check the array
+          # to avoid array bounds errors)
+          package_name = args[index + 1] if args.count > index
+          break
+        end
+        package_name
+      end
+
+      def guess_package_name_from_environment
+        package_name = nil
+        package_name ||= ENV["SUPPLY_PACKAGE_NAME"] if FastlaneCore::Env.truthy?("SUPPLY_PACKAGE_NAME")
+        package_name ||= ENV["SCREENGRAB_APP_PACKAGE_NAME"] if FastlaneCore::Env.truthy?("SCREENGRAB_APP_PACKAGE_NAME")
+        package_name
+      end
+
+      def guess_package_name_from_appfile
+        CredentialsManager::AppfileConfig.try_fetch_value(:package_name)
+      end
+
+      def fetch_package_name_from_file(file_name, package_name_key)
+        # we only care about the package name 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
+        genericfile_options = [FastlaneCore::ConfigItem.new(key: package_name_key)]
+        options = FastlaneCore::Configuration.create(genericfile_options, {})
+        # pass the empty proc to disable options validation, otherwise this will fail
+        # when the other (non-package name) keys are encountered in the config file;
+        # 3rd parameter "true" disables the printout of the contents of the
+        # configuration file, which is noisy and confusing in this case
+        options.load_configuration_file(file_name, proc {}, true)
+        return options.fetch(package_name_key, ask: false)
+      rescue
+        # any option/file error here should just be treated as identifier not found
+        nil
+      end
+
+      def guess_package_name_from_config_files
+        package_name = nil
+        package_name ||= fetch_package_name_from_file("Supplyfile", :package_name)
+        package_name ||= fetch_package_name_from_file("Screengrabfile", :app_package_name)
+        package_name
+      end
+
+      # make a best-guess for the package_name for this project, using most-reliable signals
+      #  first and then using less accurate ones afterwards; because this method only returns
+      #  a GUESS for the package_name, it is only useful for metrics or other places where
+      #  absolute accuracy is not required
+      def guess_package_name(gem_name, args)
+        package_name = nil
+        package_name ||= guess_package_name_from_args(gem_name, args)
+        package_name ||= guess_package_name_from_environment
+        package_name ||= guess_package_name_from_appfile
+        package_name ||= guess_package_name_from_config_files
+        package_name
+      end
+    end
+  end
+end

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

@@ -158,7 +158,7 @@ module FastlaneCore
     # @param config_file_name [String] The name of the configuration file to use (optional)
     # @param block_for_missing [Block] A ruby block that is called when there is an unknown method
     #   in the configuration file
-    def load_configuration_file(config_file_name = nil, block_for_missing = nil)
+    def load_configuration_file(config_file_name = nil, block_for_missing = nil, skip_printing_values = false)
       return unless config_file_name
 
       self.config_file_name = config_file_name
@@ -171,7 +171,7 @@ module FastlaneCore
       return if paths.count == 0
 
       path = paths.first
-      configuration_file = ConfigurationFile.new(self, path, block_for_missing)
+      configuration_file = ConfigurationFile.new(self, path, block_for_missing, skip_printing_values)
       verify_conflicts # important, since user can set conflicting options in configuration file
       configuration_file
     end

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

@@ -9,7 +9,7 @@ module FastlaneCore
 
     # @param config [FastlaneCore::Configuration] is stored to save the resulting values
     # @param path [String] The path to the configuration file to use
-    def initialize(config, path, block_for_missing)
+    def initialize(config, path, block_for_missing, skip_printing_values = false)
       self.config = config
       self.configfile_path = path
 
@@ -29,7 +29,7 @@ module FastlaneCore
         eval(content) # this is okay in this case
         # rubocop:enable Security/Eval
 
-        print_resulting_config_values # only on success
+        print_resulting_config_values unless skip_printing_values # only on success
       rescue SyntaxError => ex
         line = ex.to_s.match(/\(eval\):(\d+)/)[1]
         UI.user_error!("Syntax error in your configuration file '#{path}' on line #{line}: #{ex}")

data/fastlane_core/lib/fastlane_core/ios_app_identifier_guesser.rb

@@ -0,0 +1,66 @@
+module FastlaneCore
+  class IOSAppIdentifierGuesser
+    class << self
+      def guess_app_identifier_from_args(args)
+        # args example: ["-a", "com.krausefx.app", "--team_id", "5AA97AAHK2"]
+        args.each_with_index do |current, index|
+          next unless current == "-a" || current == "--app_identifier"
+          # argument names are followed by argument values in the args array;
+          # use [index + 1] to find the package name (range check the array
+          # to avoid array bounds errors)
+          return args[index + 1] if args.count > index
+        end
+        nil
+      end
+
+      def guess_app_identifier_from_environment
+        ["FASTLANE", "DELIVER", "PILOT", "PRODUCE", "PEM", "SIGH", "SNAPSHOT", "MATCH"].each do |current|
+          return ENV["#{current}_APP_IDENTIFIER"] if FastlaneCore::Env.truthy?("#{current}_APP_IDENTIFIER")
+        end
+        nil
+      end
+
+      def guess_app_identifier_from_appfile
+        CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
+      end
+
+      def fetch_app_identifier_from_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
+        genericfile_options = [FastlaneCore::ConfigItem.new(key: :app_identifier)]
+        options = FastlaneCore::Configuration.create(genericfile_options, {})
+        # pass the empty proc to disable options validation, otherwise this will fail
+        # when the other (non-app_identifier) keys are encountered in the config file;
+        # 3rd parameter "true" disables the printout of the contents of the
+        # configuration file, which is noisy and confusing in this case
+        options.load_configuration_file(file_name, proc {}, true)
+        return options.fetch(:app_identifier, ask: false)
+      rescue
+        # any option/file error here should just be treated as identifier not found
+        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)
+          return app_identifier if app_identifier
+        end
+        nil
+      end
+
+      # make a best-guess for the app_identifier for this project, using most-reliable signals
+      #  first and then using less accurate ones afterwards; because this method only returns
+      #  a GUESS for the app_identifier, it is only useful for metrics or other places where
+      #  absolute accuracy is not required
+      def guess_app_identifier(args)
+        app_identifier = nil
+        app_identifier ||= guess_app_identifier_from_args(args)
+        app_identifier ||= guess_app_identifier_from_environment
+        app_identifier ||= guess_app_identifier_from_appfile
+        app_identifier ||= guess_app_identifier_from_config_files
+        app_identifier
+      end
+    end
+  end
+end

data/fastlane_core/lib/fastlane_core/update_checker/update_checker.rb

@@ -2,6 +2,8 @@ require 'excon'
 require 'digest'
 
 require 'fastlane_core/update_checker/changelog'
+require 'fastlane_core/ios_app_identifier_guesser'
+require 'fastlane_core/android_package_name_guesser'
 
 module FastlaneCore
   # Verifies, the user runs the latest version of this gem
@@ -121,18 +123,7 @@ module FastlaneCore
 
     # (optional) Returns the app identifier for the current tool
     def self.ios_app_identifier(args)
-      # args example: ["-a", "com.krausefx.app", "--team_id", "5AA97AAHK2"]
-      args.each_with_index do |current, index|
-        if current == "-a" || current == "--app_identifier"
-          return args[index + 1] if args.count > index
-        end
-      end
-
-      ["FASTLANE", "DELIVER", "PILOT", "PRODUCE", "PEM", "SIGH", "SNAPSHOT", "MATCH"].each do |current|
-        return ENV["#{current}_APP_IDENTIFIER"] if FastlaneCore::Env.truthy?("#{current}_APP_IDENTIFIER")
-      end
-
-      return CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
+      return FastlaneCore::IOSAppIdentifierGuesser.guess_app_identifier(args)
     rescue
       nil # we don't want this method to cause a crash
     end
@@ -143,18 +134,7 @@ module FastlaneCore
     #   fastlane supply --skip_upload_screenshots -a beta -p com.test.app should return com.test.app
     #   screengrab -a com.test.app should return com.test.app
     def self.android_app_identifier(args, gem_name)
-      app_identifier = nil
-      # args example: ["-a", "com.krausefx.app"]
-      args.each_with_index do |current, index|
-        if android_app_identifier_arg?(gem_name, current)
-          app_identifier = args[index + 1] if args.count > index
-          break
-        end
-      end
-
-      app_identifier ||= ENV["SUPPLY_PACKAGE_NAME"] if FastlaneCore::Env.truthy?("SUPPLY_PACKAGE_NAME")
-      app_identifier ||= ENV["SCREENGRAB_APP_PACKAGE_NAME"] if FastlaneCore::Env.truthy?("SCREENGRAB_APP_PACKAGE_NAME")
-      app_identifier ||= CredentialsManager::AppfileConfig.try_fetch_value(:package_name)
+      app_identifier = FastlaneCore::AndroidPackageNameGuesser.guess_package_name(gem_name, args)
 
       # Add Android prefix to prevent collisions if there is an iOS app with the same identifier
       app_identifier ? "android_project_#{app_identifier}" : nil
@@ -162,13 +142,6 @@ module FastlaneCore
       nil # we don't want this method to cause a crash
     end
 
-    def self.android_app_identifier_arg?(gem_name, arg)
-      return arg == "--package_name" ||
-             arg == "--app_package_name" ||
-             (arg == '-p' && gem_name == 'supply') ||
-             (arg == '-a' && gem_name == 'screengrab')
-    end
-
     # To not count the same projects multiple time for the number of launches
     # Learn more at https://github.com/fastlane/fastlane#metrics
     # Use the `FASTLANE_OPT_OUT_USAGE` variable to opt out

data/match/lib/match/git_helper.rb

@@ -1,5 +1,7 @@
 module Match
   class GitHelper
+    MATCH_VERSION_FILE_NAME = "match_version.txt"
+
     def self.clone(git_url,
                    shallow_clone,
                    manual_password: nil,
@@ -62,7 +64,6 @@ module Match
         return self.clone(git_url, shallow_clone)
       end
 
-      copy_readme(@dir) unless skip_docs
       Encrypt.new.decrypt_repo(path: @dir, git_url: git_url, manual_password: manual_password)
 
       return @dir
@@ -80,21 +81,45 @@ module Match
     end
 
     def self.match_version(workspace)
-      path = File.join(workspace, "match_version.txt")
+      path = File.join(workspace, MATCH_VERSION_FILE_NAME)
       if File.exist?(path)
         Gem::Version.new(File.read(path))
       end
     end
 
-    def self.commit_changes(path, message, git_url, branch = "master")
+    def self.commit_changes(path, message, git_url, branch = "master", files_to_commmit = nil)
+      files_to_commmit ||= []
       Dir.chdir(path) do
         return if `git status`.include?("nothing to commit")
 
         Encrypt.new.encrypt_repo(path: path, git_url: git_url)
-        File.write("match_version.txt", Fastlane::VERSION) # unencrypted
-
         commands = []
-        commands << "git add -A"
+
+        if files_to_commmit.count > 0 # e.g. for nuke this is treated differently
+          if !File.exist?(MATCH_VERSION_FILE_NAME) || File.read(MATCH_VERSION_FILE_NAME) != Fastlane::VERSION.to_s
+            files_to_commmit << MATCH_VERSION_FILE_NAME
+            File.write(MATCH_VERSION_FILE_NAME, Fastlane::VERSION) # stored unencrypted
+          end
+
+          template = File.read("#{Match::ROOT}/lib/assets/READMETemplate.md")
+          readme_path = "README.md"
+          if !File.exist?(readme_path) || File.read(readme_path) != template
+            files_to_commmit << readme_path
+            File.write(readme_path, template)
+          end
+
+          # `git add` each file we want to commit
+          #   - Fixes https://github.com/fastlane/fastlane/issues/8917
+          #   - Fixes https://github.com/fastlane/fastlane/issues/8793
+          #   - Replaces, closes and fixes https://github.com/fastlane/fastlane/pull/8919
+          commands += files_to_commmit.map do |current_file|
+            "git add #{current_file.shellescape}"
+          end
+        else
+          # No specific list given, e.g. this happens on `fastlane match nuke`
+          # We just want to run `git add -A` to commit everything
+          commands << "git add -A"
+        end
         commands << "git commit -m #{message.shellescape}"
         commands << "GIT_TERMINAL_PROMPT=0 git push origin #{branch.shellescape}"
 
@@ -158,12 +183,6 @@ module Match
       return !result.empty?
     end
 
-    # Copies the README.md into the git repo
-    def self.copy_readme(directory)
-      template = File.read("#{Match::ROOT}/lib/assets/READMETemplate.md")
-      File.write(File.join(directory, "README.md"), template)
-    end
-
     def self.add_user_config(user_name, user_email)
       # Add git config if needed
       commands = []

data/match/lib/match/runner.rb

@@ -1,9 +1,11 @@
 module Match
   class Runner
-    attr_accessor :changes_to_commit
+    attr_accessor :files_to_commmit
     attr_accessor :spaceship
 
     def run(params)
+      self.files_to_commmit = []
+
       FastlaneCore::PrintTable.print_values(config: params,
                                          hide_keys: [:workspace],
                                              title: "Summary for match #{Fastlane::VERSION}")
@@ -50,9 +52,9 @@ module Match
       end
 
       # Done
-      if self.changes_to_commit and !params[:readonly]
+      if self.files_to_commmit.count > 0 and !params[:readonly]
         message = GitHelper.generate_commit_message(params)
-        GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch])
+        GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch], self.files_to_commmit)
       end
 
       # Print a summary table for each app_identifier
@@ -81,7 +83,7 @@ module Match
         UI.important "Couldn't find a valid code signing identity in the git repo for #{cert_type}... creating one for you now"
         UI.crash!("No code signing identity found and can not create a new one because you enabled `readonly`") if params[:readonly]
         cert_path = Generator.generate_certificate(params, cert_type)
-        self.changes_to_commit = true
+        self.files_to_commmit << cert_path
       else
         cert_path = certs.last
         UI.message "Installing certificate..."
@@ -144,7 +146,7 @@ module Match
                                                        prov_type: prov_type,
                                                   certificate_id: certificate_id,
                                                   app_identifier: app_identifier)
-        self.changes_to_commit = true
+        self.files_to_commmit << profile
       end
 
       installed_profile = FastlaneCore::ProvisioningProfile.install(profile)
@@ -155,7 +157,7 @@ module Match
       if spaceship && !spaceship.profile_exists(username: params[:username], uuid: uuid)
         # This profile is invalid, let's remove the local file and generate a new one
         File.delete(profile)
-        self.changes_to_commit = true
+        # This method will be called again, no need to modify `files_to_commmit`
         return nil
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.60.0.beta.20171002010004
+  version: 2.60.0.beta.20171003010003
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1121,6 +1121,7 @@ files:
 - fastlane_core/README.md
 - fastlane_core/lib/assets/XMLTemplate.xml.erb
 - fastlane_core/lib/fastlane_core.rb
+- fastlane_core/lib/fastlane_core/android_package_name_guesser.rb
 - fastlane_core/lib/fastlane_core/build_watcher.rb
 - fastlane_core/lib/fastlane_core/cert_checker.rb
 - fastlane_core/lib/fastlane_core/command_executor.rb
@@ -1139,6 +1140,7 @@ files:
 - fastlane_core/lib/fastlane_core/features.rb
 - fastlane_core/lib/fastlane_core/globals.rb
 - fastlane_core/lib/fastlane_core/helper.rb
+- fastlane_core/lib/fastlane_core/ios_app_identifier_guesser.rb
 - fastlane_core/lib/fastlane_core/ipa_file_analyser.rb
 - fastlane_core/lib/fastlane_core/ipa_upload_package_builder.rb
 - fastlane_core/lib/fastlane_core/itunes_search_api.rb