re-organized project files

blueoly · Mar 18, 2016 · feb9753 · feb9753
1 parent 5db56e8
commit feb9753
Show file tree

Hide file tree

Showing 28 changed files with 260 additions and 217 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Aggregator.py b/Aggregator.py
@@ -1,4 +1,5 @@
-import Constants as CONSTS
+from SmellDetector import Constants as CONSTS
+
 
 def aggregate(folder, name, outFile):
     fileCount = 0

diff --git a/Puppet-lint_aggregator/PuppetLintRules.py b/Puppet-lint_aggregator/PuppetLintRules.py
@@ -1,8 +1,9 @@
 import os
-import Analyzer
-import Aggregator
+
 import PLConstants as CONSTS
 
+import Aggregator
+
 root = CONSTS.REPO_ROOT
 # print("Initiating Custom Puppet-Lint Analyzer...")
 # totalRepos = len(os.listdir(root))

diff --git a/Puppet-lint_aggregator/Test.py b/Puppet-lint_aggregator/Test.py
@@ -1,7 +1,8 @@
 from unittest import TestCase
+
 import Aggregator
-import Constants as CONSTS
-import Analyzer
+from SmellDetector import Constants as CONSTS, Analyzer
+
 
 class TestAggregator(TestCase):
     def test_aggregate(self):

diff --git a/Puppeteer.py b/Puppeteer.py
@@ -1,7 +1,7 @@
 import os
-import Analyzer
+
 import Aggregator
-import Constants as CONSTS
+from SmellDetector import Constants as CONSTS, Analyzer
 
 root = CONSTS.REPO_ROOT
 print("Initiating Analyzer...")

diff --git a/AbsSmellDectector.py → SmellDetector/AbsSmellDectector.py b/AbsSmellDectector.py → SmellDetector/AbsSmellDectector.py
@@ -1,9 +1,10 @@
 import os
-import SourceModel.SM_File
-import Utilities
-import Constants as CONSTS
 import re
 
+import SourceModel.SM_File
+from SmellDetector import Constants as CONSTS, Utilities
+
+
 def detectSmells(folder, outputFile):
     detectMultifacetedAbs(folder, outputFile)
     detectUnnecessaryAbs(folder, outputFile)

diff --git a/Analyzer.py → SmellDetector/Analyzer.py b/Analyzer.py → SmellDetector/Analyzer.py
@@ -1,8 +1,6 @@
-import FileOperations
-import SizeMetrics
-import Constants as CONSTS
-import SmellDectector
-import Utilities
+import SmellDetector.Constants as CONSTS
+from SmellDetector import SmellDectector, SizeMetrics, FileOperations, Utilities
+
 
 def analyze(folder, repoName):
     outputFile = open(folder + "/" + CONSTS.PUPPETEER_OUT_FILE, 'w')

diff --git a/Constants.py → SmellDetector/Constants.py b/Constants.py → SmellDetector/Constants.py
diff --git a/DepSmellDectector.py → SmellDetector/DepSmellDectector.py b/DepSmellDectector.py → SmellDetector/DepSmellDectector.py
@@ -1,9 +1,8 @@
-import Utilities
 import os
+
 import SourceModel.SM_File
-import Constants as CONSTS
-import FileOperations
-import inspect
+from SmellDetector import Constants as CONSTS, Utilities
+
 
 def detectSmells(folder, outputFile):
     detectMissingDep(folder, outputFile)

diff --git a/EncSmellDectector.py → SmellDetector/EncSmellDectector.py b/EncSmellDectector.py → SmellDetector/EncSmellDectector.py
@@ -1,7 +1,8 @@
-import Utilities
 import os
+
 import SourceModel.SM_File
-import Constants as CONSTS
+from SmellDetector import Constants as CONSTS, Utilities
+
 
 def detectSmells(folder, outputFile):
     detectDeficientEnc(folder, outputFile)

diff --git a/FileOperations.py → SmellDetector/FileOperations.py b/FileOperations.py → SmellDetector/FileOperations.py
diff --git a/HieSmellDectector.py → SmellDetector/HieSmellDectector.py b/HieSmellDectector.py → SmellDetector/HieSmellDectector.py
@@ -1,7 +1,8 @@
-import Utilities
 import os
-import Constants as CONSTS
+
 import SourceModel.SM_File
+from SmellDetector import Constants as CONSTS, Utilities
+
 
 def detectSmells(folder, outputFile):
     detectBrokenHie(folder, outputFile)

diff --git a/ModSmellDectector.py → SmellDetector/ModSmellDectector.py b/ModSmellDectector.py → SmellDetector/ModSmellDectector.py
@@ -1,12 +1,13 @@
-import Utilities
 import os
-import SourceModel.SM_File
-import Constants as CONSTS
-import FileOperations
+
+import Graph.GR_Constants as GRCONSTS
 import Graph.Graph
 import Graph.GraphNode
 import Graph.Resource
-import Graph.GR_Constants as GRCONSTS
+import SmellDetector.Constants as CONSTS
+import SourceModel.SM_File
+from SmellDetector import FileOperations, Utilities
+
 
 def detectSmells(folder, outputFile):
     detectInsufficientMod(folder, outputFile)
@@ -125,7 +126,7 @@ def detectUnstructuredModForm2(folder, outputFile):
 
 def detectUnsModForm2(folder, outputFile):
     if not getManifestsFolder(folder):
-        Utilities.reportSmell(outputFile,folder, CONSTS.SMELL_UNS_MOD_2, CONSTS.MODULE_MANIFEST)
+        Utilities.reportSmell(outputFile, folder, CONSTS.SMELL_UNS_MOD_2, CONSTS.MODULE_MANIFEST)
 
 #Form 3 - When a module contains other than recommended folders/files
 def detectUnstructuredModForm3(folder, outputFile):

diff --git a/SizeMetrics.py → SmellDetector/SizeMetrics.py b/SizeMetrics.py → SmellDetector/SizeMetrics.py
@@ -1,8 +1,8 @@
 import os
-import re
-import Constants as CONSTS
+
 import SourceModel.SM_File
-import Utilities
+from SmellDetector import Constants as CONSTS, Utilities
+
 
 def collectSizeMetrics(folder, outputFile):
     totalClasses = 0

diff --git a/SmellDectector.py → SmellDetector/SmellDectector.py b/SmellDectector.py → SmellDetector/SmellDectector.py
@@ -1,8 +1,5 @@
-import AbsSmellDectector
-import EncSmellDectector
-import ModSmellDectector
-import DepSmellDectector
-import HieSmellDectector
+from SmellDetector import AbsSmellDectector, ModSmellDectector, HieSmellDectector, DepSmellDectector, EncSmellDectector
+
 
 def detectSmells(folder, outputFile):
     AbsSmellDectector.detectSmells(folder, outputFile)

diff --git a/Utilities.py → SmellDetector/Utilities.py b/Utilities.py → SmellDetector/Utilities.py
@@ -1,4 +1,5 @@
-import Constants as CONSTS
+from SmellDetector import Constants as CONSTS
+
 
 def myPrint(msg):
     if(CONSTS.DEBUG_ON):

diff --git a/SmellDetector/__init__.py b/SmellDetector/__init__.py
diff --git a/SourceModel/SM_Class.py b/SourceModel/SM_Class.py
@@ -1,17 +1,18 @@
 import re
-import Utilities
+
+import SourceModel.SM_CaseStmt
 import SourceModel.SM_Constants as SMCONSTS
 import SourceModel.SM_Define
+import SourceModel.SM_Element
 import SourceModel.SM_Exec
+import SourceModel.SM_File
 import SourceModel.SM_FileResource
+import SourceModel.SM_IfStmt
+import SourceModel.SM_LCOM
 import SourceModel.SM_PackageResource
 import SourceModel.SM_ServiceResource
-import SourceModel.SM_CaseStmt
-import SourceModel.SM_IfStmt
 import SourceModel.SM_User
-import SourceModel.SM_Element
-import SourceModel.SM_LCOM
-import SourceModel.SM_File
+
 
 class SM_Class(SourceModel.SM_Element.SM_Element):
     def __init__(self, text, name=None):

diff --git a/SourceModel/SM_File.py b/SourceModel/SM_File.py
@@ -1,20 +1,21 @@
 import re
-import Utilities
-import SourceModel.SM_FileResource
-import SourceModel.SM_ServiceResource
-import SourceModel.SM_PackageResource
-import SourceModel.SM_IncludeResource
+
+import SourceModel.SM_CaseStmt
 import SourceModel.SM_Class
-import SourceModel.SM_LCOM
-import SourceModel.SM_Define
 import SourceModel.SM_Constants as SMCONSTS
 import SourceModel.SM_Define
+import SourceModel.SM_Define
+import SourceModel.SM_Element
 import SourceModel.SM_Exec
-import SourceModel.SM_CaseStmt
+import SourceModel.SM_FileResource
 import SourceModel.SM_IfStmt
-import SourceModel.SM_User
-import SourceModel.SM_Element
+import SourceModel.SM_IncludeResource
+import SourceModel.SM_LCOM
 import SourceModel.SM_Node
+import SourceModel.SM_PackageResource
+import SourceModel.SM_ServiceResource
+import SourceModel.SM_User
+from SmellDetector import Utilities
 
 
 class SM_File:

diff --git a/SourceModel/SM_FileResource.py b/SourceModel/SM_FileResource.py
@@ -1,7 +1,9 @@
 import re
-import Utilities
-import SourceModel.SM_Element
+
 import SourceModel.SM_Constants as SMCONSTS
+import SourceModel.SM_Element
+from SmellDetector import Utilities
+
 
 class SM_FileResource(SourceModel.SM_Element.SM_Element):
     def __init__(self, text):

diff --git a/SourceModel/SM_IncludeResource.py b/SourceModel/SM_IncludeResource.py
@@ -1,6 +1,8 @@
 import re
-import Utilities
+
 import SourceModel.SM_Element
+from SmellDetector import Utilities
+
 
 class SM_IncludeResource(SourceModel.SM_Element.SM_Element):
     def __init__(self, text, name=None):

diff --git a/SourceModel/SM_LCOM.py b/SourceModel/SM_LCOM.py
@@ -1,4 +1,5 @@
-import Utilities
+from SmellDetector import Utilities
+
 
 def getLCOM(elementList):
     disconnectedElements = 0

diff --git a/SourceModel/SM_PackageResource.py b/SourceModel/SM_PackageResource.py
@@ -1,7 +1,9 @@
 import re
-import Utilities
-import SourceModel.SM_Element
+
 import SourceModel.SM_Constants as SMCONSTS
+import SourceModel.SM_Element
+from SmellDetector import Utilities
+
 
 class SM_PackageResource(SourceModel.SM_Element.SM_Element):
     def __init__(self, text):

diff --git a/SourceModel/SM_ServiceResource.py b/SourceModel/SM_ServiceResource.py
@@ -1,7 +1,9 @@
 import re
-import Utilities
-import SourceModel.SM_Element
+
 import SourceModel.SM_Constants as SMCONSTS
+import SourceModel.SM_Element
+from SmellDetector import Utilities
+
 
 class SM_ServiceResource(SourceModel.SM_Element.SM_Element):
     def __init__(self, text):

diff --git a/Tests/test_AbsSmells.py b/Tests/test_AbsSmells.py
@@ -1,6 +1,7 @@
 from unittest import TestCase
+
 import SourceModel.SM_File
-import AbsSmellDectector
+from SmellDetector import AbsSmellDectector
 
 
 class TestAbsSmells(TestCase):

diff --git a/Tests/test_EncSmells.py b/Tests/test_EncSmells.py
@@ -1,6 +1,8 @@
 from unittest import TestCase
+
 import SourceModel.SM_File
-import EncSmellDectector
+from SmellDetector import EncSmellDectector
+
 
 class TestModSmells(TestCase):
     def test_detectDefEnc(self):

diff --git a/Tests/test_HieSmells.py b/Tests/test_HieSmells.py
@@ -1,6 +1,7 @@
 from unittest import TestCase
-import SourceModel.SM_File
-import HieSmellDectector
+
+from SmellDetector import HieSmellDectector
+
 
 class TestHieSmells(TestCase):
     def test_detectBroHierarchy(self):

diff --git a/Tests/test_ModSmells.py b/Tests/test_ModSmells.py
@@ -1,6 +1,8 @@
 from unittest import TestCase
+
 import SourceModel.SM_File
-import ModSmellDectector
+from SmellDetector import ModSmellDectector
+
 
 class TestModSmells(TestCase):
     def test_detectInsModForm1(self):