fastlane-craft 1.2.20 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 338e990c3986c5756d2f66657cad0092d54ff21207149071f2a2ac1a49f20d2a
-  data.tar.gz: 0d3d43b1c10dce96cf8b77d4952858a44c5902c105331c76f900a11e09bf855a
+  metadata.gz: 3d0d618deaa5a2cff0c480fabe7d4eb532d71169ab7aa652ddb58b2163f5607b
+  data.tar.gz: ee70728a5f9842eb4bd5afcf11da80affc887ed4be11e36cf39203ef51f720a0
 SHA512:
-  metadata.gz: 0ef872795d18f4cdbbc3b2f404f61d86ac4092e2ee784338aa4bd492b6bfc9469f4969945ac9460e019ef10efea9c583db0e76c5210b523e984826fc35579b6f
-  data.tar.gz: 854a4d27a061532bc75bdac1801c9cc1cfdc4137a5edf409e1c1d33570c448b61f0f664871af3bca438de35e054ac8a596e4a510c8afead0404695c341c33a54
+  metadata.gz: 51b34e57ec9f993e6ea5da4c385742ea2b59be4afcce69b500d930bd0a348d98962304950665d87081af43c36498dc730a35074a5254fb342fded32e5ac94565
+  data.tar.gz: bb572c901ee9dec55f96fb69eb6e09a5d4b8568a2017a5bf242b9ab478af22f04c758486803ea6b32bef602e0f581a6f542dd2a996be050d0bbae285bc9cc864

data/lib/fastlane-craft.rb

@@ -1,6 +1,6 @@
 require_relative 'fastlane-craft/version'
 require_relative 'fastlane-craft/telegram'
-require_relative 'fastlane-craft/tag_release'
+require_relative 'fastlane-craft/app_release'
 
 module FastlaneCraft
 end

data/lib/fastlane-craft/{tag_release.rb → app_release.rb}

@@ -1,15 +1,15 @@
-require_relative 'tag_release_manager'
+require_relative 'app_release_manager'
 
 module Fastlane
   module Actions
-    class TagReleaseAction < Action
+    class AppReleaseAction < Action
       def self.run(params)
-        FastlaneCraft::TagReleaseManager.new(
+        FastlaneCraft::AppReleaseManager.new(
           params[:scheme],
           params[:info_plist],
           params[:extra_info_plists],
           params[:branch],
-          params[:tag] || Actions.last_git_tag_name,
+          params[:version],
           params[:target_suffix]
         ).release
       end
@@ -19,11 +19,11 @@ module Fastlane
       #####################################################
 
       def self.description
-        'Release app according to the latest tag'
+        'Release app according to the version'
       end
 
       def self.details
-        'Release app according to the latest tag'
+        'Release app according to the version'
       end
 
       def self.available_options
@@ -62,8 +62,8 @@ module Fastlane
             end
           ),
           FastlaneCore::ConfigItem.new(
-            key: :tag,
-            description: 'git tag',
+            key: :version,
+            description: 'app version (like 1.1.0)',
             optional: true
           ),
           FastlaneCore::ConfigItem.new(
@@ -76,16 +76,16 @@ module Fastlane
 
       def self.example_code
         [
-          'tag_release(
+          'app_release(
             scheme: "AppScheme",
             info_plist: "/path/to/info/plist"
           )',
-          'tag_release(
+          'app_release(
             scheme: "Application",
             info_plist: "/path/to/info/plist",
             extra_info_plists: ["plist1", "plist2"],
             branch: "master",
-            tag: "2.3.0",
+            version: "2.3.0",
             target_suffix: "_sfx"
           )'
         ]

data/lib/fastlane-craft/app_release_manager.rb

@@ -0,0 +1,110 @@
+require_relative 'info_plist_controller'
+require 'fastlane_core/ui/ui'
+
+module FastlaneCraft
+  module SharedValues
+    APP_RELEASE_VERSION = 'APP_RELEASE_VERSION'.freeze
+    APP_RELEASE_BUILD_NUMBER = 'APP_RELEASE_BUILD_NUMBER'.freeze
+    APP_RELEASE_VERSION_TAG = 'APP_RELEASE_VERSION_TAG'.freeze
+  end
+
+  class AppReleaseManager
+    include FastlaneCore
+    include Gem
+
+    def initialize(scheme, info_plist, extra_info_plists, branch, version = nil, target_suffix = nil)
+      raise 'Invalid Branch' if branch.empty?
+      raise 'Invalid Scheme' if scheme.empty?
+      raise 'Invalid Version' if version && !version_valid?(version)
+
+      @scheme = scheme
+      @branch = branch
+      @target_suffix = target_suffix
+      @plist_controller = InfoPlistController.new(info_plist, extra_info_plists)
+      @version = Version.new(version) || @plist_controller.version
+    end
+
+    def release
+      bump_version
+      archive
+      upload_to_tf
+      update_env
+      @plist_controller.bump_build_version_patch
+      push_version_bump
+
+      remove_last_git_tag_if_needed
+      push_git_tag
+    end
+
+    def bump_version
+      msg = 'Given version is less than the actual app version'
+      UI.user_error! msg if @version < @plist_controller.version
+      return unless @version > @plist_controller.version
+
+      @plist_controller.set_version(@version)
+      @plist_controller.set_build_version(Version.new(@version.to_s + '.0'))
+      UI.success "Version was successfully bumped to #{version_dump}"
+    end
+
+    def upload_to_tf
+      cmd = 'fastlane pilot upload --skip_submission --skip_waiting_for_build_processing'
+      raise "TF uploading Failed! Command execution error: '#{cmd}'" unless system(cmd)
+    end
+
+    def update_env
+      ENV[SharedValues::APP_RELEASE_VERSION] = @plist_controller.version.to_s
+      ENV[SharedValues::APP_RELEASE_BUILD_NUMBER] = @plist_controller.build_version.to_s
+      ENV[SharedValues::APP_RELEASE_VERSION_TAG] = version_dump
+    end
+
+    def push_version_bump
+      cmd = "git add . && git commit -m 'Bump version to #{version_dump}'"
+      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 archive
+      cmd = "fastlane gym --configuration Release --scheme #{@scheme} --export_method app-store"
+      raise "Archiving failed! Command execution error: '#{cmd}'" unless system(cmd)
+    end
+
+    def push_git_tag
+      cmd = "git tag #{git_tag} && git push --tags"
+      raise "Tag push failed! Command execution error: '#{cmd}'" unless system(cmd)
+    end
+
+    def remove_last_git_tag
+      tag = last_git_tag
+      cmd = "git tag -d #{tag} && git push origin :refs/tags/#{tag}"
+      raise "Git tag deletion failed! Command execution error: '#{cmd}'" unless system(cmd)
+    end
+
+    def remove_last_git_tag_if_needed
+      remove_last_git_tag if last_git_tag_version == @version
+    end
+
+    def git_tag
+      return @version.to_s unless @target_suffix
+      "#{@version}_#{@target_suffix}"
+    end
+
+    def last_git_tag_version
+      tag = last_git_tag.match(/[0-9.]+/)[0]
+      version_valid?(tag) ? Version.new(tag) : nil
+    end
+
+    def last_git_tag
+      Actions.last_git_tag_name
+    end
+
+    def version_valid?(v)
+      v.to_s.match?(/^\d\.\d\.\d{1,3}$/)
+    end
+
+    def version_dump
+      "#{@plist_controller.version}/#{@plist_controller.build_version}"
+    end
+  end
+end

data/lib/fastlane-craft/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCraft
-  VERSION = '1.2.20'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-craft
 version: !ruby/object:Gem::Version
-  version: 1.2.20
+  version: 1.3.0
 platform: ruby
 authors:
 - sroik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -116,9 +116,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/fastlane-craft.rb
+- lib/fastlane-craft/app_release.rb
+- lib/fastlane-craft/app_release_manager.rb
 - lib/fastlane-craft/info_plist_controller.rb
-- lib/fastlane-craft/tag_release.rb
-- lib/fastlane-craft/tag_release_manager.rb
 - lib/fastlane-craft/telegram.rb
 - lib/fastlane-craft/telegram_notifier.rb
 - lib/fastlane-craft/version.rb

data/lib/fastlane-craft/tag_release_manager.rb

@@ -1,86 +0,0 @@
-require_relative 'info_plist_controller'
-require 'fastlane_core/ui/ui'
-
-module FastlaneCraft
-  module SharedValues
-    TG_RELEASE_VERSION = 'TG_RELEASE_VERSION'.freeze
-    TG_RELEASE_BUILD_NUMBER = 'TG_RELEASE_BUILD_NUMBER'.freeze
-    TG_RELEASE_VERSION_TAG = 'TG_RELEASE_VERSION_TAG'.freeze
-  end
-
-  class TagReleaseManager
-    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
-      bump_version
-      archive
-      upload_to_tf
-      update_env
-      @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 pilot upload --skip_submission --skip_waiting_for_build_processing'
-      raise "TF uploading Failed! Command execution error: '#{cmd}'" unless system(cmd)
-    end
-
-    def update_env
-      ENV[SharedValues::TG_RELEASE_VERSION] = @plist_controller.version.to_s
-      ENV[SharedValues::TG_RELEASE_BUILD_NUMBER] = @plist_controller.build_version.to_s
-      ENV[SharedValues::TG_RELEASE_VERSION_TAG] = version_dump
-    end
-
-    def push_version_bump
-      cmd = "git add . && git commit -m 'Bump version to #{version_dump}'"
-      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 --configuration Release --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