fastlane 2.60.0 → 2.60.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25cb3ba72b977263c274ed23e959e6035e826488
-  data.tar.gz: 1c1f392bc719cb9f472bc1f22cf1936ade4dd6bb
+  metadata.gz: e99c6cd5377f900c5053f1cce0265fdd06099532
+  data.tar.gz: 54ae7e406d3fec4f265c381b71a3453ac4368fba
 SHA512:
-  metadata.gz: 9cd9a661848c4b400c25381aa42654abbe87034a0e23f305772e77eb3789b92f93c28a7d2451f392f78a8caeb138c8eca95e692b7dcfd0e9754ab69dea3b4a44
-  data.tar.gz: ece0db41a48b1629ec4a7902d0d594a106044cbc2e6511c6a8d6cedcff43ec42a4f2ad4317109ef6991c74046976ddedf8944d090c896309bbf42767f9802e4e
+  metadata.gz: a81fc252bb56ca9172c8bba1078752013af5cbdc1f076632a9dc138cfdfe673832eee47a1909a331ad73077c6de0827a7b59410184dd6b04f0ed85ff80e36e53
+  data.tar.gz: 57709afa9565865de03ed52b0dd69a4484ddd8be78c6a43a6a1e3ed33eb4f1a253102825bcf8b58c1af0b7b8e8de49252e894ab5fe3dd32011791d3e9b7d9f7d

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.60.0'.freeze
+  VERSION = '2.60.1'.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/match/lib/match/git_helper.rb

@@ -1,7 +1,5 @@
 module Match
   class GitHelper
-    MATCH_VERSION_FILE_NAME = "match_version.txt"
-
     def self.clone(git_url,
                    shallow_clone,
                    manual_password: nil,
@@ -64,6 +62,7 @@ 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
@@ -81,45 +80,21 @@ module Match
     end
 
     def self.match_version(workspace)
-      path = File.join(workspace, MATCH_VERSION_FILE_NAME)
+      path = File.join(workspace, "match_version.txt")
       if File.exist?(path)
         Gem::Version.new(File.read(path))
       end
     end
 
-    def self.commit_changes(path, message, git_url, branch = "master", files_to_commmit = nil)
-      files_to_commmit ||= []
+    def self.commit_changes(path, message, git_url, branch = "master")
       Dir.chdir(path) do
         return if `git status`.include?("nothing to commit")
 
         Encrypt.new.encrypt_repo(path: path, git_url: git_url)
-        commands = []
+        File.write("match_version.txt", Fastlane::VERSION) # unencrypted
 
-        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 = []
+        commands << "git add -A"
         commands << "git commit -m #{message.shellescape}"
         commands << "GIT_TERMINAL_PROMPT=0 git push origin #{branch.shellescape}"
 
@@ -183,6 +158,12 @@ 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,11 +1,9 @@
 module Match
   class Runner
-    attr_accessor :files_to_commmit
+    attr_accessor :changes_to_commit
     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}")
@@ -52,9 +50,9 @@ module Match
       end
 
       # Done
-      if self.files_to_commmit.count > 0 and !params[:readonly]
+      if self.changes_to_commit and !params[:readonly]
         message = GitHelper.generate_commit_message(params)
-        GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch], self.files_to_commmit)
+        GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch])
       end
 
       # Print a summary table for each app_identifier
@@ -83,7 +81,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.files_to_commmit << cert_path
+        self.changes_to_commit = true
       else
         cert_path = certs.last
         UI.message "Installing certificate..."
@@ -146,7 +144,7 @@ module Match
                                                        prov_type: prov_type,
                                                   certificate_id: certificate_id,
                                                   app_identifier: app_identifier)
-        self.files_to_commmit << profile
+        self.changes_to_commit = true
       end
 
       installed_profile = FastlaneCore::ProvisioningProfile.install(profile)
@@ -157,7 +155,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)
-        # This method will be called again, no need to modify `files_to_commmit`
+        self.changes_to_commit = true
         return nil
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.60.0
+  version: 2.60.1
 platform: ruby
 authors:
 - Felix Krause