Merge 0b712da into b7cf8d6

CHANGELOG.md

@@ -1,5 +1,14 @@
 # AEMO Gem Changelog
 
+## 0.3.3 (2018-11-17)
+
+- Upgrade [nokogiri](https://rubygems.org/gems/nokogiri) to v1.8.5 to resolve
+  vulnerabilities:
+  - [CVE-2018-14404](https://nvd.nist.gov/vuln/detail/CVE-2018-14404)
+  - [CVE-2018-14567](https://nvd.nist.gov/vuln/detail/CVE-2018-14567)
+- Set [ffi](https://rubygems.org/gems/ffi) and
+  [rack](https://rubygems.org/gems/rack) versions to resolve vulnerabilities.
+
 ## 0.3.2
 
 - Support JSON v2.x.y JSON (#46)

Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    aemo (0.3.1)
+    aemo (0.3.3)
       activesupport (>= 4.2.6, < 5.2)
       httparty (~> 0.15, >= 0.15.6)
       json (>= 1.7.5, < 3)
       multi_xml (~> 0.6, >= 0.5.0)
-      nokogiri (~> 1.8, >= 1.8.2)
+      nokogiri (~> 1.8, >= 1.8.5)
 
 GEM
   remote: https://rubygems.org/
@@ -21,10 +21,10 @@ GEM
     awesome_print (1.8.0)
     builder (3.2.3)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    coveralls (0.8.21)
+    concurrent-ruby (1.1.3)
+    coveralls (0.8.22)
       json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
@@ -33,134 +33,134 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.9.25)
     formatador (0.2.5)
-    git (1.3.0)
+    git (1.5.0)
     github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
       mime-types (>= 1.16, < 3.0)
       oauth2 (~> 1.0)
-    guard (2.14.1)
+    guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-yard (2.2.0)
+    guard-yard (2.2.1)
       guard (>= 1.1.0)
       yard (>= 0.7.0)
     hashdiff (0.3.7)
-    hashie (3.5.6)
-    highline (1.7.8)
+    hashie (3.6.0)
+    highline (2.0.0)
     httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    i18n (1.1.0)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
-    jeweler (2.3.7)
+    jeweler (2.3.9)
       builder
-      bundler (>= 1)
+      bundler
       git (>= 1.2.5)
       github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
-      psych (~> 2.2)
+      psych
       rake
       rdoc
       semver2
     json (2.1.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.9.0)
+    lumberjack (1.0.13)
+    method_source (0.9.2)
     mime-types (2.99.3)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
-    pry (0.11.1)
+    powerpack (0.1.2)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    psych (2.2.4)
-    rack (2.0.3)
+    psych (3.0.3)
+    rack (2.0.6)
     rainbow (3.0.0)
-    rake (12.1.0)
-    rb-fsevent (0.10.2)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rdoc (5.1.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rubocop (0.52.1)
       parallel (~> 1.10)
       parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     semver2 (3.4.2)
     shellany (0.0.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    term-ansicolor (1.6.0)
+    term-ansicolor (1.7.0)
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    tins (1.15.0)
+    tins (1.20.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.2)
-    webmock (3.1.0)
+    unicode-display_width (1.4.0)
+    webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.9.12)
+    yard (0.9.16)
 
 PLATFORMS
   ruby
@@ -169,9 +169,11 @@ DEPENDENCIES
   aemo!
   awesome_print (~> 1.8, >= 1.8.0)!
   coveralls (~> 0.8, >= 0.8.21)!
+  ffi (~> 1, > 1.9.18)!
   guard-yard (~> 2.2, >= 2.2.0)!
   jeweler (~> 2.3, >= 2.3.7)!
   listen (~> 3.1, = 3.1.5)!
+  rack (~> 2, >= 2.0.4)!
   rdoc (~> 5.1, >= 5.1.0)!
   rspec (~> 3.7, >= 3.7.0)!
   rubocop (~> 0.52.1, >= 0.52.1)!

README.md

@@ -6,6 +6,7 @@ Makes working with AEMO data more pleasant.
 [![Maintainability](https://api.codeclimate.com/v1/badges/f16f9df6762d9870cd2c/maintainability)](https://codeclimate.com/github/jufemaiz/aemo/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/f16f9df6762d9870cd2c/test_coverage)](https://codeclimate.com/github/jufemaiz/aemo/test_coverage)
 [![Coverage Status](https://coveralls.io/repos/github/jufemaiz/aemo/badge.svg?branch=master)](https://coveralls.io/github/jufemaiz/aemo?branch=master)
+[![Known Vulnerabilities](https://snyk.io/test/github/jufemaiz/aemo/badge.svg)](https://snyk.io/test/github/jufemaiz/aemo)
 [![Help Contribute to Open Source](https://www.codetriage.com/jufemaiz/aemo/badges/users.svg)](https://www.codetriage.com/jufemaiz/aemo)
 
 # Documentation

aemo.gemspec

@@ -27,14 +27,16 @@ Gem::Specification.new do |s|
   s.add_dependency 'httparty',  '~> 0.15', '>= 0.15.6'
   s.add_dependency 'json', '>= 1.7.5', '< 3'
   s.add_dependency 'multi_xml', '~> 0.6', '>= 0.5.0'
-  s.add_dependency 'nokogiri',  '~> 1.8', '>= 1.8.2'
+  s.add_dependency 'nokogiri',  '~> 1.8', '>= 1.8.5'
 
   # Development Dependencies
   s.add_development_dependency 'awesome_print', '~> 1.8', '>= 1.8.0'
   s.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8.21'
+  s.add_development_dependency 'ffi', '~> 1', '> 1.9.18'
   s.add_development_dependency 'guard-yard', '~> 2.2', '>= 2.2.0'
   s.add_development_dependency 'jeweler', '~> 2.3', '>= 2.3.7'
   s.add_development_dependency 'listen', '~> 3.1', '= 3.1.5'
+  s.add_development_dependency 'rack', '~> 2', '>= 2.0.4'
   s.add_development_dependency 'rdoc', '~> 5.1', '>= 5.1.0'
   s.add_development_dependency 'rspec', '~> 3.7', '>= 3.7.0'
   s.add_development_dependency 'rubocop', '~> 0.52.1', '>= 0.52.1'

lib/aemo/version.rb

@@ -24,7 +24,7 @@
 # @author Joel Courtney <euphemize@gmail.com>
 module AEMO
   # aemo version
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 
   # aemo version split amongst different revisions
   MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)