Reorder codebase and resource attributes

* Reorder codebase and resource level attributes
* replace `#` in license detection identifier with `-`
* regenerate test expectations
* reorder license rule references attributes
* add rule text to license rule references data

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/cluecode/plugin_copyright.py

@@ -28,7 +28,7 @@ class CopyrightScanner(ScanPlugin):
         ('authors',attr.ib(default=attr.Factory(list))),
     ])
 
-    sort_order = 4
+    sort_order = 6
 
     options = [
         PluggableCommandLineOption(('-c', '--copyright',),

src/cluecode/plugin_email.py

@@ -25,7 +25,7 @@ class EmailScanner(ScanPlugin):
     """
     resource_attributes = dict(emails=attr.ib(default=attr.Factory(list)))
 
-    sort_order = 8
+    sort_order = 7
 
     options = [
         PluggableCommandLineOption(('-e', '--email',),

src/cluecode/plugin_url.py

@@ -26,7 +26,7 @@ class UrlScanner(ScanPlugin):
 
     resource_attributes = dict(urls=attr.ib(default=attr.Factory(list)))
 
-    sort_order = 10
+    sort_order = 8
 
     options = [
         PluggableCommandLineOption(('-u', '--url',),

src/licensedcode/detection.py

@@ -292,7 +292,7 @@ def identifier(self):
     @property
     def identifier_with_expression(self):
         id_safe_expression = python_safe_name(s=str(self.license_expression))
-        return "{}#{}".format(id_safe_expression, self.identifier)
+        return "{}-{}".format(id_safe_expression, self.identifier)
 
 
     def get_start_end_line(self):
@@ -657,7 +657,7 @@ class UniqueDetection:
     """
     identifier = attr.ib(default=None)
     license_expression = attr.ib(default=None)
-    occurrence_count = attr.ib(default=None)
+    count = attr.ib(default=None)
     detection_log = attr.ib(default=attr.Factory(list))
     matches = attr.ib(default=attr.Factory(list))
     files = attr.ib(factory=list)
@@ -693,7 +693,7 @@ def get_unique_detections(cls, license_detections):
                     license_expression=detection_mapping["license_expression"],
                     detection_log=detection_mapping["detection_log"],
                     matches=detection_mapping["matches"],
-                    occurrence_count=len(files),
+                    count=len(files),
                     files=files,
                 )
             )

src/licensedcode/plugin_license.py

@@ -74,7 +74,7 @@ class LicenseScanner(ScanPlugin):
         license_rule_references=attr.ib(default=attr.Factory(list))
     )
 
-    sort_order = 2
+    sort_order = 4
 
     options = [
         PluggableCommandLineOption(('-l', '--license'),

src/packagedcode/plugin_package.py

@@ -91,10 +91,10 @@ class PackageScanner(ScanPlugin):
     """
 
     codebase_attributes = dict(
-        # a list of dependencies
-        dependencies=attr.ib(default=attr.Factory(list), repr=False),
         # a list of packages
         packages=attr.ib(default=attr.Factory(list), repr=False),
+        # a list of dependencies
+        dependencies=attr.ib(default=attr.Factory(list), repr=False),
     )
     resource_attributes = dict(
         # a list of package data
@@ -105,7 +105,7 @@ class PackageScanner(ScanPlugin):
 
     required_plugins = ['scan:licenses']
 
-    sort_order = 6
+    sort_order = 3
 
     options = [
         PluggableCommandLineOption(

src/summarycode/classify_plugin.py

@@ -93,7 +93,7 @@ class FileClassifier(PreScanPlugin):
 
     ])
 
-    sort_order = 50
+    sort_order = 30
 
     options = [
         PluggableCommandLineOption(('--classify',),

src/summarycode/plugin_consolidate.py

@@ -139,7 +139,7 @@ class Consolidator(PostScanPlugin):
         consolidated_to=attr.ib(default=attr.Factory(list))
     )
 
-    sort_order = 8
+    sort_order = 10
 
     options = [
         PluggableCommandLineOption(('--consolidate',),

src/summarycode/summarizer.py

@@ -55,7 +55,7 @@ class ScanSummary(PostScanPlugin):
     Summarize a scan at the codebase level.
     """
 
-    sort_order = 10
+    sort_order = 2
 
     codebase_attributes = dict(summary=attr.ib(default=attr.Factory(dict)))
 

src/summarycode/tallies.py

@@ -47,7 +47,7 @@ class Tallies(PostScanPlugin):
     """
     Compute tallies for license, copyright and other scans at the codebase level
     """
-    sort_order = 10
+    sort_order = 15
 
     codebase_attributes = dict(tallies=attr.ib(default=attr.Factory(dict)))