Few fixes and PowerShell deployment script.

Author: Yakov Gnusin

.gitignore

@@ -3,4 +3,5 @@
 venv/
 bin/
 obj/
+deployment/
 *.pyc

terminalTwitter/deploy.ps1

@@ -0,0 +1,50 @@
+param(
+	[Parameter(Mandatory = $true)]
+	[string]$gitRepo
+)
+
+$deploymentDir = "deployment"
+$terminalDir = "terminalTwitter"
+$sdkDirName = "fr8"
+$sdkDir = "../$sdkDirName"
+
+If (Test-Path $deploymentDir){
+	Write-Host "Removing old $deploymentDir folder"
+	Remove-Item $deploymentDir -Force -Recurse
+}
+
+Write-Host "Creating blank $deploymentDir folder"
+New-Item -ItemType Directory -Force -Path $deploymentDir | Out-Null
+
+Write-Host "Extracting current Azure repo"
+cd $deploymentDir
+git init
+git remote add azure $gitRepo
+git fetch azure
+git checkout master
+cd ..
+
+Write-Host "Remove previous deployment"
+Remove-Item "$deploymentDir\*" -Recurse
+
+Write-Host "Creating terminal package"
+Copy-Item "web.2.7.config" -Destination "$deploymentDir\web.config" -Force
+Copy-Item "runtime.txt" -Destination $deploymentDir -Force
+Copy-Item "requirements.txt" -Destination $deploymentDir -Force
+Copy-Item "ptvs_virtualenv_proxy.py" -Destination $deploymentDir -Force
+Copy-Item "runserver.py" -Destination $deploymentDir -Force
+Copy-Item $terminalDir -Destination $deploymentDir -Force -Recurse
+Remove-Item "$deploymentDir\$terminalDir\*.pyc" -Recurse
+
+Write-Host "Creating SDK package for the terminal"
+Copy-Item $sdkDir -Destination $deploymentDir -Force -Recurse
+Remove-Item "$deploymentDir\$sdkDirName\*.pyc" -Recurse
+Remove-Item "$deploymentDir\$sdkDirName\*.pyproj" -Recurse
+
+Write-Host "Publishing to Azure Git repo"
+cd $deploymentDir
+git add .
+git commit -m "Deployment commit"
+git push azure master
+
+cd ..

terminalTwitter/terminalTwitter.pyproj

@@ -44,6 +44,7 @@
     <Folder Include="terminalTwitter\" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="deploy.ps1" />
     <Content Include="requirements.txt" />
     <Content Include="runtime.txt" />
   </ItemGroup>

terminalTwitter/terminalTwitter/main.py

@@ -11,6 +11,7 @@
 # Flask app instance.
 app = Flask(__name__)
 
+
 # Terminal request handler.
 handler = fr8.terminal.TerminalHandler(
     terminal.terminal,

terminalTwitter/terminalTwitter/terminal.py

@@ -1,3 +1,4 @@
+import os
 import fr8.data
 
 twitter_consumer_key = 'j0CGin9tvfWEe5UrxsCcjC6fT'
@@ -7,8 +8,7 @@
 web_service = fr8.data.WebServiceDTO(name='Twitter', icon_path='/Content/icons/web_services/twitter-icon-64x64.png')
 
 terminal_id = 'B9CC8E6D-69B0-4E41-BCBC-251F25E10E75'
-terminal_port = 38080
-terminal_endpoint = 'http://127.0.0.1:' + str(terminal_port)
+terminal_endpoint = os.environ.get('TERMINAL_URL', 'http://127.0.0.1:38080')
 
 terminal = fr8.data.TerminalDTO(
     id = terminal_id,

terminalTwitter/web.2.7.config

@@ -14,10 +14,11 @@
     </trace>
   </system.diagnostics>
   <appSettings>
-    <add key="WSGI_ALT_VIRTUALENV_HANDLER" value="terminalTwitter.app" />
+    <add key="WSGI_ALT_VIRTUALENV_HANDLER" value="terminalTwitter.main.app" />
     <add key="WSGI_ALT_VIRTUALENV_ACTIVATE_THIS" value="D:\home\site\wwwroot\env\Scripts\activate_this.py" />
     <add key="WSGI_HANDLER" value="ptvs_virtualenv_proxy.get_virtualenv_handler()" />
     <add key="PYTHONPATH" value="D:\home\site\wwwroot" />
+	<add key="TERMINAL_URL" value="http://fr8-terminal-twitter.azurewebsites.net" />
     <!--
       Uncomment the following key/value to enable remote debugging.
       The following setting is meant to protect the debugging endpoint against

terminalTwitter/web.debug.config

@@ -7,7 +7,7 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <appSettings>
     <!-- The following setting is meant to protect the debugging endpoint against inadvertent access, and should be treated as a password. -->
-    <add key="WSGI_PTVSD_SECRET" value="eu3kownfzt3" xdt:Transform="Insert" />
+    <add key="WSGI_PTVSD_SECRET" value="bkko31rrod2" xdt:Transform="Insert" />
   </appSettings>
   <system.web>
     <!-- Required for websockets. -->