Adding a newline at the end of the code.

[smartthings-infrastructure.git] / Runner.py

diff --git a/Runner.py b/Runner.py
index 440899b6993e735bc404a0560c23b787c6a9a9f7..d3d7c16f0ff5cc506d4d71da1462ab95d7115929 100644 (file)
--- a/Runner.py
+++ b/Runner.py
@@ -8,7 +8,6 @@ os.system("python Extractor/ExtractorScript.py")
 #Files for both Apps
 Out = open("main.groovy", "w+")
 GlobalVariablesBothApps = open("GlobalVariables/"+"GlobalVariablesBothApps.groovy", "r")
-outGlobal = open("Extractor/"+"outGlobal.groovy", "r")
 eventSimulator = open("eventSimulator/"+"eventSimulator.groovy", "r")
 
 #For App1
@@ -22,6 +21,9 @@ sendSms = open("Methods/"+"sendSms.groovy", "r")
 sendPush = open("Methods/"+"sendPush.groovy", "r")
 eventHandler = open("Methods/"+"eventHandler.groovy", "r")
 schedule = open("Methods/"+"schedule.groovy", "r")
+now = open("Methods/"+"now.groovy", "r")
+getTemperatureScale = open("Methods/"+"getTemperatureScale.groovy", "r")
+getSunriseAndSunset = open("Methods/"+"getSunriseAndSunset.groovy", "r")
 App1 = open("Extractor/"+"App1/App1.groovy", "r")
 extractedObjectsApp1 = open("Extractor/"+"App1/extractedObjectsApp1.groovy", "r")
 extractedObjectsConstructorApp1 = open("Extractor/"+"App1/extractedObjectsConstructorApp1.groovy", "r")
@@ -35,16 +37,37 @@ Out.write("//Importing Libraries\n")
 Out.write("import groovy.transform.Field\n")
 Out.write("\n")
 Out.write("//Importing Classes\n")
-Out.write("import ContactSensor.Contacting\n")
-Out.write("import ContactSensor.Contacts\n")
-Out.write("import Lock.Locking\n")
+Out.write("import ContactSensor.ContactSensor\n")
+Out.write("import ContactSensor.ContactSensors\n")
+Out.write("import DoorControl.DoorControl\n")
+Out.write("import DoorControl.DoorControls\n")
+Out.write("import Lock.Lock\n")
 Out.write("import Lock.Locks\n")
-Out.write("import Switch.Switching\n")
+Out.write("import Thermostat.Thermostat\n")
+Out.write("import Thermostat.Thermostats\n")
+Out.write("import Switch.Switch\n")
 Out.write("import Switch.Switches\n")
+Out.write("import PresenceSensor.PresenceSensor\n")
+Out.write("import PresenceSensor.PresenceSensors\n")
 Out.write("import Logger.Logger\n")
 Out.write("import Location.LocationVar\n")
 Out.write("import Location.Phrase\n")
 Out.write("import appTouch.Touched\n")
+Out.write("import NfcTouch.NfcTouch\n")
+Out.write("import AeonKeyFob.AeonKeyFob\n")
+Out.write("import AeonKeyFob.AeonKeyFobs\n")
+Out.write("import MusicPlayer.MusicPlayer\n")
+Out.write("import MusicPlayer.MusicPlayers\n")
+Out.write("import MotionSensor.MotionSensor\n")
+Out.write("import MotionSensor.MotionSensors\n")
+Out.write("import ImageCapture.ImageCapture\n")
+Out.write("import ImageCapture.ImageCaptures\n")
+Out.write("import SmokeDetector.SmokeDetector\n")
+Out.write("import SmokeDetector.SmokeDetectors\n")
+Out.write("import Alarm.Alarm\n")
+Out.write("import Alarm.Alarms\n")
+Out.write("import SpeechSynthesis.SpeechSynthesis\n")
+Out.write("import SpeechSynthesis.SpeechSynthesises\n")
 Out.write("import Event.Event\n")
 Out.write("import Timer.SimulatedTimer\n")
 Out.write("\n")
@@ -56,10 +79,6 @@ Out.write("//GlobalVariables for both Apps\n")
 for line in GlobalVariablesBothApps:
        Out.write(line)
 Out.write("\n")
-Out.write("//Extracted global objects for both Apps\n")
-for line in outGlobal:
-       Out.write(line)
-Out.write("\n")
 Out.write("//Application #1\n")
 Out.write("class App1 {\n")
 Out.write("\tdef reference\n")
@@ -102,6 +121,12 @@ for line in sendPush:
        Out.write("\t"+line)
 for line in schedule:
        Out.write("\t"+line)
+for line in now:
+       Out.write("\t"+line)
+for line in getTemperatureScale:
+       Out.write("\t"+line)
+for line in getSunriseAndSunset:
+       Out.write("\t"+line)
 Out.write("\n")
 Start = 0
 for line in App1:
@@ -124,6 +149,9 @@ sendNotificationToContacts = open("Methods/"+"sendNotificationToContacts.groovy"
 sendSms = open("Methods/"+"sendSms.groovy", "r")
 eventHandler = open("Methods/"+"eventHandler.groovy", "r")
 schedule = open("Methods/"+"schedule.groovy", "r")
+now = open("Methods/"+"now.groovy", "r")
+getTemperatureScale = open("Methods/"+"getTemperatureScale.groovy", "r")
+getSunriseAndSunset = open("Methods/"+"getSunriseAndSunset.groovy", "r")
 App2 = open("Extractor/"+"App2/App2.groovy", "r")
 extractedObjectsApp2 = open("Extractor/"+"App2/extractedObjectsApp2.groovy", "r")
 extractedObjectsConstructorApp2 = open("Extractor/"+"App2/extractedObjectsConstructorApp2.groovy", "r")
@@ -171,6 +199,12 @@ for line in sendPush:
        Out.write("\t"+line)
 for line in schedule:
        Out.write("\t"+line)
+for line in now:
+       Out.write("\t"+line)
+for line in getTemperatureScale:
+       Out.write("\t"+line)
+for line in getSunriseAndSunset:
+       Out.write("\t"+line)
 Out.write("\n")
 Start = 0
 for line in App2:
@@ -186,7 +220,7 @@ Out.write("app1.installed()\n")
 Out.write("app2.installed()\n")
 Out.write("\n")
 for line in eventSimulator:
-       Out.write("\t"+line)
+       Out.write(line)
 Out.close()