From d5144b728106ae92ad8f1d17af3f1c63c39cf2a1 Mon Sep 17 00:00:00 2001 From: Nikita Bulai Date: Thu, 4 Oct 2018 12:40:19 +0300 Subject: [PATCH] [ci skip] danger --- Dangerfile | 29 +++++++++++++++++-- .../doorkeeper/application_controller.rb | 2 ++ .../application_metal_controller.rb | 2 ++ .../doorkeeper/applications_controller.rb | 2 ++ .../doorkeeper/authorizations_controller.rb | 2 ++ .../authorized_applications_controller.rb | 2 ++ .../doorkeeper/token_info_controller.rb | 2 ++ .../doorkeeper/tokens_controller.rb | 2 ++ app/helpers/doorkeeper/dashboard_helper.rb | 2 ++ app/validators/redirect_uri_validator.rb | 2 ++ doorkeeper.gemspec | 1 - lib/doorkeeper/engine.rb | 2 ++ 12 files changed, 46 insertions(+), 4 deletions(-) diff --git a/Dangerfile b/Dangerfile index b75f44d5f..d10260cba 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1,5 +1,18 @@ -Danger::Changelog.configure do |config| - config.filename = 'NEWS.md' +CHANGELOG_FILE = 'NEWS.md' +GITHUB_REPO = 'https://github.com/doorkeeper-gem/doorkeeper' + +def changelog_changed? + git.modified_files.include?(CHANGELOG_FILE) || git.added_files.include?(CHANGELOG_FILE) +end + +def changelog_entry_example + pr_number = github.pr_json['number'] + pr_url = github.pr_json['html_url'] + pr_title = github.pr_title + .sub(/[?.!,;]?$/, '') + .capitalize + + "- [##{pr_number}](#{pr_url}): #{pr_title}." end # -------------------------------------------------------------------------------------------------------------------- @@ -31,4 +44,14 @@ end # -------------------------------------------------------------------------------------------------------------------- # Have you updated CHANGELOG.md? # -------------------------------------------------------------------------------------------------------------------- -changelog.check +# Add a CHANGELOG entry for app changes +if has_app_changes && !changelog_changed? + markdown <<-MARKDOWN +Here's an example of a #{CHANGELOG_FILE} entry: +```markdown +#{changelog_entry_example} +``` + MARKDOWN + + fail("Please include a changelog entry. \nYou can find it at [#{CHANGELOG_FILE}](#{GITHUB_REPO}/blob/master/#{CHANGELOG_FILE}).") +end diff --git a/app/controllers/doorkeeper/application_controller.rb b/app/controllers/doorkeeper/application_controller.rb index e9b4d960f..5d0a10c7d 100644 --- a/app/controllers/doorkeeper/application_controller.rb +++ b/app/controllers/doorkeeper/application_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper class ApplicationController < Doorkeeper.configuration.base_controller.constantize diff --git a/app/controllers/doorkeeper/application_metal_controller.rb b/app/controllers/doorkeeper/application_metal_controller.rb index dac3e0d05..167cd210e 100644 --- a/app/controllers/doorkeeper/application_metal_controller.rb +++ b/app/controllers/doorkeeper/application_metal_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper class ApplicationMetalController < ActionController::Metal MODULES = [ diff --git a/app/controllers/doorkeeper/applications_controller.rb b/app/controllers/doorkeeper/applications_controller.rb index 550368271..e4a2bf914 100644 --- a/app/controllers/doorkeeper/applications_controller.rb +++ b/app/controllers/doorkeeper/applications_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper class ApplicationsController < Doorkeeper::ApplicationController layout 'doorkeeper/admin' unless Doorkeeper.configuration.api_only diff --git a/app/controllers/doorkeeper/authorizations_controller.rb b/app/controllers/doorkeeper/authorizations_controller.rb index ddd27677d..21473849e 100644 --- a/app/controllers/doorkeeper/authorizations_controller.rb +++ b/app/controllers/doorkeeper/authorizations_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper class AuthorizationsController < Doorkeeper::ApplicationController before_action :authenticate_resource_owner! diff --git a/app/controllers/doorkeeper/authorized_applications_controller.rb b/app/controllers/doorkeeper/authorized_applications_controller.rb index 755106029..d56bd4a95 100644 --- a/app/controllers/doorkeeper/authorized_applications_controller.rb +++ b/app/controllers/doorkeeper/authorized_applications_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper class AuthorizedApplicationsController < Doorkeeper::ApplicationController before_action :authenticate_resource_owner! diff --git a/app/controllers/doorkeeper/token_info_controller.rb b/app/controllers/doorkeeper/token_info_controller.rb index 79249d5b7..bdf4ccc73 100644 --- a/app/controllers/doorkeeper/token_info_controller.rb +++ b/app/controllers/doorkeeper/token_info_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper class TokenInfoController < Doorkeeper::ApplicationMetalController def show diff --git a/app/controllers/doorkeeper/tokens_controller.rb b/app/controllers/doorkeeper/tokens_controller.rb index af5134c5c..07033d7e0 100644 --- a/app/controllers/doorkeeper/tokens_controller.rb +++ b/app/controllers/doorkeeper/tokens_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper class TokensController < Doorkeeper::ApplicationMetalController def create diff --git a/app/helpers/doorkeeper/dashboard_helper.rb b/app/helpers/doorkeeper/dashboard_helper.rb index 5925a2e83..23cedab3f 100644 --- a/app/helpers/doorkeeper/dashboard_helper.rb +++ b/app/helpers/doorkeeper/dashboard_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper module DashboardHelper def doorkeeper_errors_for(object, method) diff --git a/app/validators/redirect_uri_validator.rb b/app/validators/redirect_uri_validator.rb index 3e56c5533..8e7f0d6dc 100644 --- a/app/validators/redirect_uri_validator.rb +++ b/app/validators/redirect_uri_validator.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'uri' class RedirectUriValidator < ActiveModel::EachValidator diff --git a/doorkeeper.gemspec b/doorkeeper.gemspec index ea8dd9912..27d46bcec 100644 --- a/doorkeeper.gemspec +++ b/doorkeeper.gemspec @@ -22,7 +22,6 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'capybara', '~> 2.18' gem.add_development_dependency 'coveralls' gem.add_development_dependency 'danger', '~> 5.0' - gem.add_development_dependency 'danger-changelog', '~> 0.3' gem.add_development_dependency 'grape' gem.add_development_dependency 'database_cleaner', '~> 1.6' gem.add_development_dependency 'factory_bot', '~> 4.8' diff --git a/lib/doorkeeper/engine.rb b/lib/doorkeeper/engine.rb index 4834d2b43..6da4ab711 100644 --- a/lib/doorkeeper/engine.rb +++ b/lib/doorkeeper/engine.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Doorkeeper class Engine < Rails::Engine initializer "doorkeeper.params.filter" do |app|