cookstyle 8.5.2 → 8.6.4

data/lib/rubocop/cop/chef/sharing/invalid_license_string.rb

@@ -19,30 +19,31 @@ module RuboCop
   module Cop
     module Chef
       module Sharing
-        # metadata.rb license field should include a SPDX compliant string or "all right reserved" (not case sensitive)
+        # metadata.rb license field should include a SPDX compliant string or "all rights reserved" (not case sensitive)
         #
         # @example
         #
-        #   ### incorrect
+        #   # bad
         #   license 'Apache 2.0'
         #
-        #   ### correct
+        #   # good
         #   license 'Apache-2.0'
         #   license 'all rights reserved'
         #
-        # list of valid SPDX.org license strings. To build an array run this ruby:
-        # ```ruby
-        # require 'json'
-        # require 'net/http'
-        # json_data = JSON.parse(Net::HTTP.get(URI('https://raw.githubusercontent.com/spdx/license-list-data/master/json/licenses.json')))
-        # licenses = json_data['licenses'].map {|l| l['licenseId'] }.sort
-        # ```
-        #
         class InvalidLicenseString < Base
           extend AutoCorrector
 
+          # list of valid SPDX.org license strings. To build an array run this ruby:
+          # ```ruby
+          # require 'net/http'
+          # json_data = JSON.parse(Net::HTTP.get(URI('https://raw.githubusercontent.com/spdx/license-list-data/master/json/licenses.json')))
+          # licenses = json_data['licenses'].map {|l| l['licenseId'] }.sort
+          # puts licenses
+          # ```
+          #
           VALID_LICENSE_STRING = %w(
             0BSD
+            3D-Slicer-1.0
             AAL
             ADSL
             AFL-1.1
@@ -56,8 +57,11 @@ module RuboCop
             AGPL-3.0
             AGPL-3.0-only
             AGPL-3.0-or-later
+            ALGLIB-Documentation
+            AMD-newlib
             AMDPLPA
             AML
+            AML-glslang
             AMPAS
             ANTLR-PD
             ANTLR-PD-fallback
@@ -67,88 +71,148 @@ module RuboCop
             APSL-1.1
             APSL-1.2
             APSL-2.0
+            ASWF-Digital-Assets-1.0
+            ASWF-Digital-Assets-1.1
             Abstyles
+            AdaCore-doc
             Adobe-2006
+            Adobe-Display-PostScript
             Adobe-Glyph
+            Adobe-Utopia
+            Advanced-Cryptics-Dictionary
             Afmparse
             Aladdin
             Apache-1.0
             Apache-1.1
             Apache-2.0
+            App-s2p
+            Arphic-1999
             Artistic-1.0
             Artistic-1.0-Perl
             Artistic-1.0-cl8
             Artistic-2.0
+            Artistic-dist
+            Aspell-RU
             BSD-1-Clause
             BSD-2-Clause
+            BSD-2-Clause-Darwin
             BSD-2-Clause-FreeBSD
             BSD-2-Clause-NetBSD
             BSD-2-Clause-Patent
             BSD-2-Clause-Views
+            BSD-2-Clause-first-lines
+            BSD-2-Clause-pkgconf-disclaimer
             BSD-3-Clause
             BSD-3-Clause-Attribution
             BSD-3-Clause-Clear
+            BSD-3-Clause-HP
             BSD-3-Clause-LBNL
+            BSD-3-Clause-Modification
+            BSD-3-Clause-No-Military-License
             BSD-3-Clause-No-Nuclear-License
             BSD-3-Clause-No-Nuclear-License-2014
             BSD-3-Clause-No-Nuclear-Warranty
             BSD-3-Clause-Open-MPI
+            BSD-3-Clause-Sun
+            BSD-3-Clause-Tso
+            BSD-3-Clause-acpica
+            BSD-3-Clause-flex
             BSD-4-Clause
+            BSD-4-Clause-Shortened
             BSD-4-Clause-UC
+            BSD-4.3RENO
+            BSD-4.3TAHOE
+            BSD-Advertising-Acknowledgement
+            BSD-Attribution-HPND-disclaimer
+            BSD-Inferno-Nettverk
+            BSD-Mark-Modifications
             BSD-Protection
             BSD-Source-Code
+            BSD-Source-beginning-file
+            BSD-Systemics
+            BSD-Systemics-W3Works
             BSL-1.0
             BUSL-1.1
+            Baekmuk
             Bahyph
             Barr
             Beerware
             BitTorrent-1.0
             BitTorrent-1.1
+            Bitstream-Charter
+            Bitstream-Vera
             BlueOak-1.0.0
+            Boehm-GC
+            Boehm-GC-without-fee
             Borceux
+            Brian-Gladman-2-Clause
+            Brian-Gladman-3-Clause
+            Buddy
+            C-UDA-1.0
             CAL-1.0
             CAL-1.0-Combined-Work-Exception
+            CAPEC-tou
             CATOSL-1.1
             CC-BY-1.0
             CC-BY-2.0
             CC-BY-2.5
+            CC-BY-2.5-AU
             CC-BY-3.0
             CC-BY-3.0-AT
+            CC-BY-3.0-AU
+            CC-BY-3.0-DE
+            CC-BY-3.0-IGO
+            CC-BY-3.0-NL
             CC-BY-3.0-US
             CC-BY-4.0
             CC-BY-NC-1.0
             CC-BY-NC-2.0
             CC-BY-NC-2.5
             CC-BY-NC-3.0
+            CC-BY-NC-3.0-DE
             CC-BY-NC-4.0
             CC-BY-NC-ND-1.0
             CC-BY-NC-ND-2.0
             CC-BY-NC-ND-2.5
             CC-BY-NC-ND-3.0
+            CC-BY-NC-ND-3.0-DE
             CC-BY-NC-ND-3.0-IGO
             CC-BY-NC-ND-4.0
             CC-BY-NC-SA-1.0
             CC-BY-NC-SA-2.0
+            CC-BY-NC-SA-2.0-DE
+            CC-BY-NC-SA-2.0-FR
+            CC-BY-NC-SA-2.0-UK
             CC-BY-NC-SA-2.5
             CC-BY-NC-SA-3.0
+            CC-BY-NC-SA-3.0-DE
+            CC-BY-NC-SA-3.0-IGO
             CC-BY-NC-SA-4.0
             CC-BY-ND-1.0
             CC-BY-ND-2.0
             CC-BY-ND-2.5
             CC-BY-ND-3.0
+            CC-BY-ND-3.0-DE
             CC-BY-ND-4.0
             CC-BY-SA-1.0
             CC-BY-SA-2.0
             CC-BY-SA-2.0-UK
+            CC-BY-SA-2.1-JP
             CC-BY-SA-2.5
             CC-BY-SA-3.0
             CC-BY-SA-3.0-AT
+            CC-BY-SA-3.0-DE
+            CC-BY-SA-3.0-IGO
             CC-BY-SA-4.0
             CC-PDDC
+            CC-PDM-1.0
+            CC-SA-1.0
             CC0-1.0
             CDDL-1.0
             CDDL-1.1
+            CDL-1.0
             CDLA-Permissive-1.0
+            CDLA-Permissive-2.0
             CDLA-Sharing-1.0
             CECILL-1.0
             CECILL-1.1
@@ -161,22 +225,42 @@ module RuboCop
             CERN-OHL-P-2.0
             CERN-OHL-S-2.0
             CERN-OHL-W-2.0
+            CFITSIO
+            CMU-Mach
+            CMU-Mach-nodoc
             CNRI-Jython
             CNRI-Python
             CNRI-Python-GPL-Compatible
+            COIL-1.0
             CPAL-1.0
             CPL-1.0
             CPOL-1.02
             CUA-OPL-1.0
             Caldera
+            Caldera-no-preamble
+            Catharon
             ClArtistic
+            Clips
+            Community-Spec-1.0
             Condor-1.1
+            Cornell-Lossless-JPEG
+            Cronyx
             Crossword
+            CryptoSwift
             CrystalStacker
             Cube
             D-FSL-1.0
+            DEC-3-Clause
+            DL-DE-BY-2.0
+            DL-DE-ZERO-2.0
             DOC
+            DRL-1.0
+            DRL-1.1
             DSDP
+            DocBook-DTD
+            DocBook-Schema
+            DocBook-Stylesheet
+            DocBook-XML
             Dotseqn
             ECL-1.0
             ECL-2.0
@@ -185,20 +269,36 @@ module RuboCop
             EPICS
             EPL-1.0
             EPL-2.0
+            ESA-PL-permissive-2.4
+            ESA-PL-strong-copyleft-2.4
+            ESA-PL-weak-copyleft-2.4
             EUDatagrid
             EUPL-1.0
             EUPL-1.1
             EUPL-1.2
+            Elastic-2.0
             Entessa
             ErlPL-1.1
             Eurosym
+            FBM
+            FDK-AAC
             FSFAP
+            FSFAP-no-warranty-disclaimer
             FSFUL
             FSFULLR
+            FSFULLRSD
+            FSFULLRWD
+            FSL-1.1-ALv2
+            FSL-1.1-MIT
             FTL
             Fair
+            Ferguson-Twofish
             Frameworx-1.0
+            FreeBSD-DOC
             FreeImage
+            Furuseth
+            GCR-docs
+            GD
             GFDL-1.1
             GFDL-1.1-invariants-only
             GFDL-1.1-invariants-or-later
@@ -241,29 +341,71 @@ module RuboCop
             GPL-3.0-or-later
             GPL-3.0-with-GCC-exception
             GPL-3.0-with-autoconf-exception
+            Game-Programming-Gems
             Giftware
             Glide
             Glulxe
+            Graphics-Gems
+            Gutmann
+            HDF5
+            HIDAPI
+            HP-1986
+            HP-1989
             HPND
+            HPND-DEC
+            HPND-Fenneberg-Livingston
+            HPND-INRIA-IMAG
+            HPND-Intel
+            HPND-Kevlin-Henney
+            HPND-MIT-disclaimer
+            HPND-Markus-Kuhn
+            HPND-Netrek
+            HPND-Pbmplus
+            HPND-SMC
+            HPND-UC
+            HPND-UC-export-US
+            HPND-doc
+            HPND-doc-sell
+            HPND-export-US
+            HPND-export-US-acknowledgement
+            HPND-export-US-modify
+            HPND-export2-US
+            HPND-merchantability-variant
+            HPND-sell-MIT-disclaimer-xserver
+            HPND-sell-regexpr
             HPND-sell-variant
+            HPND-sell-variant-MIT-disclaimer
+            HPND-sell-variant-MIT-disclaimer-rev
+            HPND-sell-variant-critical-systems
             HTMLTIDY
             HaskellReport
             Hippocratic-2.1
             IBM-pibs
             ICU
+            IEC-Code-Components-EULA
             IJG
+            IJG-short
             IPA
             IPL-1.0
             ISC
+            ISC-Veillard
+            ISO-permission
             ImageMagick
             Imlib2
             Info-ZIP
+            Inner-Net-2.0
+            InnoSetup
             Intel
             Intel-ACPI
             Interbase-1.0
+            JPL-image
             JPNIC
             JSON
+            Jam
             JasPer-2.0
+            Kastrup
+            Kazlib
+            Knuth-CTAN
             LAL-1.2
             LAL-1.3
             LGPL-2.0
@@ -279,6 +421,8 @@ module RuboCop
             LGPL-3.0-only
             LGPL-3.0-or-later
             LGPLLR
+            LOOP
+            LPD-document
             LPL-1.0
             LPL-1.02
             LPPL-1.0
@@ -286,49 +430,82 @@ module RuboCop
             LPPL-1.2
             LPPL-1.3a
             LPPL-1.3c
+            LZMA-SDK-9.11-to-9.20
+            LZMA-SDK-9.22
             Latex2e
+            Latex2e-translated-notice
             Leptonica
             LiLiQ-P-1.1
             LiLiQ-R-1.1
             LiLiQ-Rplus-1.1
             Libpng
             Linux-OpenIB
+            Linux-man-pages-1-para
+            Linux-man-pages-copyleft
+            Linux-man-pages-copyleft-2-para
+            Linux-man-pages-copyleft-var
+            Lucida-Bitmap-Fonts
+            MIPS
             MIT
             MIT-0
             MIT-CMU
+            MIT-Click
+            MIT-Festival
+            MIT-Khronos-old
+            MIT-Modern-Variant
+            MIT-STK
+            MIT-Wu
             MIT-advertising
             MIT-enna
             MIT-feh
             MIT-open-group
+            MIT-testregex
             MITNFA
+            MMIXware
+            MMPL-1.0.1
+            MPEG-SSG
             MPL-1.0
             MPL-1.1
             MPL-2.0
             MPL-2.0-no-copyleft-exception
+            MS-LPL
             MS-PL
             MS-RL
             MTLL
+            Mackerras-3-Clause
+            Mackerras-3-Clause-acknowledgment
             MakeIndex
+            Martin-Birgmeier
+            McPhee-slideshow
+            Minpack
             MirOS
             Motosoto
             MulanPSL-1.0
             MulanPSL-2.0
             Multics
             Mup
+            NAIST-2003
             NASA-1.3
             NBPL-1.0
+            NCBI-PD
             NCGL-UK-2.0
+            NCL
             NCSA
             NGPL
+            NICTA-1.0
             NIST-PD
+            NIST-PD-TNT
             NIST-PD-fallback
+            NIST-Software
             NLOD-1.0
+            NLOD-2.0
             NLPL
             NOSL
             NPL-1.0
             NPL-1.1
             NPOSL-3.0
             NRL
+            NTIA-PD
             NTP
             NTP-0
             Naumen
@@ -339,10 +516,12 @@ module RuboCop
             Noweb
             Nunit
             O-UDA-1.0
+            OAR
             OCCT-PL
             OCLC-2.0
             ODC-By-1.0
             ODbL-1.0
+            OFFIS
             OFL-1.0
             OFL-1.0-RFN
             OFL-1.0-no-RFN
@@ -350,6 +529,7 @@ module RuboCop
             OFL-1.1-RFN
             OFL-1.1-no-RFN
             OGC-1.0
+            OGDL-Taiwan-1.0
             OGL-Canada-2.0
             OGL-UK-1.0
             OGL-UK-2.0
@@ -371,27 +551,41 @@ module RuboCop
             OLDAP-2.6
             OLDAP-2.7
             OLDAP-2.8
+            OLFL-1.3
             OML
             OPL-1.0
+            OPL-UK-3.0
+            OPUBL-1.0
             OSET-PL-2.1
             OSL-1.0
             OSL-1.1
             OSL-2.0
             OSL-2.1
             OSL-3.0
+            OSSP
+            OpenMDW-1.0
+            OpenPBS-2.3
             OpenSSL
+            OpenSSL-standalone
+            OpenVision
+            PADL
             PDDL-1.0
             PHP-3.0
             PHP-3.01
+            PPL
             PSF-2.0
+            ParaType-Free-Font-1.3
             Parity-6.0.0
             Parity-7.0.0
+            Pixar
             Plexus
             PolyForm-Noncommercial-1.0.0
             PolyForm-Small-Business-1.0.0
             PostgreSQL
             Python-2.0
+            Python-2.0.1
             QPL-1.0
+            QPL-1.0-INRIA-2004
             Qhull
             RHeCos-1.1
             RPL-1.1
@@ -401,60 +595,104 @@ module RuboCop
             RSCPL
             Rdisc
             Ruby
+            Ruby-pty
             SAX-PD
+            SAX-PD-2.0
             SCEA
             SGI-B-1.0
             SGI-B-1.1
             SGI-B-2.0
+            SGI-OpenGL
+            SGMLUG-PM
+            SGP4
             SHL-0.5
             SHL-0.51
             SISSL
             SISSL-1.2
+            SL
+            SMAIL-GPL
             SMLNJ
             SMPPL
             SNIA
+            SOFA
             SPL-1.0
             SSH-OpenSSH
             SSH-short
+            SSLeay-standalone
             SSPL-1.0
+            SUL-1.0
             SWL
             Saxpath
+            SchemeReport
             Sendmail
             Sendmail-8.23
+            Sendmail-Open-Source-1.1
             SimPL-2.0
             Sleepycat
+            Soundex
             Spencer-86
             Spencer-94
             Spencer-99
             StandardML-NJ
             SugarCRM-1.1.3
+            Sun-PPP
+            Sun-PPP-2000
+            SunPro
+            Symlinks
             TAPR-OHL-1.0
             TCL
             TCP-wrappers
+            TGPPL-1.0
             TMate
             TORQUE-1.1
             TOSL
+            TPDL
+            TPL-1.0
+            TTWL
+            TTYP0
             TU-Berlin-1.0
             TU-Berlin-2.0
+            TekHVC
+            TermReadKey
+            ThirdEye
+            TrustedQSL
+            UCAR
             UCL-1.0
+            UMich-Merit
             UPL-1.0
+            URT-RLE
+            Ubuntu-font-1.0
+            UnRAR
+            Unicode-3.0
             Unicode-DFS-2015
             Unicode-DFS-2016
             Unicode-TOU
+            UnixCrypt
             Unlicense
+            Unlicense-libtelnet
+            Unlicense-libwhirlpool
             VOSTROM
             VSL-1.0
             Vim
+            Vixie-Cron
             W3C
             W3C-19980720
             W3C-20150513
+            WTFNMFPL
             WTFPL
             Watcom-1.0
+            Widget-Workshop
+            WordNet
             Wsuipa
             X11
+            X11-distribute-modifications-variant
+            X11-no-permit-persons
+            X11-swapped
             XFree86-1.1
             XSkat
+            Xdebug-1.03
             Xerox
+            Xfig
             Xnet
             YPL-1.0
             YPL-1.1
@@ -462,33 +700,72 @@ module RuboCop
             ZPL-2.0
             ZPL-2.1
             Zed
+            Zeeff
             Zend-2.0
             Zimbra-1.3
             Zimbra-1.4
             Zlib
+            any-OSI
+            any-OSI-perl-modules
+            bcrypt-Solar-Designer
             blessing
             bzip2-1.0.5
             bzip2-1.0.6
+            check-cvs
+            checkmk
             copyleft-next-0.3.0
             copyleft-next-0.3.1
             curl
+            cve-tou
             diffmark
+            dtoa
             dvipdfm
             eCos-2.0
             eGenix
             etalab-2.0
+            fwlw
             gSOAP-1.3b
+            generic-xts
             gnuplot
+            gtkbook
+            hdparm
+            hyphen-bulgarian
             iMatix
+            jove
+            libpng-1.6.35
             libpng-2.0
             libselinux-1.0
             libtiff
+            libutil-David-Nugent
+            lsof
+            magaz
+            mailprio
+            man2html
+            metamail
+            mpi-permissive
             mpich2
+            mplus
+            ngrep
+            pkgconf
+            pnmstitch
             psfrag
             psutils
+            python-ldap
+            radvd
+            snprintf
+            softSurfer
+            ssh-keyscan
+            swrule
+            threeparttable
+            ulem
+            w3m
+            wwl
             wxWindows
             xinetd
+            xkeyboard-config-Zinoviev
+            xlock
             xpp
+            xzoom
             zlib-acknowledgement
           ).freeze
 

data/lib/rubocop/cop/chef/style/attribute_keys.rb

@@ -24,19 +24,19 @@ module RuboCop
         #
         # @example when configuration is `EnforcedStyle: symbols`
         #
-        #   ### incorrect
+        #   # bad
         #   node['foo']
         #   node["foo"]
         #
-        #   ### correct
+        #   # good
         #   node[:foo]
         #
         # @example when configuration is `EnforcedStyle: strings`
         #
-        #   ### incorrect
+        #   # bad
         #   node[:foo]
         #
-        #   ### correct
+        #   # good
         #   node['foo']
         #   node["foo"]
         #

data/lib/rubocop/cop/chef/style/chef_whaaat.rb

@@ -23,11 +23,11 @@ module RuboCop
         #
         # @example
         #
-        #   ### incorrect
+        #   # bad
         #   Chef makes software
         #   Chef configures your systems
         #
-        #   ### correct
+        #   # good
         #   Chef Software makes software
         #   Chef Infra configures your systems
         #