yavdb 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1be5fc747b3ec539e16cdb7d4ba3d83da0373cc5
-  data.tar.gz: c8895b7259b34b931f0df57f32cb045d45d9eb8e
+  metadata.gz: 7898e92755673e9d35d1451a3a9b042b2dd0ddf5
+  data.tar.gz: 7a4c82745c283f1c0d9570d49ce82d8652267edc
 SHA512:
-  metadata.gz: 4e2b14ec2b6de43c1a41bc0cb71133a0c83f9caad00a3ff19b6193deb0ead7d971425f6b3ef6f4b2bb9fc304bc24e9f480d5cca88a9bec4836e337465fa94d07
-  data.tar.gz: 2813a004bb9fb2735e834e879ad842502eb22d4e9d70f0466f20408d51128dd7dd3dd0d02504e74730b0f07b02a755ccdf3aff3e01745d771042f528d18987da
+  metadata.gz: c8b6722934c83a3e0bb9052898f79fe145982ee39c5f23eecb9395e9a749351430249a09ada0b5dcefeea7d3879eff877de785ebd66ed80649ff57b9a96250e3
+  data.tar.gz: eca513a3484308b9f1e12749f262f18c857bcd4ae2f32f4e5dcab4ff34ea760547c69e00dca13e912a3019aa99fdddaef92e1d509571e59634f32b166293a70f

data/.circleci/config.yml

@@ -25,8 +25,8 @@ jobs:
     - name: Restore yavdb cache
       type: cache-restore
       keys:
-      - crawler-yavdb-cache-1
-      - crawler-yavdb-cache-
+      - crawler-yavdb-cache-1-{{ checksum "/tmp/yavdb.cache.log" }}
+      - crawler-yavdb-cache-1-
 
     - name: Bundle Install
       type: shell
@@ -48,7 +48,7 @@ jobs:
 
     - name: Save yavdb cache
       type: cache-save
-      key: crawler-yavdb-cache-{{ checksum "/tmp/yavdb.cache.log" }}
+      key: crawler-yavdb-cache-1-{{ checksum "/tmp/yavdb.cache.log" }}
       paths:
       - ~/.yavdb/cache
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yavdb (0.4.1)
+    yavdb (0.4.2)
       json (~> 2.1)
       kramdown (~> 1.17)
       oga (~> 2.15)

data/lib/yavdb/dtos/advisory.rb

@@ -79,11 +79,17 @@ module YAVDB
     def to_map
       map = {}
       members.each do |m|
-        next if !self[m] ||
-                (self[m].is_a?(String) && self[m].empty?) ||
-                (self[m].is_a?(Array) && self[m].none?)
-
-        map[m.to_s] = self[m] if self[m]
+        if !self[m] ||
+           (self[m].is_a?(String) && self[m].empty?) ||
+           (self[m].is_a?(Array) && self[m].none?)
+          next
+        elsif self[m].is_a?(Struct)
+          map[m.to_s] = self[m].to_map
+        elsif self[m].is_a?(Array)
+          map[m.to_s] = self[m].sort_by { |c| c.to_s.downcase }
+        else
+          map[m.to_s] = self[m]
+        end
       end
       map
     end

data/lib/yavdb/sources/ossindex.rb

@@ -93,6 +93,7 @@ module YAVDB
                          .map(&:strip)
                          .reject(&:empty?)
                          .reject { |v| v == '-' }
+                         .map { |version| version.gsub("''", '') }
             versions = ['*'] unless versions.any?
 
             vuln_id_stamp = (cve && cve[0]) || published_date

data/lib/yavdb/sources/ruby_advisory.rb

@@ -33,7 +33,7 @@ module YAVDB
             Dir.chdir(repo_path) do
               file_paths.map do |file_path|
                 advisory_hash = YAML.load_file(file_path)
-                create(advisory_hash)
+                create(file_path, advisory_hash)
               end
             end
           end.flatten
@@ -43,10 +43,11 @@ module YAVDB
 
           private
 
-          def create(advisory_hash)
+          def create(_file_path, advisory_hash)
             date                = Date.strptime(advisory_hash['date'].to_s, '%Y-%m-%d')
             severity            = severity(advisory_hash['cvss_v2'], advisory_hash['cvss_v3'])
-            cve                 = ["CVE-#{advisory_hash['cve']}"]
+            cve                 = advisory_hash['cve'] && "CVE-#{advisory_hash['cve']}"
+            osvdb               = advisory_hash['osvdb'] && "OSVDB-#{advisory_hash['osvdb']}"
             references          = references(advisory_hash)
             vulnerable_versions = if advisory_hash['unaffected_versions'] || advisory_hash['patched_versions']
                                     nil
@@ -54,7 +55,7 @@ module YAVDB
                                     ['*']
                                   end
 
-            vuln_id_stamp = (cve && cve[0]) || date
+            vuln_id_stamp = cve || osvdb || date
             vuln_id       = "rubyadvisory:rubygems:#{advisory_hash['gem']}:#{vuln_id_stamp}"
 
             YAVDB::Advisory.new(

data/lib/yavdb/version.rb

@@ -16,6 +16,6 @@
 
 module YAVDB
 
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yavdb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Rodrigo Fernandes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler