From abf60fa2333d2c24e22b9ca109f7813a8f775edd Mon Sep 17 00:00:00 2001 From: Paddy Date: Wed, 23 Sep 2020 12:40:46 +0530 Subject: [PATCH 1/2] OTWO-6189 Made Branch Mandatory --- lib/ohloh_scm/git/validation.rb | 5 ----- lib/ohloh_scm/validation.rb | 6 ++++-- lib/ohloh_scm/version.rb | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/ohloh_scm/git/validation.rb b/lib/ohloh_scm/git/validation.rb index 24acf7b1..b616095a 100644 --- a/lib/ohloh_scm/git/validation.rb +++ b/lib/ohloh_scm/git/validation.rb @@ -3,11 +3,6 @@ module OhlohScm module Git class Validation < OhlohScm::Validation - def validate - super - @errors << [:branch_name, 'Invalid Branch Name.'] if scm.branch_name.to_s.empty? - end - private def validate_server_connection diff --git a/lib/ohloh_scm/validation.rb b/lib/ohloh_scm/validation.rb index f8597802..cb0d9b4e 100644 --- a/lib/ohloh_scm/validation.rb +++ b/lib/ohloh_scm/validation.rb @@ -26,7 +26,7 @@ def validate_server_connection; end def validate_attributes @errors = [] @errors << url_errors - @errors << branch_name_errors unless scm.branch_name.to_s.empty? + @errors << branch_name_errors @errors << username_errors if scm.username @errors << password_errors if scm.password @errors.compact! @@ -48,7 +48,9 @@ def url_errors # rubocop:enable Metrics/AbcSize def branch_name_errors - if scm.branch_name.length > 80 + if scm.branch_name.to_s.empty? + [:branch_name, 'Invalid Branch Name.'] + elsif scm.branch_name.length > 80 [:branch_name, 'The branch name must not be longer than 80 characters.'] elsif !scm.branch_name.match?(/^[\w^\-\+\.\/\ ]+$/) [:branch_name, "The branch name may contain only letters, numbers, \ diff --git a/lib/ohloh_scm/version.rb b/lib/ohloh_scm/version.rb index af3c8913..bc9f97c8 100644 --- a/lib/ohloh_scm/version.rb +++ b/lib/ohloh_scm/version.rb @@ -2,7 +2,7 @@ module OhlohScm module Version - STRING = '3.0.10' + STRING = '3.0.11' GIT = '2.17.1' SVN = '1.9.7' CVSNT = '2.5.04' From 527f7bb9e4419a853165613d15eb10341b67a1a2 Mon Sep 17 00:00:00 2001 From: Paddy Date: Wed, 23 Sep 2020 12:54:02 +0530 Subject: [PATCH 2/2] OTWO-6189 Removed Rubocop Directive --- lib/ohloh_scm/validation.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/ohloh_scm/validation.rb b/lib/ohloh_scm/validation.rb index cb0d9b4e..c644d5d9 100644 --- a/lib/ohloh_scm/validation.rb +++ b/lib/ohloh_scm/validation.rb @@ -22,7 +22,6 @@ def validate def validate_server_connection; end - # rubocop:disable Metrics/AbcSize def validate_attributes @errors = [] @errors << url_errors @@ -31,7 +30,6 @@ def validate_attributes @errors << password_errors if scm.password @errors.compact! end - # rubocop:enable Metrics/AbcSize # rubocop:disable Metrics/AbcSize def url_errors