fastlane-craft 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aa470cfc581e71d76e685c685b9fe1dc9440e556f95c968e19c884d46c92b4e
-  data.tar.gz: 3781ecaa118d7873d538b6e4ec076706fc330d5432b0f5d33d614b17c2bf819b
+  metadata.gz: 3925e6b6e39541796abce439e781b02b0d4bb4e891536cff80df4106d4c90656
+  data.tar.gz: dcabea7835bb7ff3792e6655131f1ca624bf8b874219c58faadccd17d680fb04
 SHA512:
-  metadata.gz: ababbd248bb2f7c3abad3914227f1615609e19f46af1cd52005dd3660b887bb0e08a2f17a16534ac0b5a5675b1967a0b5a124c1aece7259ffec4ec84e885f725
-  data.tar.gz: 9c0c52e4e010ee500591fb17f3159b991bea660d9813408d560a74c04cba1b876d54554a7e3ac53e5149062d418f51970752669406af867937e28724785745a6
+  metadata.gz: 8f1d5d1f611eb84042477551c330d48e807c400bfe2819faa583edb794f0a4828a7b9d8a3b80c8a8cfa1fbe574fe2e66fec0e54c97822170e51c831e0c66fac2
+  data.tar.gz: bd5568a681060915dbc5de1092668f37a4cc41e5974e710d1da66b2f5fb0017048285a8084cb306ae5355a6f9e0f82bc258d7335234a4fe79f87759df53f0f72

data/lib/fastlane-craft/app_release_manager.rb

@@ -32,7 +32,7 @@ module FastlaneCraft
       @plist_controller.bump_build_version_patch
       push_version_bump
 
-      remove_last_git_tag_if_needed
+      remove_existing_git_tag
       push_git_tag
     end
 
@@ -74,37 +74,38 @@ module FastlaneCraft
     end
 
     def push_git_tag
-      cmd = "git tag #{git_tag} && git push --tags"
+      UI.message "going to push tag: #{curr_git_tag}"
+      cmd = "git tag #{curr_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
+    def remove_existing_git_tag
+      tag = existing_git_tag
+      return if tag.nil?
+
+      UI.message "going to remove tag: #{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
+    def curr_git_tag
       return @version.to_s unless @target_suffix
       "#{@version}_#{@target_suffix}"
     end
 
-    def last_git_tag_version
-      return nil unless last_git_tag.nil?
-      tag = last_git_tag.match(/[0-9.]+/)[0]
-      version_valid?(tag) ? Version.new(tag) : nil
+    def existing_git_tag
+      git_tags.detect do |t|
+        tag_v = t.match(/[0-9.]+/)[0]
+        version_valid?(tag_v) && Version.new(tag_v) == @version
+      end
     end
 
-    def last_git_tag
-      `git tag`&.split("\n")&.first
+    def git_tags
+      `git tag`.split("\n")
     end
 
-    def version_valid?(v)
-      v.to_s.match?(/^\d\.\d\.\d{1,3}$/)
+    def version_valid?(version)
+      version.to_s.match?(/^\d\.\d\.\d{1,3}$/)
     end
 
     def version_dump

data/lib/fastlane-craft/info_plist_controller.rb

@@ -17,15 +17,15 @@ module FastlaneCraft
       set_build_version(Version.new(value))
     end
 
-    def set_version(v)
+    def set_version(version)
       info_plists.each do |path|
-        set_plist_value_for(path, v.to_s, version_key)
+        set_plist_value_for(path, version.to_s, version_key)
       end
     end
 
-    def set_build_version(v)
+    def set_build_version(version)
       info_plists.each do |path|
-        set_plist_value_for(path, v.to_s, build_version_key)
+        set_plist_value_for(path, version.to_s, build_version_key)
       end
     end
 

data/lib/fastlane-craft/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCraft
-  VERSION = '1.3.4'.freeze
+  VERSION = '1.3.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-craft
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - sroik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane