danger-changelog 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dda179f0ffebc733fa943723d9b16c6db3720beab1e5c43ee57746cb6f20577
-  data.tar.gz: b1797cb0bd4d0eef3aead4e9a0409c057205d995efc3d56f200f106055900fe9
+  metadata.gz: 11af2b5d7acdef3916a5d3804da6d6b3cb0b881132e5cf3fadabd562823987a5
+  data.tar.gz: 4dd589ec527ba8cc88326749593652e296ee908b982674a3402f7b521d74dfb3
 SHA512:
-  metadata.gz: 897e573a11db0076fd9c7bb745b5c8f39d47d94f4d2b69b298a1565cade582a9aaadf17d0667b48a1d9569bc0566558000e9baaec7bf9a6054d4818ed5475f1d
-  data.tar.gz: c92f5ae706ada26bb3006adffae2df8aef0b79de05d1f6464257918004511a7bdc926a2430c6386d32961df4011c3e48b29162dea763a98865087e6df8fd4375
+  metadata.gz: c2ea9affac3dda11f80eb7622c2e405efc0508f257e6afac328312a7ab238df755975c285b73e23c9d1cd77bdf7487f02b581d0b161c329473f99dfbb8bdece7
+  data.tar.gz: 927698782c171ac595a8fde12380ac7cbe8097d18018060d3821304b0ab0dd2d26baba9af561c8b275cc8423d1f53ba75b4deba072d2f21a5245a5a5689c9d8a

data/.rubocop.yml

@@ -14,4 +14,14 @@ Metrics:
 Metrics/LineLength:
   Max: 256
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Naming/PredicateName:
+  Enabled: true
+  NameWhitelist:
+    - is_a?
+    - have_you_updated_changelog?
+    - is_changelog_format_correct?
+
 inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,45 +1,7 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-07-28 16:00:45 -0400 using RuboCop version 0.61.1.
+# on 2020-05-08 17:23:39 -0400 using RuboCop version 0.73.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
-  Exclude:
-    - 'lib/changelog/plugin.rb'
-
-# Offense count: 1
-# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
-Lint/UselessAccessModifier:
-  Exclude:
-    - 'lib/changelog/changelog_line/changelog_line_parser.rb'
-
-# Offense count: 2
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-# MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/changelog/plugin.rb'
-
-# Offense count: 1
-Style/DoubleNegation:
-  Exclude:
-    - 'lib/changelog/changelog_file.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: module_function, extend_self
-Style/ModuleFunction:
-  Exclude:
-    - 'lib/changelog/config.rb'

data/.travis.yml

@@ -5,7 +5,7 @@ cache:
     - bundle
 
 rvm:
-  - 2.3.1
+  - 2.6.2
 
 before_script:
     - bundle exec danger

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+### 0.6.1 (2020/05/08)
+
+* [#33](https://github.com/dblock/danger-changelog/issues/33): Attempt to point out known problems in Intridea format - [@dblock](https://github.com/dblock).
+* [#51](https://github.com/dblock/danger-changelog/pull/51): Allow markdown links in keep-a-changelog lines - [@dblock](https://github.com/dblock).
+* [#50](https://github.com/dblock/danger-changelog/pull/50): Added TOC to README - [@dblock](https://github.com/dblock).
+
 ### 0.6.0 (2019/07/28)
 
 * [#47](https://github.com/dblock/danger-changelog/pull/47): Configure `Config#placeholder_line` at plugin level - [@dblock](https://github.com/dblock).

data/Dangerfile

@@ -1,3 +1,4 @@
 # danger.systems
 
+toc.check!
 changelog.check!

data/Gemfile

@@ -1,3 +1,17 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development, :test do
+  gem 'activesupport'
+  gem 'bundler'
+  gem 'danger-toc', '~> 0.2.0'
+  gem 'guard', '~> 2.14'
+  gem 'guard-rspec', '~> 4.7'
+  gem 'listen', '3.0.7'
+  gem 'pry'
+  gem 'rake', '~> 10.0'
+  gem 'rspec', '~> 3.4'
+  gem 'rubocop', '~> 0.73.0'
+  gem 'yard', '~> 0.9.11'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Daniel Doubrovkine <dblock@dblock.org>
+Copyright (c) 2016-2019 Daniel Doubrovkine <dblock@dblock.org>
 
 MIT License
 

data/README.md

@@ -1,4 +1,4 @@
-# danger-changelog
+# Danger-Changelog
 
 A plugin for [danger.systems](http://danger.systems) that obsessive-compulsively lints your project’s `CHANGELOG.md`.
 It can make sure, for example, that changes are attributed properly, have a valid version number, a date in the ISO8601 format, balanced parenthesis and brackets, and that they’re always terminated with a period.
@@ -6,6 +6,23 @@ It can make sure, for example, that changes are attributed properly, have a vali
 [![Gem Version](https://badge.fury.io/rb/danger-changelog.svg)](https://badge.fury.io/rb/danger-changelog)
 [![Build Status](https://travis-ci.org/dblock/danger-changelog.svg?branch=master)](https://travis-ci.org/dblock/danger-changelog)
 
+# Table of Contents
+
+- [What’s a correctly formatted CHANGELOG file?](#whats-a-correctly-formatted-changelog-file)
+- [Installation](#installation)
+- [Usage](#usage)
+- [Configuration](#configuration)
+  - [changelog.filename](#changelogfilename)
+  - [changelog.format](#changelogformat)
+  - [changelog.placeholder_line](#changelogplaceholder_line)
+  - [changelog.ignore_files](#changelogignore_files)
+- [Checks](#checks)
+  - [changelog.check!](#changelogcheck)
+    - [changelog.have_you_updated_changelog?](#changeloghave_you_updated_changelog)
+    - [changelog.is_changelog_format_correct?](#changelogis_changelog_format_correct)
+- [Contributing](#contributing)
+- [Copyright](#copyright)
+
 ## What's a correctly formatted CHANGELOG file?
 
 By design, `danger-changelog` is quite strict with what it allows as a valid changelog file, using the [Intridea style](doc/intridea.md), [used by this library itself](CHANGELOG.md). It also supports the [Keep a Changelog](doc/keep_a_changelog.md) format.
@@ -90,6 +107,6 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 
 ## Copyright
 
-Copyright (c) Daniel Doubrovkine, 2016
+Copyright (c) Daniel Doubrovkine, 2016-2019
 
 MIT License, see [LICENSE](LICENSE.txt) for details.

data/danger-changelog.gemspec

@@ -18,15 +18,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
-
-  spec.add_development_dependency 'activesupport'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'guard', '~> 2.14'
-  spec.add_development_dependency 'guard-rspec', '~> 4.7'
-  spec.add_development_dependency 'listen', '3.0.7'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'rubocop', '~> 0.61.1'
-  spec.add_development_dependency 'yard', '~> 0.9.11'
 end

data/lib/changelog/changelog_file.rb

@@ -14,8 +14,10 @@ module Danger
         parser.add_listener(self)
       end
 
-      def add_bad_line(line)
-        @bad_lines << line
+      def add_bad_line(line, detail = nil)
+        return unless line || detail
+
+        @bad_lines << [line, detail].compact
       end
 
       def add_global_failure(message)
@@ -38,7 +40,7 @@ module Danger
       end
 
       def exists?
-        !!@exists
+        @exists
       end
 
       def bad?

data/lib/changelog/changelog_line/changelog_entry_line.rb

@@ -5,10 +5,26 @@ module Danger
     # A CHANGELOG.md line represents the change entry.
     class ChangelogEntryLine < ChangelogLine
       def valid?
-        return false unless balanced?(line)
+        return validation_result.valid? if validation_result
+
+        @validation_result = Parsers::ValidationResult.new
+
+        validation_result.error! 'too many parenthesis' unless balanced?(line)
+        return false if validation_result.invalid?
+
         return true if line =~ %r{^\*\s[\`[:upper:]].*[^.,] \- \[\@[\w\d\-\_]+\]\(https:\/\/github\.com\/.*[\w\d\-\_]+\).$}
         return true if line =~ %r{^\*\s\[\#\d+\]\(https:\/\/github\.com\/.*\d+\)\: [\`[:upper:]].*[^.,] \- \[\@[\w\d\-\_]+\]\(https:\/\/github\.com\/.*[\w\d\-\_]+\).$}
 
+        validation_result.error! 'does not start with a star' unless ChangelogEntryLine.starts_with_star?(line)
+        validation_result.error! 'does not include a pull request link' unless ChangelogEntryLine.with_pr_link?(line)
+        validation_result.error! 'does not have a description' unless ChangelogEntryLine.with_changelog_description?(line)
+        validation_result.error! 'does not include an author link' unless ChangelogEntryLine.with_author_link?(line)
+        validation_result.error! 'has an extra trailing space' if ChangelogEntryLine.ends_with_space?(line)
+        validation_result.error! 'is missing a period at the end of the line' unless ChangelogEntryLine.ends_with_period?(line)
+        validation_result.error! 'has an extra period or comma at the end of the description' if
+          line =~ %r{^\*\s[\`[:upper:]].*[.,] \- \[\@[\w\d\-\_]+\]\(https:\/\/github\.com\/.*[\w\d\-\_]+\).$} ||
+          line =~ %r{^\*\s\[\#\d+\]\(https:\/\/github\.com\/.*\d+\)\: [\`[:upper:]].*[.,] \- \[\@[\w\d\-\_]+\]\(https:\/\/github\.com\/.*[\w\d\-\_]+\).$}
+
         false
       end
 
@@ -40,6 +56,20 @@ module Danger
         false
       end
 
+      # checks whether line ends with a space
+      def self.ends_with_space?(line)
+        return true if line =~ /[[:blank:]]\n$/
+
+        false
+      end
+
+      # checks whether line ends with a period
+      def self.ends_with_period?(line)
+        return true if line =~ /\.\n$/
+
+        false
+      end
+
       # checks whether line contains a MARKDOWN  link to a PR
       def self.with_pr_link?(line)
         return true if line =~ %r{\[\#\d+\]\(http[s]?:\/\/github\.com\/.*\d+[\/]?\)}

data/lib/changelog/changelog_line/changelog_line.rb

@@ -7,9 +7,11 @@ module Danger
       DELIMITER = /[(){}\[\]]/.freeze
 
       attr_accessor :line
+      attr_accessor :validation_result
 
       def initialize(line)
         self.line = line
+        self.validation_result = nil
       end
 
       # Match the line with the validation rules

data/lib/changelog/changelog_line/changelog_line_parser.rb

@@ -16,12 +16,12 @@ module Danger
         changelog_line_class.new(line)
       end
 
-      private_class_method
-
       def self.available_changelog_lines
         # Order is important
         [ChangelogPlaceholderLine, ChangelogEntryLine, ChangelogHeaderLine]
       end
+
+      private_class_method :available_changelog_lines
     end
   end
 end

data/lib/changelog/config.rb

@@ -1,7 +1,7 @@
 module Danger
   module Changelog
     module Config
-      extend self
+      module_function
 
       ATTRIBUTES = %i[
         placeholder_line
@@ -14,7 +14,9 @@ module Danger
 
       DELEGATORS = ATTRIBUTES + ACCESSORS
 
-      attr_accessor(*Config::ATTRIBUTES)
+      class << self
+        attr_accessor(*Config::ATTRIBUTES)
+      end
 
       def placeholder_line=(value)
         if value

data/lib/changelog/gem_version.rb

@@ -1,3 +1,3 @@
 module Changelog
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/lib/changelog/parsers.rb

@@ -1,4 +1,5 @@
 require 'changelog/parsers/base'
+require 'changelog/parsers/validation_result'
 require 'changelog/parsers/intridea_format'
 require 'changelog/parsers/keep_a_changelog'
 

data/lib/changelog/parsers/base.rb

@@ -14,8 +14,8 @@ module Danger
 
         private
 
-        def notify_of_bad_line(message)
-          listeners.each { |changelog| changelog.add_bad_line(message) }
+        def notify_of_bad_line(message, detail = nil)
+          listeners.each { |changelog| changelog.add_bad_line(message, detail) }
         end
 
         def notify_of_global_failure(message)

data/lib/changelog/parsers/intridea_format.rb

@@ -18,7 +18,8 @@ module Danger
             changelog_line = ChangelogLineParser.parse(line)
 
             if changelog_line.nil? || changelog_line.invalid?
-              notify_of_bad_line line
+              detail = changelog_line.validation_result.to_s if changelog_line.validation_result&.invalid?
+              notify_of_bad_line line, detail
               next
             end
 

data/lib/changelog/parsers/keep_a_changelog.rb

@@ -16,7 +16,7 @@ module Danger
             notify_of_global_failure(
               'The changelog is missing the version header for the Keep A ' \
               'Changelog format. See <https://keepachangelog.com> to see ' \
-              'the format of the header'
+              'the format of the header.'
             )
           end
 
@@ -42,7 +42,7 @@ module Danger
           lines.each do |line|
             line = line.chomp
 
-            if /##?[^#]/.match?(line)
+            if /^##?[^#]/.match?(line)
               blocks << block.dup unless block.empty?
               block.clear
             end

data/lib/changelog/parsers/validation_result.rb

@@ -0,0 +1,31 @@
+module Danger
+  module Changelog
+    module Parsers
+      class ValidationResult
+        def initialize
+          @errors = []
+        end
+
+        attr_reader :errors
+
+        def valid?
+          errors.empty?
+        end
+
+        def invalid?
+          !valid?
+        end
+
+        def error!(message)
+          errors << message
+        end
+
+        def to_s
+          return nil if valid?
+
+          errors.join(', ')
+        end
+      end
+    end
+  end
+end

data/lib/changelog/plugin.rb

@@ -75,15 +75,16 @@ module Danger
       if changelog_file.exists?
         changelog_file.parse
         changelog_file.bad_lines.each do |line|
-          markdown <<-MARKDOWN
-```markdown
-#{line}```
+          markdown <<~MARKDOWN
+            ```markdown
+            #{line.map(&:strip).join("\n")}
+            ```
           MARKDOWN
         end
         messaging.fail(parser.bad_line_message(filename), sticky: false) if changelog_file.bad_lines?
 
         changelog_file.global_failures.each do |failure|
-          messaging.fail(failure, sticy: false)
+          messaging.fail(failure, sticky: false)
         end
 
         changelog_file.good?
@@ -96,12 +97,12 @@ module Danger
     private
 
     def warn_update_changelog
-      markdown <<-MARKDOWN
-Here's an example of a #{filename} entry:
+      markdown <<~MARKDOWN
+        Here's an example of a #{filename} entry:
 
-```markdown
-#{Danger::Changelog::ChangelogEntryLine.example(github)}
-```
+        ```markdown
+        #{Danger::Changelog::ChangelogEntryLine.example(github)}
+        ```
       MARKDOWN
       warn "Unless you're refactoring existing code or improving documentation, please update #{filename}.", sticky: false
     end

data/spec/changelog_spec.rb

@@ -1,312 +1,146 @@
-require File.expand_path('spec_helper', __dir__)
+require 'spec_helper'
 
 describe Danger::Changelog do
-  it 'is a Danger plugin' do
-    expect(Danger::DangerChangelog.new(nil)).to be_a Danger::Plugin
-  end
-
-  describe 'with Dangerfile' do
-    let(:filename) { File.expand_path('fixtures/changelogs/minimal.md', __dir__) }
-    let(:dangerfile) { testing_dangerfile }
-    let(:changelog) do
-      dangerfile.changelog.filename = filename
-      dangerfile.changelog
-    end
-    let(:status_report) { changelog.status_report }
-
-    describe 'config' do
-      it 'placeholder_line' do
-        expect(changelog.placeholder_line).to eq "* Your contribution here.\n"
-      end
+  let(:dangerfile) { testing_dangerfile }
+  let(:changelog) {  dangerfile.changelog }
+  let(:status_report) { changelog.status_report }
+
+  describe 'in a PR' do
+    before do
+      changelog.env.request_source.pr_json = {
+        'number' => 123,
+        'title' => 'being dangerous',
+        'html_url' => 'https://github.com/dblock/danger-changelog/pull/123',
+        'user' => {
+          'login' => 'dblock'
+        }
+      }
     end
 
-    describe 'in a PR' do
-      before do
-        # typical PR JSON looks like https://raw.githubusercontent.com/danger/danger/bffc246a11dac883d76fc6636319bd6c2acd58a3/spec/fixtures/pr_response.json
-        changelog.env.request_source.pr_json = {
-          'number' => 123,
-          'title' => 'being dangerous',
-          'html_url' => 'https://github.com/dblock/danger-changelog/pull/123',
-          'user' => {
-            'login' => 'dblock'
-          }
-        }
+    context 'check!' do
+      subject do
+        changelog.check!
       end
 
-      context 'have_you_updated_changelog?' do
-        subject do
-          changelog.have_you_updated_changelog?
+      context 'without CHANGELOG changes' do
+        before do
+          allow(changelog.git).to receive(:modified_files).and_return(['some-file.txt'])
+          allow(changelog.git).to receive(:added_files).and_return(['some-file.txt'])
         end
 
-        context 'without CHANGELOG changes' do
-          context 'when something was modified' do
-            before do
-              allow(changelog.git).to receive(:modified_files).and_return(['some-file.txt'])
-              allow(changelog.git).to receive(:added_files).and_return(['another-file.txt'])
-            end
-
-            it 'complains when no CHANGELOG can be found' do
-              expect(subject).to be false
-              expect(status_report[:errors]).to eq []
-              expect(status_report[:warnings]).to eq ["Unless you're refactoring existing code or improving documentation, please update #{filename}."]
-              expect(status_report[:markdowns].map(&:message)).to eq ["Here's an example of a #{filename} entry:\n\n```markdown\n* [#123](https://github.com/dblock/danger-changelog/pull/123): Being dangerous - [@dblock](https://github.com/dblock).\n```\n"]
-            end
-          end
-
-          context 'with a README.md' do
-            before do
-              allow(changelog.git).to receive(:modified_files).and_return(['README.md'])
-              allow(changelog.git).to receive(:added_files).and_return([])
-            end
-            it 'has no complaints' do
-              expect(subject).to be true
-              expect(status_report[:errors]).to eq []
-              expect(status_report[:warnings]).to eq []
-              expect(status_report[:markdowns]).to eq []
-            end
-          end
-
-          context 'with files being ignored' do
-            context 'name' do
-              before do
-                changelog.ignore_files = ['WHATEVER.md']
-                allow(changelog.git).to receive(:modified_files).and_return(['WHATEVER.md'])
-                allow(changelog.git).to receive(:added_files).and_return([])
-              end
-
-              it 'has no complaints' do
-                expect(subject).to be true
-                expect(status_report[:errors]).to eq []
-                expect(status_report[:warnings]).to eq []
-                expect(status_report[:markdowns]).to eq []
-              end
-            end
-            context 'mixed' do
-              before do
-                changelog.ignore_files = ['WHATEVER.md', /\.txt$/]
-                allow(changelog.git).to receive(:modified_files).and_return(['WHATEVER.md'])
-                allow(changelog.git).to receive(:added_files).and_return(['one.txt', 'two.txt'])
-              end
-
-              it 'has no complaints' do
-                expect(subject).to be true
-                expect(status_report[:errors]).to eq []
-                expect(status_report[:warnings]).to eq []
-                expect(status_report[:markdowns]).to eq []
-              end
-            end
-          end
+        it 'complains when no CHANGELOG can be found' do
+          expect(subject).to be false
+          expect(status_report[:errors]).to eq []
+          expect(status_report[:warnings]).to eq ["Unless you're refactoring existing code or improving documentation, please update CHANGELOG.md."]
+          expect(status_report[:markdowns].map(&:message)).to eq ["Here's an example of a CHANGELOG.md entry:\n\n```markdown\n* [#123](https://github.com/dblock/danger-changelog/pull/123): Being dangerous - [@dblock](https://github.com/dblock).\n```\n"]
         end
+      end
 
-        context 'with a new CHANGELOG' do
-          before do
-            allow(changelog.git).to receive(:modified_files).and_return([])
-            allow(changelog.git).to receive(:added_files).and_return([filename])
-          end
-
-          it 'has no complaints' do
-            expect(subject).to be true
-            expect(status_report[:errors]).to eq []
-            expect(status_report[:warnings]).to eq []
-            expect(status_report[:markdowns]).to eq []
-          end
+      context 'with CHANGELOG changes' do
+        before do
+          allow(changelog.git).to receive(:modified_files).and_return([changelog.filename])
+          allow(changelog.git).to receive(:added_files).and_return([])
         end
 
-        context 'with CHANGELOG changes' do
-          before do
-            allow(changelog.git).to receive(:modified_files).and_return([filename])
-            allow(changelog.git).to receive(:added_files).and_return([])
-          end
-
-          it 'has no complaints' do
-            expect(subject).to be true
-            expect(status_report[:errors]).to eq []
-            expect(status_report[:warnings]).to eq []
-            expect(status_report[:markdowns]).to eq []
-          end
+        it 'has no complaints' do
+          expect(subject).to be true
+          expect(status_report[:errors]).to eq []
+          expect(status_report[:warnings]).to eq []
+          expect(status_report[:markdowns]).to eq []
         end
       end
+    end
 
-      context 'is_changelog_format_correct?' do
-        subject do
-          changelog.format = Danger::Changelog::Parsers.default_format
-          changelog.is_changelog_format_correct?
-        end
+    context 'have_you_updated_changelog?' do
+      subject do
+        changelog.have_you_updated_changelog?
+      end
 
-        context 'without a CHANGELOG file' do
-          let(:filename) { 'does-not-exist' }
-          it 'complains' do
+      context 'without CHANGELOG changes' do
+        context 'when something was modified' do
+          before do
+            allow(changelog.git).to receive(:modified_files).and_return(['some-file.txt'])
+            allow(changelog.git).to receive(:added_files).and_return(['another-file.txt'])
+          end
+
+          it 'complains when no CHANGELOG can be found' do
             expect(subject).to be false
-            expect(status_report[:errors]).to eq ['The does-not-exist file does not exist.']
+            expect(status_report[:errors]).to eq []
+            expect(status_report[:warnings]).to eq ["Unless you're refactoring existing code or improving documentation, please update #{changelog.filename}."]
+            expect(status_report[:markdowns].map(&:message)).to eq ["Here's an example of a #{changelog.filename} entry:\n\n```markdown\n* [#123](https://github.com/dblock/danger-changelog/pull/123): Being dangerous - [@dblock](https://github.com/dblock).\n```\n"]
           end
         end
 
-        context 'with CHANGELOG changes' do
+        context 'with a README.md' do
           before do
-            allow(changelog.git).to receive(:modified_files).and_return([filename])
+            allow(changelog.git).to receive(:modified_files).and_return(['README.md'])
             allow(changelog.git).to receive(:added_files).and_return([])
           end
-
           it 'has no complaints' do
             expect(subject).to be true
             expect(status_report[:errors]).to eq []
             expect(status_report[:warnings]).to eq []
             expect(status_report[:markdowns]).to eq []
           end
+        end
 
-          context 'customized' do
+        context 'with files being ignored' do
+          context 'name' do
             before do
-              changelog.placeholder_line = "* Nothing yet.\n"
+              changelog.ignore_files = ['WHATEVER.md']
+              allow(changelog.git).to receive(:modified_files).and_return(['WHATEVER.md'])
+              allow(changelog.git).to receive(:added_files).and_return([])
             end
 
-            let(:filename) { File.expand_path('fixtures/changelogs/customized.md', __dir__) }
-            it 'is ok' do
+            it 'has no complaints' do
               expect(subject).to be true
               expect(status_report[:errors]).to eq []
               expect(status_report[:warnings]).to eq []
               expect(status_report[:markdowns]).to eq []
             end
           end
-
-          context 'missing your contribution here' do
-            let(:filename) { File.expand_path('fixtures/changelogs/missing_your_contribution_here.md', __dir__) }
-
-            context 'when placeholder line is customized' do
-              before do
-                changelog.placeholder_line = "* Nothing yet.\n"
-              end
-
-              it 'complains' do
-                expect(subject).to be false
-                expect(status_report[:errors]).to eq ["Please put back the `* Nothing yet.` line into #{filename}."]
-                expect(status_report[:warnings]).to eq []
-                expect(status_report[:markdowns]).to eq []
-              end
-            end
-
-            context 'when placeholder line is default' do
-              it 'complains' do
-                expect(subject).to be false
-                expect(status_report[:errors]).to eq ["Please put back the `* Your contribution here.` line into #{filename}."]
-                expect(status_report[:warnings]).to eq []
-                expect(status_report[:markdowns]).to eq []
-              end
+          context 'mixed' do
+            before do
+              changelog.ignore_files = ['WHATEVER.md', /\.txt$/]
+              allow(changelog.git).to receive(:modified_files).and_return(['WHATEVER.md'])
+              allow(changelog.git).to receive(:added_files).and_return(['one.txt', 'two.txt'])
             end
 
-            context 'when placeholder line is nil' do
-              before do
-                changelog.placeholder_line = nil
-              end
-
-              it 'is ok' do
-                expect(subject).to be true
-                expect(status_report[:errors]).to eq []
-                expect(status_report[:warnings]).to eq []
-                expect(status_report[:markdowns]).to eq []
-              end
-            end
-          end
-
-          context 'minimal example' do
-            let(:filename) { File.expand_path('fixtures/changelogs/minimal.md', __dir__) }
-            it 'is ok' do
+            it 'has no complaints' do
               expect(subject).to be true
               expect(status_report[:errors]).to eq []
               expect(status_report[:warnings]).to eq []
               expect(status_report[:markdowns]).to eq []
             end
-
-            context 'when placeholder line is nil' do
-              before do
-                changelog.placeholder_line = nil
-              end
-
-              it 'complains' do
-                expect(subject).to be false
-                expect(status_report[:errors]).to eq ["One of the lines below found in #{filename} doesn't match the [expected format](https://github.com/dblock/danger-changelog/blob/master/README.md#whats-a-correctly-formatted-changelog-file). Please make it look like the other lines, pay attention to version numbers, periods, spaces and date formats."]
-                expect(status_report[:warnings]).to eq []
-                expect(status_report[:markdowns].map(&:message)).to eq [
-                  "```markdown\n* Your contribution here.\n```\n"
-                ]
-              end
-            end
-          end
-
-          context 'with bad lines' do
-            let(:filename) { File.expand_path('fixtures/changelogs/lines.md', __dir__) }
-            it 'complains' do
-              expect(subject).to be false
-              expect(status_report[:errors]).to eq ["One of the lines below found in #{filename} doesn't match the [expected format](https://github.com/dblock/danger-changelog/blob/master/README.md#whats-a-correctly-formatted-changelog-file). Please make it look like the other lines, pay attention to version numbers, periods, spaces and date formats."]
-              expect(status_report[:warnings]).to eq []
-              expect(status_report[:markdowns].map(&:message)).to eq [
-                "```markdown\nMissing star - [@dblock](https://github.com/dblock).\n```\n",
-                "```markdown\n* [#1](https://github.com/dblock/danger-changelog/pull/1) - Not a colon - [@dblock](https://github.com/dblock).\n```\n",
-                "```markdown\n* [#1](https://github.com/dblock/danger-changelog/pull/1): No final period - [@dblock](https://github.com/dblock)\n```\n",
-                "```markdown\n# [#1](https://github.com/dblock/danger-changelog/pull/1): Hash instead of star - [@dblock](https://github.com/dblock).\n```\n",
-                "```markdown\n* [#1](https://github.com/dblock/danger-changelog/pull/1): Extra period. - [@dblock](https://github.com/dblock).\n```\n",
-                "```markdown\n* [#1](https://github.com/dblock/danger-changelog/pull/1): Unbalanced ( - [@dblock](https://github.com/dblock).\n```\n",
-                "```markdown\n* [#1](https://github.com/dblock/danger-changelog/pull/1): Unbalanced ] - [@dblock](https://github.com/dblock).\n```\n"
-              ]
-            end
           end
         end
       end
-    end
-  end
-
-  describe 'with the Keep a Changelog format' do
-    let(:filename) { File.expand_path('fixtures/changelogs/keep_a_changelog.md', __dir__) }
-    let(:dangerfile) { testing_dangerfile }
-    let(:changelog) do
-      dangerfile.changelog.format = :keep_a_changelog
-      dangerfile.changelog.filename = filename
-      dangerfile.changelog
-    end
-    let(:status_report) { changelog.status_report }
-
-    describe 'in a PR' do
-      before do
-        changelog.env.request_source.pr_json = {
-          'number' => 123,
-          'title' => 'being dangerous',
-          'html_url' => 'https://github.com/dblock/danger-changelog/pull/123',
-          'user' => {
-            'login' => 'dblock'
-          }
-        }
-      end
 
-      context '#check!' do
-        subject do
-          changelog.check!
+      context 'with a new CHANGELOG' do
+        before do
+          allow(changelog.git).to receive(:modified_files).and_return([])
+          allow(changelog.git).to receive(:added_files).and_return([changelog.filename])
         end
 
-        context 'without CHANGELOG changes' do
-          before do
-            allow(changelog.git).to receive(:modified_files).and_return(['some-file.txt'])
-            allow(changelog.git).to receive(:added_files).and_return(['some-file.txt'])
-          end
-
-          it 'complains when no CHANGELOG can be found' do
-            expect(subject).to be false
-            expect(status_report[:errors]).to eq []
-            expect(status_report[:warnings]).to eq ["Unless you're refactoring existing code or improving documentation, please update #{filename}."]
-            expect(status_report[:markdowns].map(&:message)).to eq ["Here's an example of a #{filename} entry:\n\n```markdown\n* [#123](https://github.com/dblock/danger-changelog/pull/123): Being dangerous - [@dblock](https://github.com/dblock).\n```\n"]
-          end
+        it 'has no complaints' do
+          expect(subject).to be true
+          expect(status_report[:errors]).to eq []
+          expect(status_report[:warnings]).to eq []
+          expect(status_report[:markdowns]).to eq []
         end
+      end
 
-        context 'with CHANGELOG changes' do
-          before do
-            allow(changelog.git).to receive(:modified_files).and_return([filename])
-            allow(changelog.git).to receive(:added_files).and_return([])
-          end
+      context 'with CHANGELOG changes' do
+        before do
+          allow(changelog.git).to receive(:modified_files).and_return([changelog.filename])
+          allow(changelog.git).to receive(:added_files).and_return([])
+        end
 
-          it 'has no complaints' do
-            expect(subject).to be true
-            expect(status_report[:errors]).to eq []
-            expect(status_report[:warnings]).to eq []
-            expect(status_report[:markdowns]).to eq []
-          end
+        it 'has no complaints' do
+          expect(subject).to be true
+          expect(status_report[:errors]).to eq []
+          expect(status_report[:warnings]).to eq []
+          expect(status_report[:markdowns]).to eq []
         end
       end
     end