danger-commit_lint 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8cbe2ac467463b1a4ed6bdd55beb2a39d991517d
-  data.tar.gz: 3cd3091eb64b256b808ba757fa8769b4c7333368
+SHA256:
+  metadata.gz: 1d04af0c59f5c77e1ac87f91e0fb2a8cf40f4f81331c8e6880b76b5cd50a6e7e
+  data.tar.gz: 4ade3c85445d13bd8a8373d9658657f206d66d51553a21364af94f5b724ffc9a
 SHA512:
-  metadata.gz: f3755d483cec1c678c406a55c3f9fa465e9780a59c6a59ce419c9e4414b0693e259ed476027232f7adbb35db12455b6d90d9ac0ef05808c93ef6ca92cbc8352b
-  data.tar.gz: dcb200e7dcb02000d1295f7b9671bcb396b83dc7ce3cd827b4148cff2e67f031ae2c57c93294b4802ebb5a2cff55ad13e4d5f8ca44e23630e39e80cbcfdd6b11
+  metadata.gz: d4d4f5210310603318820dd00e0d8a57ad08112963794ad86d1592561aac692aefd7f8362f3b1794f49a69895d2509ee23f0caf40315d903d223e7afd83f0969
+  data.tar.gz: 9209e4e1d275d418035202c24442a41622eac7d7d63be97d784092002a9e0b92f4142b6d211567d287f5ec5b8f02399cc97c524ca3c65cdd4ed7c6256a85349b

data/.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
-pkg
 .idea/
-Gemfile.lock
-.ruby-version
 .ruby-gemset
+.ruby-version
 .yardoc/
+Gemfile.lock
+pkg

data/.travis.yml

@@ -3,10 +3,10 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.2
-  - 2.3.3
-  - 2.4.0
-  - jruby-9
+  - 2.4.5
+  - 2.5.5
+  - 2.6.2
+  - jruby-9.2.6.0
 
 script:
   - bundle exec rake

data/CHANGELOG.md

@@ -10,7 +10,22 @@ The format is based on [Keep a Changelog][keep] and this project adheres to
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/jonallured/danger-commit_lint/compare/v0.0.6...master
+[Unreleased]: https://github.com/jonallured/danger-commit_lint/compare/v0.0.7...master
+
+## [0.0.7] - 2019-03-29
+
+### Changed
+
+* Ignore git generated subject in commit messages [#21][]
+* Express danger plugin dependency in terms of plugin api [#24][]
+
+[0.0.7]: https://github.com/jonallured/danger-commit_lint/compare/v0.0.6...v0.0.7
+[#21]: https://github.com/jonallured/danger-commit_lint/pull/21
+[#24]: https://github.com/jonallured/danger-commit_lint/pull/24
+
+### Removed
+
+* Drop Ruby 2.3 from Travis [1aa9cff][1aa9cff]
 
 ## [0.0.6] - 2017-04-27
 

data/README.md

@@ -28,7 +28,7 @@ commit_lint.check
 That will check each commit in the PR to ensure the following is true:
 
 * Commit subject begins with a capital letter (`subject_cap`)
-* Commit subject is more than one word (`subject_word`)
+* Commit subject is more than one word (`subject_words`)
 * Commit subject is no longer than 50 characters (`subject_length`)
 * Commit subject does not end in a period (`subject_period`)
 * Commit subject and body are separated by an empty line (`empty_line`)

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:spec, :rubocop, :spec_docs]
+task default: %i[rubocop spec spec_docs]
 
 desc 'Run RuboCop on the lib/specs directory'
 RuboCop::RakeTask.new(:rubocop) do |task|

data/danger-commit_lint.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'commit_lint/gem_version.rb'
 
@@ -13,17 +12,17 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/jonallured/danger-commit_lint'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'danger', '~> 5.0'
+  spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency "rubocop", "~> 0.41"
-  spec.add_development_dependency "yard", "~> 0.8"
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'yard'
 end

data/lib/commit_lint/gem_version.rb

@@ -1,3 +1,3 @@
 module CommitLint
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

data/lib/commit_lint/plugin.rb

@@ -113,6 +113,7 @@ module Danger
 
     def warning_checks
       return checks if @config[:warn] == :all
+
       @config[:warn] || []
     end
 

data/lib/commit_lint/subject_length_check.rb

@@ -2,6 +2,10 @@ module Danger
   class DangerCommitLint < Plugin
     class SubjectLengthCheck < CommitCheck # :nodoc:
       MESSAGE = 'Please limit commit subject line to 50 characters.'.freeze
+      GIT_GENERATED_SUBJECT = /^Merge branch \'.+\' into\ /.freeze
+      GITHUB_GENERATED_SUBJECT = /^Merge pull request #\d+ from\ /.freeze
+
+      attr_reader :subject
 
       def self.type
         :subject_length
@@ -12,7 +16,11 @@ module Danger
       end
 
       def fail?
-        @subject.length > 50
+        subject.length > 50 && !merge_commit?
+      end
+
+      def merge_commit?
+        subject =~ /#{GIT_GENERATED_SUBJECT}|#{GITHUB_GENERATED_SUBJECT}/
       end
     end
   end

data/spec/commit_lint_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('spec_helper', __dir__)
 
 # rubocop:disable Metrics/LineLength
 
@@ -9,7 +9,7 @@ TEST_MESSAGES = {
   subject_period: 'This subject line ends in a period.',
   empty_line: "This subject line is fine\nBut then I forgot the empty line separating the subject and the body.",
   all_errors: "this is a really long subject and it even ends in a period.\nNot to mention the missing empty line!",
-  valid:  "This is a valid message\n\nYou can tell because it meets all the criteria and the linter does not complain."
+  valid: "This is a valid message\n\nYou can tell because it meets all the criteria and the linter does not complain."
 }.freeze
 
 # rubocop:enable Metrics/LineLength

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'pathname'
-ROOT = Pathname.new(File.expand_path('../../', __FILE__))
+ROOT = Pathname.new(File.expand_path('..', __dir__))
 $LOAD_PATH.unshift((ROOT + 'lib').to_s)
 $LOAD_PATH.unshift((ROOT + 'spec').to_s)
 

data/spec/subject_length_check_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path('spec_helper', __dir__)
+
+describe Danger::DangerCommitLint::SubjectLengthCheck do
+  describe '#fail?' do
+    let(:commit_subject) { 'This is a common valid commit message' }
+
+    let(:message) do
+      {
+        subject: commit_subject
+      }
+    end
+
+    subject do
+      described_class.new(message).fail?
+    end
+
+    it { expect(subject).to be_falsy }
+
+    context 'when message is invalid' do
+      let(:commit_subject) do
+        'This is a really long subject line and should result in an error'
+      end
+
+      it { expect(subject).to be_truthy }
+    end
+
+    context 'when message is a merge commit generated by git' do
+      let(:commit_subject) do
+        "Merge branch 'ignore-length-on-git-merge-commits' into master"
+      end
+
+      it { expect(subject).to be_falsy }
+    end
+
+    context 'when message is a merge commit generated by GitHub' do
+      let(:commit_subject) do
+        'Merge pull request #1234 from jonallured/ignore-length-merge-commits'
+      end
+
+      it { expect(subject).to be_falsy }
+    end
+  end
+end

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: danger-commit_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jon Allured
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: danger
+  name: danger-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,49 +53,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,6 +137,7 @@ files:
 - lib/danger_plugin.rb
 - spec/commit_lint_spec.rb
 - spec/spec_helper.rb
+- spec/subject_length_check_spec.rb
 homepage: https://github.com/jonallured/danger-commit_lint
 licenses:
 - MIT
@@ -156,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Danger Plugin that ensure commit messages are not too long, don't end in
@@ -165,3 +165,4 @@ summary: A Danger Plugin that ensure commit messages are not too long, don't end
 test_files:
 - spec/commit_lint_spec.rb
 - spec/spec_helper.rb
+- spec/subject_length_check_spec.rb