Install gem and integrate with lib folder

6 files changed, 9 insertions, 33 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 95ee0f7..4a601ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,7 @@ PATH
       net-hippie (~> 0.3)
       nokogiri (~> 1.10)
       thor
+      zeitwerk (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -105,6 +106,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
diff --git a/lib/spandx.rb b/lib/spandx.rb
index 5b83afe..07564d3 100644
--- a/lib/spandx.rb
+++ b/lib/spandx.rb
@@ -9,37 +9,10 @@ require 'logger'
 require 'net/hippie'
 require 'nokogiri'
 require 'pathname'
+require 'zeitwerk'
 
-require 'spandx/core/cache'
-require 'spandx/core/content'
-require 'spandx/core/database'
-require 'spandx/core/dependency'
-require 'spandx/core/guess'
-require 'spandx/core/http'
-require 'spandx/core/parser'
-require 'spandx/core/report'
-require 'spandx/core/score'
-require 'spandx/dotnet/index'
-require 'spandx/dotnet/nuget_gateway'
-require 'spandx/dotnet/package_reference'
-require 'spandx/dotnet/parsers/csproj'
-require 'spandx/dotnet/parsers/packages_config'
-require 'spandx/dotnet/parsers/sln'
-require 'spandx/dotnet/project_file'
-require 'spandx/java/index'
-require 'spandx/java/metadata'
-require 'spandx/java/parsers/maven'
-require 'spandx/js/parsers/yarn'
-require 'spandx/python/parsers/pipfile_lock'
-require 'spandx/python/index'
-require 'spandx/python/pypi'
-require 'spandx/python/source'
-require 'spandx/rubygems/gateway'
-require 'spandx/rubygems/parsers/gemfile_lock'
-require 'spandx/spdx/catalogue'
-require 'spandx/spdx/gateway'
-require 'spandx/spdx/license'
-require 'spandx/version'
+loader = Zeitwerk::Loader.for_gem
+loader.setup # ready!
 
 module Spandx
   class Error < StandardError; end
diff --git a/lib/spandx/python/index.rb b/lib/spandx/python/index.rb
index 3af257a..6c0c2e2 100644
--- a/lib/spandx/python/index.rb
+++ b/lib/spandx/python/index.rb
@@ -11,7 +11,7 @@ module Spandx
         @directory = directory
         @name = 'pypi'
         @source = 'https://pypi.org'
-        @pypi = PyPI.new
+        @pypi = Pypi.new
         Thread.abort_on_exception = true
       end
 
diff --git a/lib/spandx/python/pypi.rb b/lib/spandx/python/pypi.rb
index ff96849..a976039 100644
--- a/lib/spandx/python/pypi.rb
+++ b/lib/spandx/python/pypi.rb
@@ -2,7 +2,7 @@
 
 module Spandx
   module Python
-    class PyPI
+    class Pypi
       def initialize(sources: [Source.default])
         @sources = sources
       end
diff --git a/spandx.gemspec b/spandx.gemspec
index 107697c..87945c7 100644
--- a/spandx.gemspec
+++ b/spandx.gemspec
@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bundler', '>= 1.16', '< 3.0.0'
   spec.add_dependency 'net-hippie', '~> 0.3'
   spec.add_dependency 'nokogiri', '~> 1.10'
+  spec.add_dependency 'zeitwerk', '~> 2.3'
   spec.add_dependency 'thor'
 
   spec.add_development_dependency 'bundler-audit', '~> 0.6'
diff --git a/spec/unit/python/pypi_spec.rb b/spec/unit/python/pypi_spec.rb
index aa87025..f5ce0b5 100644
--- a/spec/unit/python/pypi_spec.rb
+++ b/spec/unit/python/pypi_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Spandx::Python::PyPI do
+RSpec.describe Spandx::Python::Pypi do
   describe '#definition_for' do
     subject { described_class.new }