From 4721ce30a483aaa822a8c877aa1d2bc2c6b1e452 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Sat, 3 Aug 2019 22:44:29 +0700
Subject: [PATCH] bear-metadata.yaml: Regenerate

Also update generate_bear_metadata.py to avoid including paths
from python3 dependencies, and sync with package_manager adding
new distribution class 'pkg'.

Fixes https://github.com/coala/coala-bears/issues/2937
---
 .ci/generate_bear_metadata.py | 10 +++++-----
 bear-metadata.yaml            | 37 +++++++++++++++++++++++++++++++----
 bear-requirements.yaml        | 10 ++++++++++
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/.ci/generate_bear_metadata.py b/.ci/generate_bear_metadata.py
index 03fb50df97..e42babf7ba 100755
--- a/.ci/generate_bear_metadata.py
+++ b/.ci/generate_bear_metadata.py
@@ -266,6 +266,10 @@ def get_bear_requirement_metadata(bear_requirement_sets, storage=None,
         if not requirements:
             continue
 
+        if requirement_type == 'exe':
+            requirements = dict((key.partition('/', 1)[2], value) for
+                                key, value in requirements.items())
+
         label = settings['prefix']
         if old_labels:
             label += '_requirements'
@@ -318,11 +322,6 @@ def get_bear_tags(bear, metadata):
             tags.remove('java')
         tags.add('opam')
 
-    elif bear.name == 'CPDBear':
-        # Has no requirements defined yet
-        tags.remove('noreqs')
-        tags.add('java')
-
     elif bear.name == 'LanguageToolBear':
         # Has no requirements defined yet
         tags.add('java')
@@ -334,6 +333,7 @@ def get_bear_tags(bear, metadata):
 
     elif bear.name == 'CPDBear':
         # Has no executable defined
+        tags.add('java')
         tags.add('cpd')
 
     elif bear.name == 'VHDLLintBear':
diff --git a/bear-metadata.yaml b/bear-metadata.yaml
index 42329f3abe..64e8a6b5ac 100644
--- a/bear-metadata.yaml
+++ b/bear-metadata.yaml
@@ -154,6 +154,9 @@ bear_metadata:
     subdir: general
     filename: CPDBear.py
     requirements:
+      exe:
+        pmd:
+        run.sh:
     languages:
       - C#
       - CPP
@@ -174,8 +177,11 @@ bear_metadata:
       - Scala
       - Swift
     tags:
+      - exe
       - general
       - java
+      - pmd
+      - run.sh
   CPPCheckBear:
     name: CPPCheckBear
     subdir: c_languages
@@ -188,6 +194,7 @@ bear_metadata:
             brew: cppcheck
             dnf: cppcheck
             pacman: cppcheck
+            pkg: cppcheck
             portage: cppcheck
             xbps: cppcheck
             yum: cppcheck
@@ -206,6 +213,7 @@ bear_metadata:
       - dnf
       - exe
       - pacman
+      - pkg
       - portage
       - xbps
       - yum
@@ -326,6 +334,7 @@ bear_metadata:
             brew: flawfinder
             dnf: flawfinder
             pacman: flawfinder
+            pkg: flawfinder
             portage: flawfinder
             xbps: flawfinder
             yum: flawfinder
@@ -344,6 +353,7 @@ bear_metadata:
       - exe
       - flawfinder
       - pacman
+      - pkg
       - portage
       - xbps
       - yum
@@ -360,6 +370,7 @@ bear_metadata:
             brew: mono
             dnf: mono
             pacman: mono
+            pkg: mono
             portage: dev-lang/mono
             xbps: mono
             yum: mono
@@ -378,6 +389,7 @@ bear_metadata:
       - mcs
       - mono
       - pacman
+      - pkg
       - portage
       - xbps
       - yum
@@ -725,6 +737,7 @@ bear_metadata:
             brew: indent
             dnf: indent
             pacman: indent
+            pkg: indent
             portage: indent
             xbps: indent
             yum: indent
@@ -743,6 +756,7 @@ bear_metadata:
       - exe
       - indent
       - pacman
+      - pkg
       - portage
       - xbps
       - yum
@@ -762,6 +776,7 @@ bear_metadata:
             brew: ghc-mod
             dnf: ghc-mod
             pacman: ghc-mod
+            pkg: ghc-mod
             portage: ghc-mod
             xbps: ghc-mod
             yum: ghc-mod
@@ -780,6 +795,7 @@ bear_metadata:
       - ghc-mod
       - haskell
       - pacman
+      - pkg
       - portage
       - xbps
       - yum
@@ -1000,7 +1016,7 @@ bear_metadata:
     filename: HTMLLintBear.py
     requirements:
       exe:
-        /home/areebbeigh/virtualenvs/coala-venv/bin/python3:
+        python3:
       pip:
         html-linter:
           version: ~=0.4.0
@@ -1009,7 +1025,7 @@ bear_metadata:
       - Jinja2
       - PHP
     tags:
-      - /home/areebbeigh/virtualenvs/coala-venv/bin/python3
+      - python3
       - exe
       - hypertext
       - pip
@@ -1194,6 +1210,8 @@ bear_metadata:
     requirements:
       exe:
         bash:
+        pmd:
+        run.sh:
     languages:
       - Java
     tags:
@@ -1201,6 +1219,7 @@ bear_metadata:
       - exe
       - java
       - pmd
+      - run.sh
   Jinja2Bear:
     name: Jinja2Bear
     subdir: jinja2
@@ -1263,6 +1282,7 @@ bear_metadata:
             brew: chktex
             dnf: chktex
             pacman: chktex
+            pkg: chktex
             portage: chktex
             xbps: chktex
             yum: chktex
@@ -1280,6 +1300,7 @@ bear_metadata:
       - exe
       - latex
       - pacman
+      - pkg
       - portage
       - xbps
       - yum
@@ -1411,7 +1432,7 @@ bear_metadata:
     filename: MypyBear.py
     requirements:
       exe:
-        /home/areebbeigh/virtualenvs/coala-venv/bin/python3:
+        python3:
       pip:
         mypy:
           version: ==0.590
@@ -1420,7 +1441,7 @@ bear_metadata:
       - Python 2
       - Python 3
     tags:
-      - /home/areebbeigh/virtualenvs/coala-venv/bin/python3
+      - python3
       - exe
       - pip
       - python
@@ -1990,6 +2011,7 @@ bear_metadata:
             brew: ruby
             dnf: ruby
             pacman: ruby
+            pkg: ruby
             portage: ruby
             xbps: ruby
             yum: ruby
@@ -2006,6 +2028,7 @@ bear_metadata:
       - dnf
       - exe
       - pacman
+      - pkg
       - portage
       - ruby
       - xbps
@@ -2114,6 +2137,7 @@ bear_metadata:
             brew: shellcheck
             dnf: shellcheck
             pacman: shellcheck
+            pkg: shellcheck
             portage: shellcheck
             xbps: shellcheck
             yum: shellcheck
@@ -2133,6 +2157,7 @@ bear_metadata:
       - dnf
       - exe
       - pacman
+      - pkg
       - portage
       - shell
       - shellcheck
@@ -2369,6 +2394,7 @@ bear_metadata:
             brew: perl
             dnf: perl
             pacman: perl
+            pkg: perl
             portage: perl
             xbps: perl
             yum: perl
@@ -2386,6 +2412,7 @@ bear_metadata:
       - exe
       - pacman
       - perl
+      - pkg
       - portage
       - vhdl
       - xbps
@@ -2480,6 +2507,7 @@ bear_metadata:
             brew: libxml2
             dnf: libxml2
             pacman: libxml2
+            pkg: libxml2
             portage: dev-libs/libxml2
             xbps: libxml2
             yum: libxml2
@@ -2496,6 +2524,7 @@ bear_metadata:
       - exe
       - libxml2
       - pacman
+      - pkg
       - portage
       - xbps
       - xml2
diff --git a/bear-requirements.yaml b/bear-requirements.yaml
index 997400c48a..844f3457ff 100644
--- a/bear-requirements.yaml
+++ b/bear-requirements.yaml
@@ -248,6 +248,7 @@ distro_requirements:
       xbps: chktex
       yum: chktex
       zypper: texlive-chktex
+      pkg: chktex
   cppcheck:
     packages:
       apt_get: cppcheck
@@ -258,6 +259,7 @@ distro_requirements:
       xbps: cppcheck
       yum: cppcheck
       zypper: cppcheck
+      pkg: cppcheck
   dart:
     packages:
       brew: dart
@@ -280,6 +282,7 @@ distro_requirements:
       xbps: flawfinder
       yum: flawfinder
       zypper: flawfinder
+      pkg: flawfinder
   ghc-mod:
     packages:
       apt_get: ghc-mod
@@ -290,6 +293,7 @@ distro_requirements:
       xbps: ghc-mod
       yum: ghc-mod
       zypper: ghc-mod
+      pkg: ghc-mod
   hlint:
     packages:
       apt_get: hlint
@@ -303,6 +307,7 @@ distro_requirements:
       xbps: indent
       yum: indent
       zypper: indent
+      pkg: indent
   libperl-critic-perl:
     packages:
       apt_get: libperl-critic-perl
@@ -322,6 +327,7 @@ distro_requirements:
       xbps: libxml2
       yum: libxml2
       zypper: libxml2
+      pkg: libxml2
   mono:
     packages:
       apt_get: mono-mcs
@@ -332,6 +338,7 @@ distro_requirements:
       xbps: mono
       yum: mono
       zypper: mono
+      pkg: mono
   perl:
     packages:
       apt_get: perl
@@ -342,6 +349,7 @@ distro_requirements:
       xbps: perl
       yum: perl
       zypper: perl
+      pkg: perl
   php-cli:
     packages:
       apt_get: php-cli
@@ -371,6 +379,7 @@ distro_requirements:
       xbps: ruby
       yum: ruby
       zypper: ruby
+      pkg: ruby
   shellcheck:
     packages:
       apt_get: shellcheck
@@ -381,6 +390,7 @@ distro_requirements:
       xbps: shellcheck
       yum: shellcheck
       zypper: shellcheck
+      pkg: shellcheck
   verilator:
     packages:
       apt_get: verilator