Replace xml-kit with nokogiri

5 files changed, 8 insertions, 36 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index f6b23d7..33517bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,28 +5,18 @@ PATH
       bundler (>= 1.16, < 3.0.0)
       licensee (~> 9.13)
       net-hippie (~> 0.3)
+      nokogiri (~> 1.10)
       thor (~> 0.1)
-      xml-kit (~> 0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activesupport (6.0.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
-    builder (3.2.4)
     bundler-audit (0.6.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
-    concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -34,8 +24,6 @@ GEM
     faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     hashdiff (1.0.0)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     licensee (9.13.0)
       dotenv (~> 2.0)
@@ -44,7 +32,6 @@ GEM
       rugged (~> 0.24)
       thor (~> 0.19)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
     multipart-post (2.1.1)
     net-hippie (0.3.1)
     nokogiri (1.10.7)
@@ -89,25 +76,12 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
     unicode-display_width (1.6.1)
     vcr (5.0.0)
     webmock (3.8.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    xml-kit (0.4.0)
-      activemodel (>= 4.2.0)
-      builder (~> 3.2)
-      nokogiri (~> 1.10)
-      tilt (>= 1.4.1)
-      xmldsig (~> 0.6)
-    xmldsig (0.6.6)
-      nokogiri (>= 1.6.8, < 2.0.0)
-    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
diff --git a/lib/spandx.rb b/lib/spandx.rb
index dff8445..d9d491f 100644
--- a/lib/spandx.rb
+++ b/lib/spandx.rb
@@ -2,7 +2,9 @@
 
 require 'forwardable'
 require 'json'
+require 'licensee'
 require 'net/hippie'
+require 'nokogiri'
 require 'pathname'
 
 require 'spandx/catalogue'
diff --git a/lib/spandx/parsers/csproj.rb b/lib/spandx/parsers/csproj.rb
index 08d14f7..34a7fd6 100644
--- a/lib/spandx/parsers/csproj.rb
+++ b/lib/spandx/parsers/csproj.rb
@@ -9,7 +9,7 @@ module Spandx
 
       def parse(lockfile)
         document = from_xml(IO.read(lockfile))
-        document.find_all('//PackageReference').map do |node|
+        document.search('//PackageReference').map do |node|
           name = attribute_for('Include', node)
           version = attribute_for('Version', node)
           Dependency.new(
@@ -23,7 +23,7 @@ module Spandx
       private
 
       def from_xml(xml)
-        Xml::Kit::Document.new(xml, namespaces: {})
+        Nokogiri::XML(xml)
       end
 
       def attribute_for(key, node)
diff --git a/lib/spandx/parsers/packages_config.rb b/lib/spandx/parsers/packages_config.rb
index 15bdb12..64d7cf1 100644
--- a/lib/spandx/parsers/packages_config.rb
+++ b/lib/spandx/parsers/packages_config.rb
@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'tmpdir'
-require 'xml-kit'
-require 'licensee'
-
 module Spandx
   module Parsers
     class PackagesConfig < Base
@@ -12,8 +8,8 @@ module Spandx
       end
 
       def parse(lockfile)
-        Xml::Kit::Document.new(IO.read(lockfile))
-          .find_all('//package')
+        Nokogiri::XML(IO.read(lockfile))
+          .search('//package')
           .map { |node| map_from(node) }
       end
 
diff --git a/spandx.gemspec b/spandx.gemspec
index 60f82ec..60b0d26 100644
--- a/spandx.gemspec
+++ b/spandx.gemspec
@@ -32,8 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bundler', '>= 1.16', '< 3.0.0'
   spec.add_dependency 'licensee', '~> 9.13'
   spec.add_dependency 'net-hippie', '~> 0.3'
+  spec.add_dependency 'nokogiri', '~> 1.10'
   spec.add_dependency 'thor', '~> 0.1'
-  spec.add_dependency 'xml-kit', '~> 0.4'
   spec.add_development_dependency 'bundler-audit', '~> 0.6'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'