fastlane-plugin-yalantis_ci 0.2.3 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9003e20ea95dd616610c94a589ff702f7d6556044372ed98a57b810386b87a6a
-  data.tar.gz: 6a3a2d1b5c30fc6175feedf43cf958cc9f2cd8d2c8e08854e4609b23a65609f3
+  metadata.gz: 7e71d3349153fab7a0926badc9f412249eb35729c33723998bd5baf497a41617
+  data.tar.gz: c951e30ec230b768c904b36d259b644560b33bace96130b5a1c2f565eb564ee7
 SHA512:
-  metadata.gz: b0edfde9077ea31918befd8b4f08b0cfa4e7984554025e1c80ea2b56187e344fd24b826409660cac7ae3ab1b5d22800d6ec16c2d5a48d055e1f019b69173e744
-  data.tar.gz: b7d5b0571f19d6a8dfe72a47ad6e2afbe20cf330004b9e69695fc74f78375ef716d2a1b23465c566622b5c8cd5a8d7e5e6bfe3a07f8a34294a14265428253e73
+  metadata.gz: 72dbadc3a903735a0cb6b0913f84e7af2700af3cc51d1f86bd451c61dee98383687194be17444ac7e8e366c6fa663150b846d78b5d47130d3dccf6824f6f9499
+  data.tar.gz: c13a7b734b8f48363d0d516357f85fa84b2687e1ee640d1c881d4fae520914e044930c2e64cca6d7be32a2aa2e872ccfa1e432c790a897a188befe46b7f830bf

data/lib/fastlane/plugin/yalantis_ci/actions/app_store_connect_api_key_add_to_remote.rb

@@ -17,7 +17,7 @@ module Fastlane
           UI.user_error!(":key_content or :key_filepath is required")
         end
 
-        Helper::GitHelper.clone_repo_in_tmp(git_repo_url, git_repo_branch, true) do |dir|
+        Helper::GitHelper.clone_repo_in_tmp(repo_url: git_repo_url, branch: git_repo_branch, create_branch: true) do |dir|
           target_filename = "#{key_id}.p8"
           target_filepath = File.join(dir, target_filename)
 

data/lib/fastlane/plugin/yalantis_ci/actions/app_store_connect_api_key_remove_from_remote.rb

@@ -10,7 +10,7 @@ module Fastlane
         git_repo_branch = options[:git_repo_branch]
         key_id = options[:key_id]
 
-        Helper::GitHelper.clone_repo_in_tmp(git_repo_url, git_repo_branch, false) do |dir|
+        Helper::GitHelper.clone_repo_in_tmp(repo_url: git_repo_url, branch: git_repo_branch) do |dir|
           target_filename = "#{key_id}.p8"
           target_filepath = File.join(dir, target_filename)
 

data/lib/fastlane/plugin/yalantis_ci/actions/app_store_connect_api_key_set_from_remote.rb

@@ -12,7 +12,7 @@ module Fastlane
         issuer_id = options[:issuer_id]
         in_house = options[:in_house]
         
-        Helper::GitHelper.clone_repo_in_tmp(git_repo_url, git_repo_branch) do |dir|
+        Helper::GitHelper.clone_repo_in_tmp(repo_url: git_repo_url, branch: git_repo_branch) do |dir|
           target_filename = "#{key_id}.p8"
           target_filepath = Pathname.new File.join(dir, target_filename)
         

data/lib/fastlane/plugin/yalantis_ci/actions/build_number_set_to_xcconfig.rb

@@ -0,0 +1,56 @@
+require 'pathname'
+
+module Fastlane
+  module Actions
+    class BuildNumberSetToXcconfigAction < Action
+      def self.run(options)
+        build_number = options[:build_number] || Actions.lane_context[SharedValues::BUILD_NUMBER]
+        path = options[:xcconfig_path]
+
+        if build_number.nil?
+          UI.error("build_number can't be nil")
+        else
+          contents = File.readlines(path).join.gsub!(/(?<=\bCURRENT_PROJECT_VERSION\s=\s)([\d]+)/, build_number.to_s)
+          File.write(path, contents) unless contents.nil?
+        end
+      end
+
+      def self.description
+        "Stores a specified Build Number in the passed xcconfig"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :build_number,
+            env_name: "BUILD_NUMBER",
+            description: "Build number to be set to the .xcconfig",
+            optional: true,
+            type: Integer
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :xcconfig_path,
+            env_name: "BUILD_NUMBER_XCCONFIG_PATH",
+            description: "Path to the xcconfig file with Build Number",
+            type: String,
+            verify_block: proc do |value|
+              UI.user_error!("Couldn't find .xcconfig file at path '#{value}'") unless File.exist?(File.expand_path(value))
+            end
+          )
+        ]
+      end
+
+      def self.output
+        []
+      end
+
+      def self.authors
+        ["Dima Vorona", "Yalantis"]
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac].include?(platform)
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/yalantis_ci/actions/build_number_sync.rb

@@ -0,0 +1,136 @@
+require 'pathname'
+require_relative '../helper/git_helper'
+require 'json'
+require 'securerandom'
+
+module Fastlane
+  module Actions
+    class BuildNumberSyncAction < Action
+      def self.run(options)
+        build_number = read_from_remote(
+          git_repo_url: options[:git_repo_url],
+          git_repo_branch: options[:git_repo_branch],
+          payload_filepath: options[:git_filepath],
+          mutation_callback: options[:mutation_callback]
+        )
+        Actions.lane_context[SharedValues::BUILD_NUMBER] = build_number unless build_number.nil?
+        return build_number
+      end
+
+      def self.read_from_remote(git_repo_url:, git_repo_branch:, payload_filepath:, mutation_callback: nil)
+        build_number = nil
+        attempts = 0
+        total_attempts = 5
+
+        pwd = ENV['PWD']
+        pwd_managed_by_git = system("git -C \"#{pwd}\" rev-parse") == true
+        pwd_git_username = pwd_managed_by_git ? `git config --local --get user.name`.strip : nil
+        pwd_git_email = pwd_managed_by_git ? `git config --local --get user.email`.strip : nil
+
+        while build_number.nil? && attempts < total_attempts
+          Helper::GitHelper.clone_repo_in_tmp(repo_url: git_repo_url, branch: git_repo_branch, create_branch: true) do |dir|
+            attempts += 1
+
+            UI.message("Attempt #{attempts} out of #{total_attempts} to get build number")
+
+            filepath = File.join(dir, payload_filepath)
+            if File.exist?(filepath)
+              begin
+                remote_build_number = JSON.parse(File.read(filepath))['build_number']
+              rescue
+                remote_build_number = 1
+              end
+            else
+              remote_build_number = 1
+            end
+
+            build_number = mutation_callback != nil ? mutation_callback.call(remote_build_number) : remote_build_number
+
+            if build_number.kind_of?(Integer) && build_number > remote_build_number
+              payload_contents = JSON.pretty_generate({ 'build_number' => build_number, 'generation' => SecureRandom.uuid })
+              File.open(filepath, 'w+') { |file| file.write(payload_contents) }
+
+              add_user_config_if_needed(pwd_git_username: pwd_git_username, pwd_git_email: pwd_git_email)
+
+              Actions.sh("git add #{filepath} && git commit -m '[Build Number] Update Build Number to: #{build_number}'")
+              Actions.sh("git push #{git_repo_url} #{git_repo_branch}", error_callback: ->(result) { build_number = nil })
+            elsif build_number.kind_of?(Integer) && build_number < remote_build_number
+              UI.user_error!("It is unexpected to return build number less than a proposed one: #{build_number} vs #{remote_build_number}")
+            end
+          end
+        end
+
+        build_number
+      end
+
+      def self.add_user_config_if_needed(pwd_git_username:, pwd_git_email:)
+        variables = {'email' => pwd_git_email, 'name' => pwd_git_username }
+        variables.each do |key, value|
+          if `git config --local --get user.#{key}`.strip.empty?
+            `git config --local user.#{key} #{value}` unless value.empty?
+          end
+        end
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Read and increment version stored in a specified repo"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :git_repo_url,
+            env_name: "BUILD_NUMBER_GIT_REPO_URL",
+            description: "Git repo URL where Build Number is being stored",
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :git_repo_branch,
+            env_name: "BUILD_NUMBER_GIT_REPO_BRANCH",
+            description: "Git repo branch where Build Number is being stored",
+            type: String,
+            default_value: 'main'
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :increment,
+            description: 'Whether value from remote should be incremented or not',
+            default_value: true,
+            verify_block: proc do |value|
+              UI.user_error!("Only `true` and `false` are allowed") unless value == true || value == false
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :git_filepath,
+            env_name: "BUILD_NUMBER_GIT_FILEPATH",
+            description: "Relative filepath to the file that contains build number",
+            type: String,
+            default_value: 'payload.json'
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :mutation_callback,
+            description: 'A callback invoked with the build number from remote and expected build number to be returned',
+            optional: true,
+            type: Proc,
+            default_value: nil
+          )
+        ]
+      end
+
+      def self.output
+        ['BUILD_NUMBER', 'The new build number']
+      end
+
+      def self.authors
+        ["Dima Vorona", "Yalantis"]
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac].include?(platform)
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/yalantis_ci/actions/ci_setup.rb

@@ -80,7 +80,9 @@ module Fastlane
       end
 
       def self.setup_temp_keychain(id)
-        name = "#{id}-fastlane"
+        job_id = ENV['CI_JOBENV_ID'] || ''
+
+        name = "#{id}-#{job_id}-fastlane"
         password = "#{name}-password"
         path = File.expand_path("~/Library/Keychains/#{name}.keychain-db")
 
@@ -98,7 +100,7 @@ module Fastlane
         end
 
         UI.message("Setting temporary keychain path to: \"#{path}\"")
-        other_action.create_keychain(unlock: true, timeout: false, add_to_search_list: true)
+        other_action.create_keychain(unlock: true, timeout: 0, add_to_search_list: true)
       end
 
       #####################################################

data/lib/fastlane/plugin/yalantis_ci/helper/git_helper.rb

@@ -5,16 +5,15 @@ module Fastlane
 
   module Helper
     class GitHelper
-      
-      def self.clone_repo_in_tmp(repo_url, branch = 'master', create_branch_if_needed = false)
+      def self.clone_repo_in_tmp(repo_url:, branch: 'master', create_branch: false)
         temp_directory = `mktemp -d`.tr("\n", "")
 
         begin 
             Dir.chdir(temp_directory) do
                 Actions.sh("git clone -b #{branch} #{repo_url} #{Dir.pwd}") do |status, result, cmd|
-                    if status.success? != true && create_branch_if_needed
-                        Actions.sh("git clone #{repo_url} #{Dir.pwd} && git checkout -b #{branch}") do |status, result, cmd |
-                            if status.success? != true 
+                    if status.success? != true && create_branch
+                        Actions.sh("git clone #{repo_url} #{Dir.pwd} && git checkout -b #{branch}") do |status, result, cmd|
+                            if status.success? != true
                                 raise StandardError.new result
                             end
                         end

data/lib/fastlane/plugin/yalantis_ci/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module YalantisCi
-    VERSION = "0.2.3"
+    VERSION = "0.3.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-yalantis_ci
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.7
 platform: ruby
 authors:
 - Dima Vorona
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane-plugin-firebase_app_distribution
@@ -150,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description:
+description: 
 email: dmytro.vorona@yalantis.net
 executables: []
 extensions: []
@@ -162,19 +162,19 @@ files:
 - lib/fastlane/plugin/yalantis_ci/actions/app_store_connect_api_key_add_to_remote.rb
 - lib/fastlane/plugin/yalantis_ci/actions/app_store_connect_api_key_remove_from_remote.rb
 - lib/fastlane/plugin/yalantis_ci/actions/app_store_connect_api_key_set_from_remote.rb
+- lib/fastlane/plugin/yalantis_ci/actions/build_number_set_to_xcconfig.rb
+- lib/fastlane/plugin/yalantis_ci/actions/build_number_sync.rb
 - lib/fastlane/plugin/yalantis_ci/actions/ci_setup.rb
 - lib/fastlane/plugin/yalantis_ci/actions/ci_teardown.rb
 - lib/fastlane/plugin/yalantis_ci/actions/firebase_distribution_setup.rb
 - lib/fastlane/plugin/yalantis_ci/actions/install_brew_dependencies.rb
-- lib/fastlane/plugin/yalantis_ci/actions/yalantis_ci_action.rb
-- lib/fastlane/plugin/yalantis_ci/helper/ci_helper.rb
 - lib/fastlane/plugin/yalantis_ci/helper/git_helper.rb
 - lib/fastlane/plugin/yalantis_ci/version.rb
-homepage:
+homepage: 
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -189,8 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Set of utilities and useful actions to help setup CI for Yalantis projects
 test_files: []

data/lib/fastlane/plugin/yalantis_ci/actions/yalantis_ci_action.rb

@@ -1,47 +0,0 @@
-require 'fastlane/action'
-require_relative '../helper/ci_helper'
-
-module Fastlane
-  module Actions
-    class YalantisCiAction < Action
-      def self.run(params)
-        UI.message("The yalantis_ci plugin is working!")
-      end
-
-      def self.description
-        "Set of utilities and useful actions to help setup CI for Yalantis projects"
-      end
-
-      def self.authors
-        ["Dima Vorona"]
-      end
-
-      def self.return_value
-        # If your method provides a return value, you can describe here what it does
-      end
-
-      def self.details
-        # Optional:
-        "This plugin provides tools that setup Firebase, setup proper match repo branch name based on the project Unique ID (based on Team ID and a project name), syncs AppStore Connect API keys, kbridges cocoapod keys plugin to sync and share keys, stored in an encrypted repo just as Match does"
-      end
-
-      def self.available_options
-        [
-          # FastlaneCore::ConfigItem.new(key: :your_option,
-          #                         env_name: "YALANTIS_CI_YOUR_OPTION",
-          #                      description: "A description of your option",
-          #                         optional: false,
-          #                             type: String)
-        ]
-      end
-
-      def self.is_supported?(platform)
-        # Adjust this if your plugin only works for a particular platform (iOS vs. Android, for example)
-        # See: https://docs.fastlane.tools/advanced/#control-configuration-by-lane-and-by-platform
-        #
-        # [:ios, :mac, :android].include?(platform)
-        true
-      end
-    end
-  end
-end

data/lib/fastlane/plugin/yalantis_ci/helper/ci_helper.rb

@@ -1,17 +0,0 @@
-require 'fastlane_core/ui/ui'
-
-module Fastlane
-  UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
-
-  module Helper
-    class CiHelper
-
-      # class methods that you define here become available in your action
-      # as `Helper::CiHelper.your_method`
-      #
-      def self.show_message
-        UI.message("Hello from the yalantis_ci plugin helper!")
-      end
-    end
-  end
-end