fastlane-craft 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 935d4bc6b8077891fa5cd90feea42cc66f45c65e1128b0a8112f3fa5680c4bf6
-  data.tar.gz: 00bb41ce3de0aef7c0e0258aa4eaacbba3432a87cd9e9a207680390646a2ebf7
+  metadata.gz: ed453af9060430952658fc7c3626694130a3fa41ef48c429580072ec6408d0db
+  data.tar.gz: 5a617fdd68fffa5c5da35bbb9eca75038b31ecf75aa6c5ae747fae5c6143d5c4
 SHA512:
-  metadata.gz: daead6929612ace6ef3c9f399cebab0af35bc68391f4d1b487cbd37fb64ed2510a60170e6c362b6f782291afe8c78c63b093b8abb252957d8b04e96e1d947f9a
-  data.tar.gz: 1d91977f5e487c1958891bbf11fc25052c1869f2bbd3fff47f0713e2145079077193834e7cd0f5374f1ae078c1957f94b878113984b71654ab0c949a5419974c
+  metadata.gz: 426de8520f37bce11b75348448ba6ead10355585cbc5f40abeba393cc9da85163da52bdade1e36f7c823e55a44b71ade01bdb6aa47d51e9a2bc03bbaabfc7777
+  data.tar.gz: c00e7387f47338730e748e7cd755fadfb380e00cb0be21c4b804266ddfe02fc3fceeca6c89b9fb1d41a58eab13f65ab186f5db6e6d7b47bfcb1752c18217294f

data/lib/fastlane_craft.rb

@@ -1,5 +1,3 @@
-require_relative 'fastlane_craft/tag_release_manager'
-require_relative 'fastlane_craft/telegram_notifier'
 require_relative 'fastlane_craft/version'
 
 module FastlaneCraft

data/lib/fastlane_craft/tag_release.rb

@@ -1,4 +1,5 @@
 require_relative 'tag_release_manager'
+require 'fastlane'
 
 module Fastlane
   module Actions
@@ -7,7 +8,11 @@ module Fastlane
 
       def self.run(params)
         TagReleaseManager.new(
-          params[:info_plist_path],
+          params[:scheme],
+          params[:info_plist],
+          params[:extra_info_plists],
+          params[:branch],
+          params[:tag] || Actions.last_git_tag_name,
           params[:target_suffix]
         ).release
       end
@@ -27,24 +32,65 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(
-            key: :target_suffix,
-            description: 'Specific target suffix',
-            optional: true
+            key: :scheme,
+            description: 'project scheme',
+            verify_block: proc do |value|
+              UI.user_error!('empty scheme') if value.empty?
+            end
           ),
           FastlaneCore::ConfigItem.new(
-            key: :info_plist_path,
+            key: :info_plist,
             description: 'target info plist path',
             verify_block: proc do |value|
-              msg = 'empty info plist path'
-              UI.user_error!(msg) unless value && !value.empty?
+              msg = 'info plist path not found'
+              UI.user_error!(msg) unless File.file?(value)
             end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :extra_info_plists,
+            description: 'extra info plists paths',
+            type: Array,
+            default_value: [],
+            verify_block: proc do |value|
+              msg = 'invalid info plists paths'
+              UI.user_error!(msg) unless value.all? { |p| File.file?(p) }
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :branch,
+            description: 'branch',
+            default_value: 'master',
+            verify_block: proc do |value|
+              UI.user_error!('invalid branch') if value.empty?
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :tag,
+            description: 'git tag',
+            optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :target_suffix,
+            description: 'Specific target suffix',
+            optional: true
           )
         ]
       end
 
       def self.example_code
         [
-          'tag_release(info_plist_path: "/path/to/info/plist")'
+          'tag_release(
+            scheme: "AppScheme",
+            info_plist: "/path/to/info/plist"
+          )',
+          'tag_release(
+            scheme: "Application",
+            info_plist: "/path/to/info/plist",
+            extra_info_plists: ["plist1", "plist2"],
+            branch: "master",
+            tag: "2.3.0",
+            target_suffix: "_sfx"
+          )'
         ]
       end
 

data/lib/fastlane_craft/tag_release_manager.rb

@@ -1,60 +1,74 @@
 require_relative 'info_plist_controller'
+require 'fastlane_core'
+require 'fastlane'
 
 module FastlaneCraft
   class TagReleaseManager
-    def initialize(info_plist, extra_info_plists, target_suffix = nil)
+    include FastlaneCore
+    include Gem
+
+    def initialize(scheme, info_plist, extra_info_plists, branch, tag, target_suffix = nil)
+      raise 'Invalid Branch' if branch.empty?
+      raise 'Invalid Scheme' if scheme.empty?
+      raise 'Invalid Tag' if tag.nil? || tag.empty?
+
+      @scheme = scheme
+      @branch = branch
+      @tag = tag
       @target_suffix = target_suffix
       @plist_controller = InfoPlistController.new(info_plist, extra_info_plists)
     end
 
     def release
-      puts 'releasing :)'
+      bump_version
+      archive
+      upload_to_tf
+      @plist_controller.bump_build_version_patch
+      push_version_bump
+    end
+
+    def bump_version
+      msg = 'The version of the tag is less than the actual app version'
+      UI.user_error! msg if tag_version < @plist_controller.version
+      UI.user_error! "Tag '#{@tag}' has no suffix: '#{@target_suffix}'" unless tag_valid?
+      return unless tag_version > @plist_controller.version
+
+      @plist_controller.set_version(tag_version)
+      @plist_controller.set_build_version(Version.new(tag_version.to_s + '.0'))
+      UI.success "Version was successfully bumped to #{version_dump}"
+    end
+
+    def upload_to_tf
+      cmd = 'fastlane upload_to_testflight --skip_submission true'
+      raise "TF uploading Failed! Command execution error: '#{cmd}'" unless system(cmd)
+    end
+
+    def push_version_bump
+      cmd = "fastlane commit_version_bump -message #{version_dump} --force true"
+      raise "Git Commit Failed! Command execution error: '#{cmd}'" unless system(cmd)
+
+      cmd = "git push origin HEAD:#{@branch}"
+      raise "Git Push Failed! Command execution error: '#{cmd}'" unless system(cmd)
+    end
+
+    def tag_version
+      version_format = /[0-9.]+/
+      tag = @tag.match(version_format)[0]
+      Version.new(tag)
+    end
+
+    def tag_valid?
+      return true if @target_suffix.nil? || @target_suffix.empty?
+      @tag.end_with? @target_suffix
+    end
+
+    def archive
+      cmd = "fastlane gym --scheme #{@scheme} --export_method app-store"
+      raise "Archiving failed! Command execution error: '#{cmd}'" unless system(cmd)
+    end
+
+    def version_dump
+      "#{@plist_controller.version}/#{@plist_controller.build_version}"
     end
   end
 end
-
-# lane :bump_version do |options|
-#   if tag_version < app_version
-#     UI.user_error! 'The version of the tag is less than the actual app version'
-#   end
-#
-#   if tag_version > app_version
-#     version = tag_version.to_s
-#     build_version = Gem::Version.new(version.to_s + '.0')
-#   elsif tag_version == app_version && options[:bump_patch]
-#     version = app_version.to_s
-#     build_version = bumped_version(app_build_version)
-#   end
-#
-#   set_app_version(version)
-#   set_app_build_version(build_version)
-#   UI.success "Version was successfully bumped to #{version}/#{build_version}"
-# end
-#
-# lane :push_version_bump do
-#   commit_version_bump(
-#     message: "Bump version to #{app_version}/#{app_build_version}",
-#     force: true
-#   )
-#
-#   push_to_git_remote(
-#     local_branch: 'master',
-#     remote_branch: 'master'
-#   )
-# end
-#
-# lane :release do
-#   bump_version
-#   certificates
-#   archive_appstore
-#   upload_to_testflight(skip_submission: true)
-#   bump_version(bump_patch: true)
-#   push_version_bump
-#   broadcast_release
-# end
-#
-# def tag_version
-#   version_format = /[0-9.]+/
-#   tag = last_git_tag.match(version_format)[0]
-#   Gem::Version.new(tag)
-# end

data/lib/fastlane_craft/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCraft
-  VERSION = '1.2.7'.freeze
+  VERSION = '1.2.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-craft
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - sroik