From dff2bcac25451ceacea5617a32d634d240f483de Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 28 Nov 2019 17:59:33 +0000
Subject: Delegate to license finder to sort dependencies

* Sort dependencies by name then by version
* Log detections
---
 lib/license/management/report/base.rb | 2 +-
 lib/license/management/report/v1.rb   | 4 +---
 lib/license/management/report/v2.rb   | 7 +++++--
 lib/license/management/version.rb     | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/license/management/report/base.rb b/lib/license/management/report/base.rb
index ab9b6a1..2d49341 100644
--- a/lib/license/management/report/base.rb
+++ b/lib/license/management/report/base.rb
@@ -10,7 +10,7 @@ module License
         attr_reader :dependencies, :repository
 
         def initialize(dependencies)
-          @dependencies = dependencies
+          @dependencies = dependencies.sort
           @repository = License::Management::Repository.new
         end
 
diff --git a/lib/license/management/report/v1.rb b/lib/license/management/report/v1.rb
index 1cc8728..49423c6 100644
--- a/lib/license/management/report/v1.rb
+++ b/lib/license/management/report/v1.rb
@@ -57,9 +57,7 @@ module License
         end
 
         def formatted_dependencies(dependencies)
-          dependencies
-            .sort_by(&:name)
-            .map { |x| map_from_dependency(x) }
+          dependencies.map { |x| map_from_dependency(x) }
         end
 
         def best_name_for(license)
diff --git a/lib/license/management/report/v2.rb b/lib/license/management/report/v2.rb
index 810d191..87c4a78 100644
--- a/lib/license/management/report/v2.rb
+++ b/lib/license/management/report/v2.rb
@@ -8,7 +8,7 @@ module License
           {
             version: '2.0',
             licenses: license_summary,
-            dependencies: dependencies.sort_by(&:name).map { |x| map_from(x) }
+            dependencies: dependencies.map { |x| map_from(x) }
           }
         end
 
@@ -30,12 +30,15 @@ module License
         end
 
         def map_from(dependency)
+          licenses = dependency.licenses.map { |license| data_for(license)['id'] }
+          log_info [dependency.name, dependency.version, licenses].inspect
+
           {
             name: dependency.name,
             url: dependency.homepage,
             description: description_for(dependency),
             paths: paths_from(dependency),
-            licenses: dependency.licenses.map { |x| data_for(x)['id'] }
+            licenses: licenses
           }
         end
       end
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 48f6c19..a2b995b 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end
-- 
cgit v1.2.3