whatsup_github 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5a5193535cbcad7a2e79333943ca9761e7b6bc06a867fffacaf3abac90ce47
-  data.tar.gz: e0f92a5c0619da8911035a61b3cb0e17dab44344b99db02986da0fbb67cf4c76
+  metadata.gz: 5608a3a48a7e700095336faec5d44de661229ec8d85d005f873ce0ed7fbfdf94
+  data.tar.gz: 9fe13981b406350104dd819918da01b8fbde05437da2893477c6c5d368154090
 SHA512:
-  metadata.gz: 43c4beaa0b90f93aeb01ab7a2f2643702ac8d078bd3b21801a250a7918dba077ecee5f9138d731e3817ad78719769bc4167f32ce7bdfad480c374e790a498251
-  data.tar.gz: 9247198a00d96c500236f093dc7b458e256220b8763ab6831207c014f1da6acd5d24aa95f3fc47b45cf5850e727543e8d53515a0684432b07f0d58d96fb9dff5
+  metadata.gz: 9b6832a0b57912c1daf4f80c6473b7851bcc97d4c2f3c30827291d59067b23dac9e27c1b94b013524f8ccad61539708a2ce3f3a5dbdea5cfd867015531763db3
+  data.tar.gz: ff8ab4e0434674332c19d1bbf8ff99ffe2259b480a0f566f62006a833359a4190818eca781a7b9494d02b62eb3ef472a4876da3600bcde936bf8b38d0812e148

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    whatsup_github (0.2.0)
+    whatsup_github (0.3.0)
       netrc (~> 0.10)
       octokit (~> 4.14)
       thor (~> 0.20)

data/lib/template/.whatsup.yml

@@ -16,3 +16,5 @@ labels:
 output_format:
   - yaml
 #  - markdown
+
+magic_word: whatsnew

data/lib/whatsup_github/config-reader.rb

@@ -49,6 +49,10 @@ module WhatsupGithub
       return [] unless res
       res
     end
+
+    def magic_word
+      read.dig 'magic_word'
+    end
   end
 end
 
@@ -60,4 +64,5 @@ if $PROGRAM_NAME == __FILE__
   p config.labels
   p config.required_labels
   p config.optional_labels
+  p config.magic_word
 end

data/lib/whatsup_github/pulls.rb

@@ -13,9 +13,12 @@ module WhatsupGithub
 
     def filtered
       issues = []
-      labels.each do |label|
+      required_labels.each do |label|
         issues += search_issues(label).items
       end
+      optional_labels.each do |label|
+        issues += search_issues_with_magic_word(label).items
+      end
       issues
     end
 
@@ -29,8 +32,16 @@ module WhatsupGithub
       Config.instance
     end
 
-    def labels
-      configuration.labels
+    def optional_labels
+      configuration.optional_labels
+    end
+
+    def required_labels
+      configuration.required_labels
+    end
+
+    def magic_word
+      configuration.magic_word
     end
 
     def base_branch
@@ -43,7 +54,16 @@ module WhatsupGithub
 
     def search_issues(label)
       auto_paginate
-      client.search_issues("repo:#{repo} label:\"#{label}\" merged:>=#{since} base:#{base_branch}")
+      query = "repo:#{repo} label:\"#{label}\" merged:>=#{since} base:#{base_branch}"
+      puts "Searching on GitHub by query #{query}"
+      client.search_issues(query)
+    end
+
+    def search_issues_with_magic_word(label)
+      auto_paginate
+      query = "repo:#{repo} label:\"#{label}\" merged:>=#{since} base:#{base_branch} \"#{magic_word}\" in:body"
+      puts "Searching on GitHub by query #{query}"
+      client.search_issues(query)
     end
 
     def auto_paginate
@@ -57,4 +77,4 @@ if $PROGRAM_NAME == __FILE__
   two_weeks_ago = (Date.today - 14).to_s
   pulls = WhatsupGithub::Pulls.new(repo: 'magento/devdocs', since: two_weeks_ago)
   p pulls.filtered
-end
+end

data/lib/whatsup_github/row.rb

@@ -22,6 +22,10 @@ module WhatsupGithub
       @config.required_labels
     end
 
+    def magic_word
+      @config.magic_word
+    end
+
     def versions
       label_versions = labels.select { |label| label.start_with?(/\d\./) }
       label_versions.join(', ')
@@ -36,8 +40,8 @@ module WhatsupGithub
     end
 
     def parse_body
-      whatsnew_splited = body.split('whatsnew')[-1]
-      newline_splited = whatsnew_splited.split("\n")
+      description_splited = body.split(magic_word)[-1]
+      newline_splited = description_splited.split("\n")
       cleaned_array = newline_splited.map { |e| e.delete "\r\*" }
       cleaned_array.delete('')
       striped_array = cleaned_array.map(&:strip)
@@ -47,10 +51,10 @@ module WhatsupGithub
     def description
       # If a PR body includes a phrase 'whatsnew', then parse the body.
       # If there are at least one required label but PR body does not include what's new, warn about missing 'whatsnew'
-      if body.include?('whatsnew')
+      if body.include?(magic_word)
         parse_body
-      elsif !(labels & required_labels).empty? && !body.include?('whatsnew')
-        message = "MISSING whatsnew in the #{type} PR \##{pr_number}: \"#{title}\" assigned to #{assignee} (#{link})"
+      else
+        message = "MISSING #{magic_word} in the #{type} PR \##{pr_number}: \"#{title}\" assigned to #{assignee} (#{link})"
         puts message
         message
       end

data/lib/whatsup_github/version.rb

@@ -1,3 +1,3 @@
 module WhatsupGithub
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whatsup_github
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dima Shevtsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit