nvd_feed_api 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eede7e83299ed5178ac0ef1563ac49378b90bf6f
-  data.tar.gz: 82f073efcb5f266a8d848e5e93a2e6969ecd01db
+  metadata.gz: 421862fc8896856c94ac947b15d78b2538a9c13c
+  data.tar.gz: 23daab198d07a5da168a8884d2476a73feb21ee7
 SHA512:
-  metadata.gz: e398a51fa724e9028aea8e6966a5b8620d34b9b7a0a20311259e810d99103a04eb0977db8aa46ce8edc4d70d2ee4049903a212309ea570cff752ce01defc37b3
-  data.tar.gz: 235093a028f0bb61bf18879cb6dd3fe42e4e8e45b451ba8de41c6e697edadfc73bf10665ecdd3705ecc8e0220eb6b78edafef92cf22d63058bedc16ad6f6ed19
+  metadata.gz: ddfcce9f3483fee3d46e70a7a9fcc839f22c15a1bbc9c8090df47bfda8de118d0f71ea21d639df8b54ea6efb0c19dfdae383e7b7c71bea026a009a1122fff888
+  data.tar.gz: b8f1755ce9de8c03da15699f4c17f57433d60a02b9b421a38ce420ba4188d59f79ec3cc4069600ee7ed99e63f2981994f511a74ffeebd13fcebc3b2118ba42ce

data/.rubocop.yml

@@ -18,7 +18,7 @@ Metrics/ClassLength:
   Enabled: false
 
 Metrics/CyclomaticComplexity:
-  Max: 15
+  Max: 20
 
 Metrics/LineLength:
   Enabled: false

data/lib/nvd_feed_api.rb

@@ -483,6 +483,8 @@ class NVDFeedScraper
             break
           end
         end
+        # CVE-2002 feed (the 1st one) contains CVE from 1999 to 2002
+        matched_feed = 'CVE-2002' if matched_feed.nil? && ('1999'..'2001').to_a.include?(year)
         raise "bad CVE year in #{arg_cve}" if matched_feed.nil?
         f = feeds(matched_feed)
         f.json_pull
@@ -501,8 +503,17 @@ class NVDFeedScraper
         feed_names = available_feeds.to_set
         feed_names.delete('CVE-Modified')
         feed_names.delete('CVE-Recent')
+        # CVE-2002 feed (the 1st one) contains CVE from 1999 to 2002
+        virtual_feeds = ['CVE-1999', 'CVE-2000', 'CVE-2001']
+        # So virtually add those feed...
+        feed_names.merge(virtual_feeds)
         raise 'unexisting CVE year was provided in some CVE' unless feeds_to_match.subset?(feed_names)
         matched_feeds = feeds_to_match.intersection(feed_names)
+        # and now that the intersection is done remove those virtual feeds and add CVE-2002 instead if needed
+        unless matched_feeds.intersection(virtual_feeds.to_set).empty?
+          matched_feeds.subtract(virtual_feeds)
+          matched_feeds.add('CVE-2002')
+        end
         feeds_arr = feeds(matched_feeds.to_a)
         feeds_arr.each do |feed|
           feed.json_pull

data/lib/nvd_feed_api/version.rb

@@ -1,3 +1,3 @@
 module NvdFeedApi
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.1.0'.freeze
 end

data/pages/CHANGELOG.md

@@ -1,4 +1,11 @@
-# [0.0.3] - 6 January 2017
+# [0.1.0] - 17 January 2018
+
+[0.1.0]: https://gitlab.com/noraj/nvd_api/tags/v0.1.0
+
+- add support for CVE from 1999 to 2001
+- fix tests
+
+# [0.0.3] - 6 January 2018
 
 [0.0.3]: https://gitlab.com/noraj/nvd_api/tags/v0.0.3
 
@@ -6,14 +13,14 @@
 - new badges on README
 - As rubydoc.info seems bug, use gitlab pages instead for hosting YARD doc
 
-# [0.0.2.pre] - 5 January 2017
+# [0.0.2.pre] - 5 January 2018
 
 [0.0.2.pre]: https://gitlab.com/noraj/nvd_api/tags/v0.0.2.pre
 
 - Test a new version number to fix a bug with rubygems.org
 - Correct month name in the dates in the CHANGELOG
 
-# [0.0.1.rc2] - 4 January 2017
+# [0.0.1.rc2] - 4 January 2018
 
 [0.0.1.rc2]: https://gitlab.com/noraj/nvd_api/tags/v0.0.1.rc2
 
@@ -21,7 +28,7 @@
 - Improve the README to be a good entrypoint.
 - Improve the FEATURES.
 
-# [0.0.1.rc1] - 4 January 2017
+# [0.0.1.rc1] - 4 January 2018
 
 [0.0.1.rc1]: https://gitlab.com/noraj/nvd_api/tags/v0.0.1.rc1
 

data/pages/EXAMPLES.md

@@ -12,10 +12,8 @@ s.scrap
 # Change the default feed storage location beacause default value is '/tmp/'.
 # '/tmp/' is mounted as tmpFS and is cleaned at every start.
 # This will considerably speed up your performance is you have to reboot.
-NVDFeedScraper::Feed.default_storage_location = "/home/shark/Dev/cve_feeds"
+NVDFeedScraper::Feed.default_storage_location = "/home/user/Dev/cve_feeds"
 # Create a {Feed} object for all available feeds
-s.feeds(s.available_feeds).each do |f|
-  # and for each one download the JSON file and fill the attributes.
-  f.json_pull
-end
+# and for each one download the JSON file and fill the attributes.
+s.feeds(s.available_feeds).each(&:json_pull)
 ```

data/test/test_nvd_feed_api.rb

@@ -9,7 +9,7 @@ class NVDAPITest < Minitest::Test
   end
 
   def test_scraper_scrap
-    assert_equal(@s.scrap, 0, 'scrap method return nothing')
+    assert_equal(0, @s.scrap, 'scrap method return nothing')
   end
 
   def test_scraper_feeds_noarg
@@ -51,27 +51,27 @@ class NVDAPITest < Minitest::Test
     refute_empty(@s.cve(['CVE-2014-0160', 'cve-2009-3555']), 'cve returns an empty array')
     # bad arg
     ## string but not a CVE ID
-    assert_raises(RuntimeError) do
-      err = @s.cve('e')
-      assert_equal(err.message, 'bad CVE name')
+    err = assert_raises(RuntimeError) do
+      @s.cve('e')
     end
+    assert_equal('bad CVE name', err.message)
     ## correct CVE ID but bad year
-    assert_raises(RuntimeError) do
-      err = @s.cve('CVE-2001-31337')
-      assert_equal(err.message, 'bad CVE year in ["CVE-2001-31337"]')
+    err = assert_raises(RuntimeError) do
+      @s.cve('CVE-1800-31337')
     end
+    assert_equal('bad CVE year in ["CVE-1800-31337"]', err.message)
     ## correct CVE ID and year but unexisting CVE
     assert_nil(@s.cve('CVE-2004-31337'))
     ## correct CVE ID and year but unexisting CVE with array arg
-    assert_raises(RuntimeError) do
-      err = @s.cve(['CVE-2004-31337', 'CVE-2005-31337'])
-      assert_equal(err.message, 'CVE-2005-31337 are unexisting CVEs in this feed')
+    err = assert_raises(RuntimeError) do
+      @s.cve(['CVE-2004-31337', 'CVE-2005-31337'])
     end
+    assert_equal('CVE-2005-31337 are unexisting CVEs in this feed', err.message)
     ## wrong arg type
-    assert_raises(RuntimeError) do
-      err = @s.cve(1)
-      assert_equal(err.message, 'the provided argument (1) is nor a String or an Array')
+    err = assert_raises(RuntimeError) do
+      @s.cve(1)
     end
+    assert_equal('the provided argument (1) is nor a String or an Array', err.message)
   end
 
   def test_scraper_update_feeds
@@ -87,10 +87,10 @@ class NVDAPITest < Minitest::Test
     refute_empty(@s.update_feeds([f2017, f_modified]), 'update_feeds returns an empty array')
     # bad arg
     ## wrong arg type
-    assert_raises(RuntimeError) do
-      err = @s.update_feeds(1)
-      assert_equal(err.message, 'the provided argument 1 is not a Feed or an Array')
+    err = assert_raises(RuntimeError) do
+      @s.update_feeds(1)
     end
+    assert_equal(err.message, 'the provided argument 1 is not a Feed or an Array')
     ## empty array
     assert_empty(@s.update_feeds([]))
   end
@@ -102,7 +102,7 @@ class NVDAPITest < Minitest::Test
     assert_instance_of(String, default_val, "default_storage_location doesn't return a string")
     # check new value
     new_val = '/srv/downloads/'
-    assert_equal(NVDFeedScraper::Feed.default_storage_location = new_val, new_val, 'the new value was not set properly')
+    assert_equal(new_val, NVDFeedScraper::Feed.default_storage_location = new_val, 'the new value was not set properly')
     # put the default value back / restore context
     NVDFeedScraper::Feed.default_storage_location = default_val
   end
@@ -116,7 +116,7 @@ class NVDAPITest < Minitest::Test
     # Test name
     assert_instance_of(String, f.name, "name doesn't return a string")
     refute_empty(f.name, 'name is empty')
-    assert_equal(f.name, name, 'The name of the feed was modified')
+    assert_equal(name, f.name, 'The name of the feed was modified')
     # Test updated
     assert_instance_of(String, f.updated, "updated doesn't return a string")
     refute_empty(f.updated, 'updated is empty')
@@ -127,15 +127,15 @@ class NVDAPITest < Minitest::Test
     # Test gz_url
     assert_instance_of(String, f.gz_url, "gz_url doesn't return a string")
     refute_empty(f.gz_url, 'gz_url is empty')
-    assert_equal(f.gz_url, gz_url, 'The gz_url of the feed was modified')
+    assert_equal(gz_url, f.gz_url, 'The gz_url of the feed was modified')
     # Test zip_url
     assert_instance_of(String, f.zip_url, "zip_url doesn't return a string")
     refute_empty(f.zip_url, 'zip_url is empty')
-    assert_equal(f.zip_url, zip_url, 'The zip_url url of the feed was modified')
+    assert_equal(zip_url, f.zip_url, 'The zip_url url of the feed was modified')
     # Test meta_url
     assert_instance_of(String, f.meta_url, "meta_url doesn't return a string")
     refute_empty(f.meta_url, 'meta_url is empty')
-    assert_equal(f.meta_url, meta_url, 'The meta_url url of the feed was modified')
+    assert_equal(meta_url, f.meta_url, 'The meta_url url of the feed was modified')
   end
 
   def test_feed_available_cves
@@ -149,31 +149,31 @@ class NVDAPITest < Minitest::Test
     f = @s.feeds('CVE-2012')
     f.json_pull
     # one arg
-    assert_instance_of(Hash, @s.cve('CVE-2012-4969'), "cve doesn't return a hash")
+    assert_instance_of(Hash, f.cve('CVE-2012-4969'), "cve doesn't return a hash")
     # two args
-    assert_instance_of(Array, @s.cve('CVE-2012-4969', 'cve-2012-1889'), "cve doesn't return an array")
-    refute_empty(@s.cve('CVE-2012-4969', 'cve-2012-1889'), 'cve returns an empty array')
+    assert_instance_of(Array, f.cve('CVE-2012-4969', 'cve-2012-1889'), "cve doesn't return an array")
+    refute_empty(f.cve('CVE-2012-4969', 'cve-2012-1889'), 'cve returns an empty array')
     # array arg
-    assert_instance_of(Array, @s.cve(['CVE-2012-4969', 'cve-2012-1889']), "cve doesn't return an array")
-    refute_empty(@s.cve(['CVE-2012-4969', 'cve-2012-1889']), 'cve returns an empty array')
+    assert_instance_of(Array, f.cve(['CVE-2012-4969', 'cve-2012-1889']), "cve doesn't return an array")
+    refute_empty(f.cve(['CVE-2012-4969', 'cve-2012-1889']), 'cve returns an empty array')
     # bad arg
     ## string but not a CVE ID
-    assert_raises(RuntimeError) do
-      err = @s.cve('e')
-      assert_equal(err.message, 'bad CVE name')
+    err = assert_raises(RuntimeError) do
+      f.cve('e')
     end
-    ## correct CVE ID but bad year
-    assert_nil(@s.cve('CVE-2004-31337'))
-    ## correct CVE ID and but year not in the feed with array arg
-    assert_raises(RuntimeError) do
-      err = @s.cve(['CVE-2004-31337', 'CVE-2005-31337'])
-      assert_equal(err.message, 'CVE-2004-31337, CVE-2005-31337 are unexisting CVEs in this feed')
+    assert_equal('bad CVE name (e)', err.message)
+    ## bad year
+    assert_nil(f.cve('CVE-2004-31337'))
+    ## bad year not in the feed with array arg
+    err = assert_raises(RuntimeError) do
+      f.cve(['CVE-2004-31337', 'CVE-2005-31337'])
     end
+    assert_equal('CVE-2004-31337, CVE-2005-31337 are unexisting CVEs in this feed', err.message)
     ## wrong arg type
-    assert_raises(RuntimeError) do
-      err = @s.cve(1)
-      assert_equal(err.message, 'the provided argument (1) is nor a String or an Array')
+    err = assert_raises(RuntimeError) do
+      f.cve(1)
     end
+    assert_equal('the provided argument (1) is nor a String or an Array', err.message)
   end
 
   def test_feed_download_gz
@@ -208,19 +208,19 @@ class NVDAPITest < Minitest::Test
 
   def test_meta_parse_noarg
     m = NVDFeedScraper::Meta.new('https://static.nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-2015.meta')
-    assert_equal(m.parse, 0, 'parse method return nothing')
+    assert_equal(0, m.parse, 'parse method return nothing')
   end
 
   def test_meta_parse_witharg
     m = NVDFeedScraper::Meta.new
     meta_url = 'https://static.nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-2015.meta'
-    assert_equal(m.parse(meta_url), 0, 'parse method return nothing')
+    assert_equal(0, m.parse(meta_url), 'parse method return nothing')
   end
 
   def test_meta_url_setter
     m = NVDFeedScraper::Meta.new
     meta_url = 'https://static.nvd.nist.gov/feeds/json/cve/1.0/nvdcve-1.0-2015.meta'
-    assert_equal(m.url = meta_url, meta_url, 'the meta URL is not set correctly')
+    assert_equal(meta_url, m.url = meta_url, 'the meta URL is not set correctly')
   end
 
   def test_meta_attributes
@@ -243,7 +243,7 @@ class NVDAPITest < Minitest::Test
     assert(m.size.match?(/[0-9]+/), 'Meta size is not an integer')
     # Test url
     assert_instance_of(String, m.url, "Meta url method doesn't return a string")
-    assert_equal(m.url, meta_url, 'The Meta url was modified')
+    assert_equal(meta_url, m.url, 'The Meta url was modified')
     # Test zip_size
     assert_instance_of(String, m.zip_size, "Meta zip_size method doesn't return a string")
     assert(m.zip_size.match?(/[0-9]+/), 'Meta zip_size is not an integer')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nvd_feed_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Alexandre ZANNI
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: API for NVD CVE feeds