lib/semmy/changelog.rb in semmy-0.3.0 vs lib/semmy/changelog.rb in semmy-0.4.0

@@ -40,78 +40,92 @@
         END
       end
 
       def version_heading
         config.changelog_version_section_heading % {
-          version: options[:new_version]
+          version: version
         }
       end
 
       def current_date
         options[:date].strftime('%Y-%m-%d')
       end
 
       def compare_link_for_versions
         Changelog.compare_link(config,
                                homepage: options[:homepage],
-                               old_version_tag: old_version_tag,
-                               new_version_tag: new_version_tag)
+                               old_version_tag: old_ref,
+                               new_version_tag: Changelog.version_tag(version))
       end
 
-      def old_version_tag
-        Changelog.version_tag(options[:old_version])
+      def old_ref
+        if VersionString.patch_level?(version)
+          Changelog.version_tag(VersionString.previous_version(version))
+        else
+          VersionString.previous_stable_branch_name(version, config.stable_branch_name)
+        end
       end
 
-      def new_version_tag
-        Changelog.version_tag(options[:new_version])
+      def version
+        options[:version]
       end
     end
 
-    InsertUnreleasedSection = Struct.new(:config, :options) do
+    UpdateForMinor = Struct.new(:config, :options) do
       def call(contents)
-        insert_before(version_line_matcher,
-                      contents,
-                      unreleased_section(contents))
+        replace_starting_at(version_line_matcher,
+                            contents,
+                            unreleased_section)
       end
 
       private
 
-      def unreleased_section(contents)
+      def unreleased_section
         <<-END.unindent
           #{config.changelog_unrelased_section_heading}
 
-          #{compare_link_for_master(contents)}
+          #{compare_link_for_master}
 
           #{config.changelog_unrelased_section_blank_slate}
+
+          #{link_to_changelog_on_previous_minor_stable_branch}
         END
       end
 
-      def compare_link_for_master(contents)
+      def compare_link_for_master
         Changelog.compare_link(config,
                                homepage: options[:homepage],
-                               old_version_tag: last_version_tag(contents),
+                               old_version_tag: previous_stable_branch_name,
                                new_version_tag: 'master')
       end
 
-      def last_version_tag(contents)
-        match = contents.match(version_line_matcher)
-        match && Changelog.version_tag(match[1])
+      def link_to_changelog_on_previous_minor_stable_branch
+        config.changelog_previous_changes_link % {
+          branch: previous_stable_branch_name,
+          url: Changelog.file_url(config,
+                                  homepage: options[:homepage],
+                                  branch: previous_stable_branch_name)
+        }
       end
 
+      def previous_stable_branch_name
+        VersionString.previous_stable_branch_name(options[:version],
+                                                  config.stable_branch_name)
+      end
+
       def version_line_matcher
         Regexp.new(config.changelog_version_section_heading % {
                      version: '([0-9.]+)'
                    })
       end
 
-      def insert_before(line_matcher, text, inserted_text)
-        text.dup.tap do |result|
-          unless (result.sub!(line_matcher, inserted_text + "\n\\0"))
-            fail(InsertPointNotFound,
-                 "Insert point not found.")
-          end
+      def replace_starting_at(line_matcher, text, inserted_text)
+        unless text =~ line_matcher
+          fail(InsertPointNotFound, 'Insert point not found.')
         end
+
+        [text.split(line_matcher).first, inserted_text].join
       end
     end
 
     def version_tag(version)
       "v#{version}"
@@ -120,15 +134,23 @@
     def compare_link(config, interpolations)
       "[Compare changes](#{compare_url(config, interpolations)})"
     end
 
     def compare_url(config, interpolations)
-      config.changelog_compare_url % interpolations
-        .merge(repository: repository_url(config,
-                                          interpolations[:homepage]))
+      config.compare_url % url_interpolations(config, interpolations)
     end
 
+    def file_url(config, interpolations)
+      config.file_url % url_interpolations(config, interpolations)
+        .merge(path: config.changelog_path)
+    end
+
     private
+
+    def url_interpolations(config, interpolations)
+      interpolations.merge(repository: repository_url(config,
+                                                      interpolations[:homepage]))
+    end
 
     def repository_url(config, homepage)
       if config.github_repository
         "https://github.com/#{config.github_repository}"
       else