license_finder 6.8.1 → 6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b09e0ff0c5e115f24278e8d4e759562c10c8abf7c70920622c535ae21649c1cb
-  data.tar.gz: a357081ca1404d7f2575c90035f4b564ff5cc5036965f5ce071506767088df8d
+  metadata.gz: 6280c04b3b05215777ec6e3db87cdff9766dfb6d53a699142710817c09b41335
+  data.tar.gz: 3643643ad824644d608e4e6015a34c0de2892c217efe603d7fa66ec937bdeff9
 SHA512:
-  metadata.gz: 0f67f90622514f6a7bae4dc3a501558ae59aec3ed8c221a0255d5106b956d836c1b98bcc8fbcd7bfd22e1023d30223c0b04088da162b79eccf7b37541a455730
-  data.tar.gz: 8dd8c22b3adfd01aa9ddeb91504ce5b9103d429e5ef61cade5f9c30477a5d68497ac192d640005e6c82ed2640d6faa45aa7775f7db7a1c9a0605d49b1c0a372e
+  metadata.gz: fc5928a7331d5012b13a87d0fb218fe8141c561e63ba8230e453a65bd206339d9cb593724e810ecd46f7dce231ab16d466df44a119bae1a4d64f00c0518dddaa
+  data.tar.gz: 28fbde267804e39d141ad54cd71df26693b2857870be8a5d37a84a04202f25db6398e4e8f216f302e17ecf52daf5810f3db7682712c7a9a1249fb93544ff06a3

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+# [6.8.2] / 2020-09-08
+
 # [6.8.1] / 2020-08-13
 
 # [6.8.0] / 2020-08-06
@@ -912,3 +914,4 @@ Bugfixes:
 [6.7.0]: https://github.com/pivotal/LicenseFinder/compare/v6.6.2...v6.7.0
 [6.8.0]: https://github.com/pivotal/LicenseFinder/compare/v6.7.0...v6.8.0
 [6.8.1]: https://github.com/pivotal/LicenseFinder/compare/v6.8.0...v6.8.1
+[6.8.2]: https://github.com/pivotal/LicenseFinder/compare/v6.8.1...v6.8.2

data/Dockerfile

@@ -159,7 +159,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 4F4EA0AAE5
     apt-get update &&\
     apt-get install -y php7.4-cli &&\
     php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" &&\
-    php -r "if (hash_file('sha384', 'composer-setup.php') === 'e5325b19b381bfd88ce90a5ddb7823406b2a38cff6bb704b0acc289a09c8128d4a8ce2bbafcd1fcbdc38666422fe2806') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" &&\
+    php -r "if (hash_file('sha384', 'composer-setup.php') === '8a6138e2a05a8c28539c9f0fb361159823655d7ad2deecb371b04a83966c61223adc522b0189079e3e9e277cd72b8897') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" &&\
     php composer-setup.php &&\
     php -r "unlink('composer-setup.php');" &&\
     mv composer.phar /usr/bin/composer

data/VERSION

@@ -1 +1 @@
-6.8.1
+6.8.2

data/lib/license_finder/license/text.rb

@@ -10,8 +10,8 @@ module LicenseFinder
       SPECIAL_DOUBLE_QUOTES = /[“”„«»]/.freeze
       ALPHABET_ORDERED_LIST = /\\\([a-z]\\\)\\\s/.freeze
       ALPHABET_ORDERED_LIST_OPTIONAL = '(\([a-z]\)\s)?'
-      LIST_BULLETS = /(\d{1,2}\\\.|\\\*)\\\s/.freeze
-      LIST_BULLETS_OPTIONAL = '(\d{1,2}.|\*)?\s*'
+      LIST_BULLETS = /(\d{1,2}\\\.|\\\*|\\\-)\\\s/.freeze
+      LIST_BULLETS_OPTIONAL = '(\d{1,2}.|\*|\-)?\s*'
       NEWLINE_CHARACTER = /\n+/.freeze
       QUOTE_COMMENT_CHARACTER = /^\s*\>+/.freeze
       ESCAPED_QUOTES = /\\\"/.freeze

data/lib/license_finder/packages/erlangmk_package.rb

@@ -38,7 +38,6 @@ module LicenseFinder
 
     def dep_version
       @dep_version ||= begin
-        version_prefix_re = Regexp.new('^v')
         dep_version_unformatted.sub(version_prefix_re, '')
       end
     end
@@ -81,10 +80,6 @@ module LicenseFinder
       dep =~ word_re
     end
 
-    def word_re
-      @word_re ||= Regexp.new('^\w+$')
-    end
-
     def dep_repo_valid?
       set?(dep_repo_unformatted) &&
         URI.parse(dep_repo)
@@ -96,12 +91,24 @@ module LicenseFinder
       if dep_version =~ version_re
         Gem::Version.correct?(dep_version)
       else
-        dep_version =~ word_re
+        dep_version =~ word_dot_re
       end
     end
 
     def version_re
       @version_re ||= Regexp.new('\d+\.\d+\.\d+')
     end
+
+    def version_prefix_re
+      @version_prefix_re ||= Regexp.new('^v')
+    end
+
+    def word_re
+      @word_re ||= Regexp.new('^\w+$')
+    end
+
+    def word_dot_re
+      @word_dot_re ||= Regexp.new('^[.\w]+$')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 6.8.2
 platform: ruby
 authors:
 - Ryan Collins
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler