lib/cobench/metrics/issues.rb in cobench-0.0.7 vs lib/cobench/metrics/issues.rb in cobench-0.0.8

@@ -17,11 +17,11 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
 require 'iri'
-require_relative '../mask'
+require_relative '../match'
 
 # Issues in GitHub API.
 # Author:: Yegor Bugayenko ([e-mail])
 # Copyright:: Copyright (c) 2022 Yegor Bugayenko
 # License:: MIT
@@ -34,21 +34,21 @@
 
   def take(loog)
     from = (Time.now - (60 * 60 * 24 * @opts[:days])).strftime('%Y-%m-%d')
     q = "#{@user} in:comments type:issue author:#{@user} created:>#{from}"
     json = @api.search_issues(q)
+    loog.debug("Found #{json.total_count} issues")
     total = json.items.count do |p|
       pr = p.url.split('/')[-1]
       repo = p.repository_url.split('/')[-2..-1].join('/')
-      if @opts[:include].none? { |m| Cobench::Mask.new(m).matches?(repo) }
-        loog.debug("Excluding #{repo}##{pr} due to lack of --include")
-        next
-      end
-      if @opts[:exclude].any? { |m| Cobench::Mask.new(m).matches?(repo) }
-        loog.debug("Excluding #{repo}##{pr} due to --exclude")
-        next
-      end
+      next unless Cobench::Match.new(@opts).matches?(repo)
       loog.debug("Including #{repo}#{pr}")
     end
-    [total, Iri.new('https://github.com/search').add(q: q)]
+    [
+      {
+        title: 'Issues',
+        total: total,
+        href: Iri.new('https://github.com/search').add(q: q)
+      }
+    ]
   end
 end