fastlane-plugin-changelog 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 217045bc188429e310a1e0a6c5733c0ff8dcab0a
-  data.tar.gz: b861687d566ac30feac7866f2b1273d09e6c891b
+  metadata.gz: ed97f77f8e92c6d2ebd8337d3ee0438043c701a3
+  data.tar.gz: 6ef8f3f6ed9088f5226e0405a264f2e1acb7bcbc
 SHA512:
-  metadata.gz: 704b66ac13237ca0772114f88053978886e8e4960620bbf6b8e408efee3da2c58d836c63c01ba113d3403786f2420ba858b71f728b1024fbf6523e59d1d1fec6
-  data.tar.gz: 8da58cd64910ec0d72bfdc15382469228088069c3cdc594290cc2253da89672e281581e281aa0d6a28062fceabd1b7a09e2321ab6545d9f879d104f9543f5a39
+  metadata.gz: 7db3e33068d51c4040fb524f324e1d8b17de94f31bf082ad3a306d83a3745f6a12526985eee2e6f3c311a61334b4e054b2678fe937c635678b275757fe3a1631
+  data.tar.gz: 7cc5e73f9d940def85ab869404aa6bf706f64805a08cab80acb554cb3d4065c21d46673e684632bec4b527a77f8a3a498626dfd7922a69c141ac3627979eb684

data/lib/fastlane/plugin/changelog.rb

@@ -6,7 +6,6 @@ module Fastlane
     def self.all_classes
       Dir[File.expand_path('**/{actions,helper}/*.rb', File.dirname(__FILE__))]
     end
-
   end
 end
 

data/lib/fastlane/plugin/changelog/actions/stamp_changelog.rb

@@ -43,10 +43,10 @@ module Fastlane
               # Insert placeholder line (if provided)
               if !placeholder_line.nil? && !placeholder_line.empty?
                 line = "#{unreleased_section}\n#{placeholder_line}\n\n#{line}"
-              else 
+              else
                 line = "#{unreleased_section}\n\n#{line}"
-              end  
-              
+              end
+
               inserted_unreleased = true
 
               UI.message("Created [Unreleased] placeholder section")
@@ -61,10 +61,9 @@ module Fastlane
           end
         end
 
-        # 3. Create link to Github tags diff
+        # 3. Create link to git tags diff
         if !git_tag.nil? && !git_tag.empty?
           last_line = file_content.lines.last
-          previous_section_name = last_line[/\[(.*?)\]/, 1]
           previous_tag = ""
           previous_previous_tag = ""
 
@@ -76,9 +75,16 @@ module Fastlane
             previous_previous_tag = /(?<=\.{2})(.*)?/.match(last_line)
           end
 
-          last_line.sub!(previous_tag.to_s, git_tag) # Replace previous tag with new
-          last_line.sub!(previous_previous_tag.to_s, previous_tag.to_s) # Replace previous-previous tag with previous
-          last_line.sub!(previous_section_name.to_s, section_identifier) # Replace section identifier
+          # Replace section identifier
+          cleared_git_tag = git_tag.delete('[a-z]')
+          cleared_previous_git_tag = previous_tag.to_s.delete('[a-z]')
+          last_line.sub!("[#{cleared_previous_git_tag}]", "[#{cleared_git_tag}]")
+
+          # Replace previous-previous tag with previous
+          last_line.sub!(previous_previous_tag.to_s, previous_tag.to_s)
+
+          # Replace previous tag with new
+          last_line.sub!("..#{previous_tag}", "..#{git_tag}")
 
           UI.message("Created a link for comparison between #{previous_tag} and #{git_tag} tag")
 

data/lib/fastlane/plugin/changelog/actions/update_changelog.rb

@@ -20,15 +20,14 @@ module Fastlane
         File.open(changelog_path, "r") do |file|
           line_separator = Helper::ChangelogHelper.get_line_separator(changelog_path)
           file.each_line do |line|
-
             # 3. Ignore placeholder line (if provided) within the updated section
             if found_identifying_section && !excluded_placeholder_line.nil?
-              if isSectionLine(line)
+              if is_section_line(line)
                 found_identifying_section = false # Reached the end of section, hence stop reading
               else
                 if line =~ /^#{excluded_placeholder_line}/
                   next # Ignore placeholder line, don't output it
-                else 
+                else
                   file_content.concat(line) # Output unmodified line
                   next
                 end
@@ -76,8 +75,8 @@ module Fastlane
         UI.success("Successfuly updated #{changelog_path}")
       end
 
-      def self.isSectionLine(line)
-         line =~ /\#{2}\s?\[.*\]/
+      def self.is_section_line(line)
+        line =~ /\#{2}\s?\[.*\]/
       end
 
       #####################################################

data/lib/fastlane/plugin/changelog/helper/changelog_helper.rb

@@ -11,10 +11,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Your awesome new feature'
 
-    # TODO: ❗️ Add unit tests for methods in this class
+    # TODO: Add unit tests for methods in this class
     class ChangelogHelper
-
-      # Ensures CHANGELOG.md exists at given path. If not, offers to create a default one. 
+      # Ensures CHANGELOG.md exists at given path. If not, offers to create a default one.
       # Returns path to CHANGELOG.md to be used
       def self.ensure_changelog_exists(path)
         if File.exist?(path)
@@ -30,15 +29,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
       # Generates CHANGELOG.md in project root
       def self.generate_changelog
         if FastlaneCore::UI.confirm('Do you want to generate default CHANGELOG.md in the project root?')
-            FileUtils.touch 'CHANGELOG.md'
-            generate_comparison_link
-        else 
-            FastlaneCore::UI.error("Cannot continue without CHANGELOG.md file")
+          FileUtils.touch 'CHANGELOG.md'
+          generate_comparison_link
+        else
+          FastlaneCore::UI.error("Cannot continue without CHANGELOG.md file")
         end
       end
 
       # Generates link for tag comparison
-      def self.generate_comparison_link     
+      def self.generate_comparison_link
         FastlaneCore::UI.message('Changelog plugin can automaticaly create a link for comparison between two tags (see https://github.com/pajapro/fastlane-plugin-changelog#--stamp_changelog)')
         if FastlaneCore::UI.confirm('Do you want to create links for comparing tags?')
           repo_url = FastlaneCore::UI.input('Enter your GitHub or Bitbucket repository URL (e.g.: https://github.com/owner/project or https://bitbucket.org/owner/project):')
@@ -68,7 +67,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
         File.open(CHANGELOG_PATH, 'w') { |f| f.write(changelog) }
         FastlaneCore::UI.success('Successfuly created CHANGELOG.md')
       end
-      
+
       def self.get_line_separator(file_path)
         f = File.open(file_path)
         enum = f.each_char

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Changelog
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-changelog
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Pavel Prochazka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler