Merge pull request #31 from jufemaiz/bugfix/USN-3235-1-LIBXML2-VULNER…

…ABILITIES Dependency Updates
jufemaiz · Oct 24, 2017 · b91e0e1 · b91e0e1
2 parents 013836e + 5b23554
commit b91e0e1
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 132 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,19 @@ bundler_args: --retry=3 --jobs=3
 cache: bundler
 sudo: false
 rvm:
+  - 2.4.2
+  - 2.4.1
+  - 2.4.0
+  - 2.3.5
+  - 2.3.4
+  - 2.3.3
+  - 2.3.2
+  - 2.3.1
   - 2.3.0
-  - 2.2.4
-  - 2.2.3
-  - 2.2.2
-  - 2.2.1
-  - 2.2.0
-  - 2.1.8
-  - 1.9.3-p551
+  - 2.2.8
+  - 2.2.7
+  - 2.2.6
+  - 2.2.5
   - ruby-head
 matrix:
   allow_failures:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # AEMO Gem Changelog
 
+## 0.1.41
+
+* Dependency updates
+* Drop support for old versions of Ruby. Currently supported versions are:
+  * ruby-head
+  * 2.4 (.0, .1, .2)
+  * 2.3 (.0, .1, .2, .3, .4, .5)
+  * 2.2 (.5, .6, .7, .8)
+
 ## 0.1.40
 
 * Remove ZIP

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,50 +2,51 @@ PATH
   remote: .
   specs:
     aemo (0.1.39)
-      activesupport (~> 4.2, >= 4.2.6)
-      httparty (~> 0.13.0, >= 0.13.7)
-      json (~> 1.8)
-      multi_xml (~> 0.5, >= 0.5.2)
-      nokogiri (~> 1.6, >= 1.6.8)
+      activesupport (>= 4.2.6, < 5.1)
+      httparty (~> 0.15, >= 0.15.6)
+      json (~> 2.1)
+      multi_xml (~> 0.6, >= 0.5.0)
+      nokogiri (~> 1.8, >= 1.8.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (5.0.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     ast (2.3.0)
-    awesome_print (1.7.0)
-    builder (3.2.2)
-    coderay (1.1.1)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    awesome_print (1.8.0)
+    builder (3.2.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
+    ffi (1.9.18)
     formatador (0.2.5)
     git (1.3.0)
-    github_api (0.14.2)
+    github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      oauth2
-    guard (2.14.0)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
@@ -54,133 +55,131 @@ GEM
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-yard (2.1.4)
+    guard-yard (2.2.0)
       guard (>= 1.1.0)
       yard (>= 0.7.0)
-    hashdiff (0.3.0)
-    hashie (3.4.4)
+    hashdiff (0.3.7)
+    hashie (3.5.6)
     highline (1.7.8)
-    httparty (0.13.7)
-      json (~> 1.8)
+    httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.8.6)
-    jeweler (2.1.1)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
+    jeweler (2.3.7)
       builder
-      bundler (>= 1.0)
+      bundler (>= 1)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-      semver
-    json (1.8.3)
-    jwt (1.5.1)
-    listen (3.0.8)
+      semver2
+    json (2.1.0)
+    jwt (1.5.6)
+    listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    lumberjack (1.0.10)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.12)
+    method_source (0.9.0)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
     minitest (5.10.3)
-    multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_json (1.12.2)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    notiffany (0.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (1.1.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    pkg-config (1.1.7)
     powerpack (0.1.1)
-    pry (0.10.3)
+    pry (0.11.1)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    rack (1.6.4)
+      method_source (~> 0.9.0)
+    psych (2.2.4)
+    rack (2.0.3)
     rainbow (2.2.2)
       rake
-    rake (11.2.2)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (12.1.0)
+    rb-fsevent (0.10.2)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.41.2)
-      parser (>= 2.3.1.1, < 3.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    rubocop (0.50.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    semver (1.0.1)
+    semver2 (3.4.2)
     shellany (0.0.1)
-    simplecov (0.11.2)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    term-ansicolor (1.3.2)
+    simplecov-html (0.10.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    timecop (0.8.1)
-    tins (1.6.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    tins (1.15.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
-    webmock (2.1.0)
+    webmock (3.1.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.8.7.6)
+    yard (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   aemo!
-  awesome_print (~> 1.7, >= 1.7.0)!
-  coveralls (~> 0.8, >= 0.8.13)!
-  guard-yard (~> 2.1, >= 2.1.3)!
-  jeweler (~> 2.1, >= 2.1.1)!
-  listen (~> 3.0, = 3.0.8)!
-  pry (~> 0.10, >= 0.10.3)!
-  pry-nav (~> 0.2, >= 0.2.4)!
-  rdoc (~> 4.2, >= 4.2.2)!
-  rspec (~> 3.4, >= 3.4.0)!
-  rubocop (~> 0.41.0, >= 0.41.2)!
-  simplecov (~> 0.11, >= 0.11.2)!
-  timecop (~> 0.8, >= 0.8.1)!
-  webmock (~> 2.1, >= 2.1.0)!
-  yard (~> 0.8.7, >= 0.8.7.6)!
+  awesome_print (~> 1.8, >= 1.8.0)!
+  coveralls (~> 0.8, >= 0.8.21)!
+  guard-yard (~> 2.2, >= 2.2.0)!
+  jeweler (~> 2.3, >= 2.3.7)!
+  listen (~> 3.1, = 3.1.5)!
+  rdoc (~> 5.1, >= 5.1.0)!
+  rspec (~> 3.7, >= 3.7.0)!
+  rubocop (~> 0.50, >= 0.50.0)!
+  simplecov (~> 0.14, >= 0.14.1)!
+  timecop (~> 0.9, >= 0.9.1)!
+  webmock (~> 3.1, >= 3.1.0)!
+  yard (~> 0.9, >= 0.9.9)!
 
 BUNDLED WITH
-   1.13.6
+   1.15.4
diff --git a/README.md b/README.md
@@ -13,6 +13,13 @@ http://www.rubydoc.info/gems/aemo
 
 # Installation
 
+## Ruby Versions Supported
+
+* ruby-head
+* 2.4 (.0, .1, .2)
+* 2.3 (.0, .1, .2, .3, .4, .5)
+* 2.2 (.5, .6, .7, .8)
+
 ## Manually from RubyGems.org ###
 
 ```sh

diff --git a/aemo.gemspec b/aemo.gemspec
@@ -23,27 +23,23 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
 
   # Production Dependencies
-  s.add_dependency 'json',      '~> 1.8'
-  s.add_dependency 'nokogiri',  '~> 1.6', '>= 1.6.8'
-  # s.add_dependency 'rubyzip',   '~> 1.2', '>= 1.2.1'
-  s.add_dependency 'multi_xml', '~> 0.5', '>= 0.5.2'
-  s.add_dependency 'httparty',  '~> 0.13.0',  '>= 0.13.7'
-  s.add_dependency 'activesupport', '~> 4.2', '>= 4.2.6'
+  s.add_dependency 'json',      '~> 2.1'
+  s.add_dependency 'nokogiri',  '~> 1.8', '>= 1.8.1'
+  s.add_dependency 'multi_xml', '~> 0.6',   '>= 0.5.0'
+  s.add_dependency 'httparty',  '~> 0.15',  '>= 0.15.6'
+  s.add_dependency 'activesupport', '>= 4.2.6', '< 5.1'
 
   # Development Dependencies
-  # s.add_development_dependency 'bundler', '~> 1.12', '>= 1.12.5'
-  s.add_development_dependency 'listen', '~> 3.0', '= 3.0.8'
-  s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
-  s.add_development_dependency 'rdoc', '~> 4.2', '>= 4.2.2'
-  s.add_development_dependency 'jeweler', '~> 2.1', '>= 2.1.1'
-  s.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
-  s.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8.13'
-  s.add_development_dependency 'awesome_print', '~> 1.7', '>= 1.7.0'
-  s.add_development_dependency 'pry', '~> 0.10', '>= 0.10.3'
-  s.add_development_dependency 'pry-nav', '~> 0.2', '>= 0.2.4'
-  s.add_development_dependency 'yard', '~> 0.8.7', '>= 0.8.7.6'
-  s.add_development_dependency 'guard-yard', '~> 2.1', '>= 2.1.3'
-  s.add_development_dependency 'webmock', '~> 2.1', '>= 2.1.0'
-  s.add_development_dependency 'rubocop', '~> 0.41.0', '>= 0.41.2'
-  s.add_development_dependency 'timecop', '~> 0.8', '>= 0.8.1'
+  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 '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 'rdoc', '~> 5.1', '>= 5.1.0'
+  s.add_development_dependency 'rspec', '~> 3.7', '>= 3.7.0'
+  s.add_development_dependency 'rubocop', '~> 0.50', '>= 0.50.0'
+  s.add_development_dependency 'simplecov', '~> 0.14', '>= 0.14.1'
+  s.add_development_dependency 'timecop', '~> 0.9', '>= 0.9.1'
+  s.add_development_dependency 'webmock', '~> 3.1', '>= 3.1.0'
+  s.add_development_dependency 'yard', '~> 0.9', '>= 0.9.9'
 end
diff --git a/lib/aemo/version.rb b/lib/aemo/version.rb
@@ -24,7 +24,7 @@
 # @author Joel Courtney <[email protected]>
 module AEMO
   # aemo version
-  VERSION = '0.1.40'.freeze
+  VERSION = '0.1.41'.freeze
 
   # aemo version split amongst different revisions
   MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)