Add extension point to specify different formats of the report

2 files changed, 16 insertions, 14 deletions

diff --git a/spec/integration/cli/scan_spec.rb b/spec/integration/cli/scan_spec.rb
index 00a04cb..b9b548e 100644
--- a/spec/integration/cli/scan_spec.rb
+++ b/spec/integration/cli/scan_spec.rb
@@ -13,6 +13,8 @@ RSpec.describe '`spandx scan` command', type: :cli do
         -a, [--airgap], [--no-airgap]        # Disable network connections
         -l, [--logfile=LOGFILE]              # Path to a logfile
                                              # Default: /dev/null
+        -f, [--format=FORMAT]                # Format of report
+                                             # Default: json
 
       Scan a lockfile and list dependencies/licenses
     OUT
@@ -26,7 +28,7 @@ RSpec.describe '`spandx scan` command', type: :cli do
     expected_output = <<~OUT
       {
         "version": "1.0",
-        "packages": [
+        "dependencies": [
           {
             "name": "net-hippie",
             "version": "0.2.7",
@@ -46,7 +48,7 @@ RSpec.describe '`spandx scan` command', type: :cli do
     expected_output = <<~OUT
       {
         "version": "1.0",
-        "packages": [
+        "dependencies": [
           {
             "name": "net-hippie",
             "version": "0.2.7",
@@ -66,7 +68,7 @@ RSpec.describe '`spandx scan` command', type: :cli do
     expected_output = <<~OUT
       {
         "version": "1.0",
-        "packages": [
+        "dependencies": [
           {
             "name": "six",
             "version": "1.13.0",
diff --git a/spec/unit/cli/scan_spec.rb b/spec/unit/cli/scan_spec.rb
index 6285bdb..81d989c 100644
--- a/spec/unit/cli/scan_spec.rb
+++ b/spec/unit/cli/scan_spec.rb
@@ -22,9 +22,9 @@ RSpec.describe Spandx::Cli::Commands::Scan do
       end
     end
 
-    specify { expect(result['packages'].count).to be(2) }
+    specify { expect(result['dependencies'].count).to be(2) }
     specify { expect(result).to include('version' => '1.0') }
-    specify { expect(result['packages']).to include('name' => 'net-hippie', 'version' => '0.2.7', 'licenses' => ['MIT']) }
+    specify { expect(result['dependencies']).to include('name' => 'net-hippie', 'version' => '0.2.7', 'licenses' => ['MIT']) }
   end
 
   context 'when recursively scanning a directory' do
@@ -38,7 +38,7 @@ RSpec.describe Spandx::Cli::Commands::Scan do
       end
     end
 
-    specify { expect(result['packages'].count).to be(26) }
+    specify { expect(result['dependencies'].count).to be(26) }
   end
 
   context 'when scanning Gemfile.lock' do
@@ -52,7 +52,7 @@ RSpec.describe Spandx::Cli::Commands::Scan do
     end
 
     specify { expect(result).to include('version' => '1.0') }
-    specify { expect(result['packages']).to include('name' => 'net-hippie', 'version' => '0.2.7', 'licenses' => ['MIT']) }
+    specify { expect(result['dependencies']).to include('name' => 'net-hippie', 'version' => '0.2.7', 'licenses' => ['MIT']) }
   end
 
   context 'when scanning gems.lock' do
@@ -66,7 +66,7 @@ RSpec.describe Spandx::Cli::Commands::Scan do
     end
 
     specify { expect(result).to include('version' => '1.0') }
-    specify { expect(result['packages']).to include('name' => 'net-hippie', 'version' => '0.2.7', 'licenses' => ['MIT']) }
+    specify { expect(result['dependencies']).to include('name' => 'net-hippie', 'version' => '0.2.7', 'licenses' => ['MIT']) }
   end
 
   context 'when scanning Pipfile.lock' do
@@ -80,7 +80,7 @@ RSpec.describe Spandx::Cli::Commands::Scan do
     end
 
     specify { expect(result).to include('version' => '1.0') }
-    specify { expect(result['packages']).to include('name' => 'six', 'version' => '1.13.0', 'licenses' => ['MIT']) }
+    specify { expect(result['dependencies']).to include('name' => 'six', 'version' => '1.13.0', 'licenses' => ['MIT']) }
   end
 
   context 'when scanning a packages.config' do
@@ -94,10 +94,10 @@ RSpec.describe Spandx::Cli::Commands::Scan do
     end
 
     specify { expect(result).to include('version' => '1.0') }
-    specify { expect(result['packages']).to include('name' => 'NHibernate', 'version' => '5.2.6', 'licenses' => ['LGPL-2.1-only']) }
-    pending { expect(result['packages']).to include('name' => 'Antlr3.Runtime', 'version' => '', 'licenses' => ['']) }
-    pending { expect(result['packages']).to include('name' => 'Iesi.Collections', 'version' => '', 'licenses' => ['']) }
-    pending { expect(result['packages']).to include('name' => 'Remotion.Linq', 'version' => '', 'licenses' => ['']) }
-    pending { expect(result['packages']).to include('name' => 'Remotion.Linq.EagerFetching', 'version' => '', 'licenses' => ['']) }
+    specify { expect(result['dependencies']).to include('name' => 'NHibernate', 'version' => '5.2.6', 'licenses' => ['LGPL-2.1-only']) }
+    pending { expect(result['dependencies']).to include('name' => 'Antlr3.Runtime', 'version' => '', 'licenses' => ['']) }
+    pending { expect(result['dependencies']).to include('name' => 'Iesi.Collections', 'version' => '', 'licenses' => ['']) }
+    pending { expect(result['dependencies']).to include('name' => 'Remotion.Linq', 'version' => '', 'licenses' => ['']) }
+    pending { expect(result['dependencies']).to include('name' => 'Remotion.Linq.EagerFetching', 'version' => '', 'licenses' => ['']) }
   end
 end