danger-samsao 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03220a151b794360af987c44251ffd233e149fa6
-  data.tar.gz: '081d457757e6ca7108968cbdf1c35656222e4b7e'
+  metadata.gz: 00e3c0540e9e427e75712e8754234cff10b9e55f
+  data.tar.gz: 9a4e3b0a4d167ac47b152332766bfd03d47fe067
 SHA512:
-  metadata.gz: 7cce010f0f2cc393b5be15c1e509988724903093eb85fd4128a2c4a53bb566c654dd19e056bb7c309b9c20bb628873c76f13db3a826f5ac9f580253f43996d1c
-  data.tar.gz: 931219f4890eaf3d817b1a29437987ed974c06dd3dcd6075ef8d10bc86a13b3d4c2d793a03e684f62b1b7591f5e74ff20a89926d60a055884664f4612ebe0d26
+  metadata.gz: 37811b9f3e6bef3802e7d2cc31bfc6348a8a410aff106f9278b6aca8785dccfc59136e0157500b47a481c88248dfc4615531ef0391dd12e70eef540ea9a7a42d
+  data.tar.gz: f0b3dae8c0544cf5ba28c3199b3fa9ba1d96d6727e38fd142585a71f4c8bd9929e04196db915cde5669497c29adf6db26f1860e2fef685ad15f72d6baa72cdda

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.3.1 (August 30, 2017)
+
+#### Features
+
+ * Changed the following helpers to support `2.0.0/feature/a` and `other-app/feature/a` branch models:
+    * `feature_branch?`
+    * `fix_branch?`
+    * `release_branch?`
+    * `support_branch?`
+
+ * Added details to error messages to clarify them.
+
 ## 0.3.0 (August 23, 2017)
 
 ### Breaking Changes
@@ -32,16 +44,6 @@
 
  * Added `truncate` helper.
 
- *
-
- *
-
- *
-
- *
-
- *
-
 #### Support
 
  * Fixed grammatical errors in the `README.md`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-samsao (0.3.0)
+    danger-samsao (0.3.1)
       danger-plugin-api (~> 1.0)
 
 GEM

data/lib/samsao/actions.rb

@@ -72,7 +72,7 @@ module Samsao
       return if samsao.trivial_change? || !samsao.feature_branch?
       return report(:fail, 'Your Danger config is missing a `jira_project_key` value.') unless jira_project_key?
 
-      message = 'The PR must starts with JIRA issue number between square brackets'\
+      message = 'The PR title must starts with JIRA issue number between square brackets'\
                 " (i.e. [#{config.jira_project_key}-XXX])."
 
       report(level, message) unless contains_jira_issue_number?(github.pr_title)
@@ -102,7 +102,7 @@ module Samsao
     def check_acceptance_criteria(level = :warn)
       return unless samsao.feature_branch?
 
-      message = 'The PR should have the acceptance criteria in the body.'
+      message = 'The PR description should have the acceptance criteria in the body.'
 
       report(level, message) if (/acceptance criteria/i =~ github.pr_body).nil?
     end
@@ -156,7 +156,7 @@ module Samsao
     def check_commit_contains_jira_issue_number(commit, type)
       commit_id = "#{shorten_sha(commit.sha)} ('#{truncate(commit.message)}')"
       jira_project_key = config.jira_project_key
-      message = "The commit #{commit_id} should contain JIRA issue number" \
+      message = "The commit message #{commit_id} should contain JIRA issue number" \
       " between square brackets (i.e. [#{jira_project_key}-XXX]), multiple allowed" \
       " (i.e. [#{jira_project_key}-XXX, #{jira_project_key}-YYY, #{jira_project_key}-ZZZ])"
 

data/lib/samsao/gem_version.rb

@@ -1,3 +1,3 @@
 module Samsao
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/samsao/helpers.rb

@@ -20,15 +20,16 @@ module Samsao
     # @return [Bool]
     #
     def feature_branch?
-      git_branch.start_with?('feature/')
+      !(%r{^#{GIT_BRANCH_PREFIX}feature/\w} =~ git_branch).nil?
     end
 
-    # Return true if the current PR branch is a bug fix branch.
+    # Return true if the current PR branch is a bug fix branch. Accepts `fix`,
+    # `bugfix`, `hotfix`, `coldfix` and `warmfix`.
     #
     # @return [Bool]
     #
     def fix_branch?
-      !(%r{^(bug|hot)?fix/} =~ git_branch).nil?
+      !(%r{^#{GIT_BRANCH_PREFIX}(bug|cold|warm|hot)?fix/\w} =~ git_branch).nil?
     end
 
     # Return true if the current PR branch is a release branch.
@@ -36,7 +37,7 @@ module Samsao
     # @return [Bool]
     #
     def release_branch?
-      git_branch.start_with?('release/')
+      !(%r{^#{GIT_BRANCH_PREFIX}release/\w} =~ git_branch).nil?
     end
 
     # Return true if the current PR branch is a support branch.
@@ -44,7 +45,7 @@ module Samsao
     # @return [Bool]
     #
     def support_branch?
-      git_branch.start_with?('support/')
+      !(%r{^#{GIT_BRANCH_PREFIX}support/\w} =~ git_branch).nil?
     end
 
     # Return true if the current PR is a trivial change, i.e. if PR title contains #trivial or #typo markers.
@@ -113,6 +114,8 @@ module Samsao
 
     private
 
+    GIT_BRANCH_PREFIX = '([-a-z0-9._]+/)?'.freeze
+
     def git_branch
       github.branch_for_head
     end

data/spec/samsao_acceptance_criteria_spec.rb

@@ -6,7 +6,7 @@ module Danger
       before do
         @dangerfile = testing_dangerfile
         @plugin = @dangerfile.samsao
-        @message = 'The PR should have the acceptance criteria in the body.'
+        @message = 'The PR description should have the acceptance criteria in the body.'
       end
 
       describe 'check acceptance criteria' do

data/spec/samsao_branch_helper_spec.rb

@@ -12,7 +12,11 @@ module Danger
         it 'supports feature_branch? correctly' do
           data_set = [
             { branch: 'feature/a', expected: true },
+            { branch: '2.0.0/feature/a', expected: true },
+            { branch: 'other_app-name/feature/a', expected: true },
+            { branch: 'something/something-else/feature/a', expected: false },
             { branch: 'fix/a', expected: false },
+            { branch: 'feature/', expected: false },
             { branch: 'random', expected: false },
           ]
 
@@ -28,7 +32,13 @@ module Danger
             { branch: 'fix/a', expected: true },
             { branch: 'bugfix/a', expected: true },
             { branch: 'hotfix/a', expected: true },
+            { branch: 'warmfix/a', expected: true },
+            { branch: 'coldfix/a', expected: true },
+            { branch: '2.0.0/fix/a', expected: true },
+            { branch: 'other_app-name/fix/a', expected: true },
+            { branch: 'something/something-else/fix/a', expected: false },
             { branch: 'otherfix/a', expected: false },
+            { branch: 'fix/', expected: false },
             { branch: 'random', expected: false },
           ]
 
@@ -41,7 +51,11 @@ module Danger
         it 'supports release_branch? correctly' do
           data_set = [
             { branch: 'release/a', expected: true },
+            { branch: '2.0.0/release/a', expected: true },
+            { branch: 'other_app-name/release/a', expected: true },
+            { branch: 'something/something-else/release/a', expected: false },
             { branch: 'fix/a', expected: false },
+            { branch: 'release/', expected: false },
             { branch: 'random', expected: false },
           ]
 
@@ -54,7 +68,11 @@ module Danger
         it 'supports support_branch? correctly' do
           data_set = [
             { branch: 'support/a', expected: true },
+            { branch: '2.0.0/support/a', expected: true },
+            { branch: 'other_app-name/support/a', expected: true },
+            { branch: 'something/something-else/support/a', expected: false },
             { branch: 'fix/a', expected: false },
+            { branch: 'support/', expected: false },
             { branch: 'random', expected: false },
           ]
 

data/spec/samsao_feature_jira_issue_number_spec.rb

@@ -52,7 +52,7 @@ module Danger
 
         it 'fails on branch with no issue number' do
           jira_project_key = 'VER'
-          message = 'The PR must starts with JIRA issue number between square brackets'\
+          message = 'The PR title must starts with JIRA issue number between square brackets'\
                     " (i.e. [#{jira_project_key}-XXX])."
 
           @plugin.config do

data/spec/samsao_fix_jira_issue_number_spec.rb

@@ -51,7 +51,7 @@ module Danger
 
           @plugin.check_fix_jira_issue_number
 
-          message = "The commit #{commit_id} should contain JIRA issue number between square brackets"\
+          message = "The commit message #{commit_id} should contain JIRA issue number between square brackets"\
                     " (i.e. [#{jira_project_key}-XXX]), multiple allowed (i.e. [#{jira_project_key}-XXX,"\
                     " #{jira_project_key}-YYY, #{jira_project_key}-ZZZ])"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-samsao
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Samsao Development Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api