fastlane-plugin-changelog 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e26d9ddcfd339ec08587d0a1d27bc87003692bb9
-  data.tar.gz: 582915e842fa69e643db3124392f6a0468b2bad6
+  metadata.gz: bcf3d31f700f597163a76c226762b026a09f079f
+  data.tar.gz: 8ab8cdca0df9c74d348e216a66daf49a2373ac8b
 SHA512:
-  metadata.gz: e07875125ca14a092ecae235265191ee7ebfdef575b74476b5629537aaea5087234f205a5531f5e2b2e6f7cf41e645a6dbe3cd535bd83f8afb61ff14515766e8
-  data.tar.gz: a3be5458dc7ac6666497b41a4073633c0adc286187e4600298430ee3e80a96c962ae80209e0815d6adf535242042b6c71a08fdd0fda260b2730e6317ae5a24bc
+  metadata.gz: b2981cb1bbd7c291babbc5d7537360f74dbca6171b2e2572a199d638a67d2102939a77821901bd05ef25aaae88ad4893c025c6ef7a08109f9f357584912ea10f
+  data.tar.gz: 7ccc9c0708eac69ab5415a1cff6f564d94f6a3fab272cf1edf614f27c8641937784fcc798457123d743e5df06a01ff7e2cac33f72d1ae0836f9eea80210af123

data/README.md

@@ -48,7 +48,7 @@ update_changelog(
  
 ### 🔖  stamp_changelog
 Stamps the _Unreleased_ (see [How can I minimize the effort required?](http://keepachangelog.com/)) section with provided identifier in your project `CHANGELOG.md` file and sets up a new _Unreleased_ section above it.
-Additionally, you can provide an optional `git_tag` param, specifing git tag associated with this section. `stamp_changelog` will then create a link to diff between this and previous section's tag on Github. This will enable you to quickly get to [comparison between two tags](https://help.github.com/articles/comparing-commits-across-time/).
+Additionally, you can provide an optional `git_tag` param, specifing git tag associated with this section. `stamp_changelog` will then create a link to diff between this and previous section's tag on GitHub or Bitbucket. This will enable you to quickly get to [comparison between two tags](https://help.github.com/articles/comparing-commits-across-time/).
 ``` ruby
 stamp_changelog(
   section_identifier: 'Build XYZ', # Specify identifier to stamp the Unreleased section with 

data/lib/fastlane/plugin/changelog.rb

@@ -25,10 +25,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
           create_changelog
 
           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 on Github?')
-            github_url = FastlaneCore::UI.input('Enter your Github URL (e.g.: https://github.com/fastlane/fastlane):')
-            output = DEFAULT_CHANGELOG + "\n\n[Unreleased]: #{github_url}/compare/master...HEAD"
-            write_to_changelog(output)
+          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):')
+            create_comparison_link(repo_url)
           else
             write_to_changelog(DEFAULT_CHANGELOG)
           end
@@ -46,6 +45,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
       FileUtils.touch 'CHANGELOG.md'
     end
 
+    # Create a link for tag comparison
+    def self.create_comparison_link(repo_url)
+      if repo_url.start_with?('https://github.com')
+        output = DEFAULT_CHANGELOG + "\n\n[Unreleased]: #{repo_url}/compare/master...HEAD"
+        write_to_changelog(output)
+      elsif repo_url.start_with?('https://bitbucket.org')
+        output = DEFAULT_CHANGELOG + "\n\n[Unreleased]: #{repo_url}/compare/master..HEAD"
+        write_to_changelog(output)
+      else
+        FastlaneCore::UI.error('Unknown repository host')
+        FastlaneCore::UI.message('Creating CHANGELOG.md without links for comparing tags')
+        write_to_changelog(DEFAULT_CHANGELOG)
+      end
+    end
+
     # Write given content to CHANGELOG.md
     def self.write_to_changelog(changelog)
       File.open(CHANGELOG_PATH, 'w') { |f| f.write(changelog) }

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

@@ -56,14 +56,22 @@ module Fastlane
         if !git_tag.nil? && !git_tag.empty?
           last_line = file_content.lines.last
           previous_section_name = last_line[/\[(.*?)\]/, 1]
-          previous_previous_tag = %r{(?<=compare\/)(.*)?(?=\.{3})}.match(last_line)
-          previous_tag = /(?<=\.{3})(.*)?/.match(last_line)
+          previous_tag = ""
+          previous_previous_tag = ""
+
+          if last_line.include? 'https://github.com' # GitHub uses compare/olderTag...newerTag structure
+            previous_previous_tag = %r{(?<=compare\/)(.*)?(?=\.{3})}.match(last_line)
+            previous_tag = /(?<=\.{3})(.*)?/.match(last_line)
+          elsif last_line.include? 'https://bitbucket.org' # Bitbucket uses compare/newerTag..olderTag structure
+            previous_tag = %r{(?<=compare\/)(.*)?(?=\.{2})}.match(last_line)
+            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
 
-          UI.message("Created link to Github tags diff")
+          UI.message("Created a link for comparison between #{previous_tag} and #{git_tag} tag")
 
           file_content.concat(last_line)
         end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Changelog
-    VERSION = "0.6.2"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-changelog
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Pavel Prochazka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry