Resume first version

Author: hunsche

DelphiDocker.dpk

@@ -34,18 +34,12 @@ requires
 
 contains
   OpenToolApi.Register in 'Src\OpenToolApi\OpenToolApi.Register.pas',
-  OpenToolApi.ToolBarItem in 'Src\OpenToolApi\OpenToolApi.ToolBarItem.pas' {ToolBarItem: TDataModule},
   Command.Runner in 'Src\Command\Command.Runner.pas',
   OpenToolApi.CommandMessage in 'Src\OpenToolApi\OpenToolApi.CommandMessage.pas',
   OpenToolApi.LocalMenuItem in 'Src\OpenToolApi\OpenToolApi.LocalMenuItem.pas',
-  OpenToolApi.Events in 'Src\OpenToolApi\OpenToolApi.Events.pas',
-  UtilityFunctions in 'Src\OpenToolApi\UtilityFunctions.pas',
-  Command.Cmd in 'Src\Command\Command.Cmd.pas',
-  Command.Message in 'Src\Command\Command.Message.pas',
-  Docker.Utils in 'Src\Docker\Docker.Utils.pas',
-  Wrapper.Docker in 'Src\Wrapper\Wrapper.Docker.pas',
-  Wrapper.DockerCompose in 'Src\Wrapper\Wrapper.DockerCompose.pas',
+  OpenToolApi.Tools in 'Src\OpenToolApi\OpenToolApi.Tools.pas',
   Docker.RunWithDocker in 'Src\Docker\Docker.RunWithDocker.pas',
-  Constants.Version in 'Src\Constants\Constants.Version.pas';
+  Constants.Version in 'Src\Constants\Constants.Version.pas',
+  OpenToolApi.MenuItem in 'Src\OpenToolApi\OpenToolApi.MenuItem.pas';
 
 end.

DelphiDocker.dproj

@@ -114,23 +114,13 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="designide.dcp"/>
         <DCCReference Include="Src\OpenToolApi\OpenToolApi.Register.pas"/>
-        <DCCReference Include="Src\OpenToolApi\OpenToolApi.ToolBarItem.pas">
-            <Form>ToolBarItem</Form>
-            <FormType>dfm</FormType>
-            <DesignClass>TDataModule</DesignClass>
-        </DCCReference>
         <DCCReference Include="Src\Command\Command.Runner.pas"/>
         <DCCReference Include="Src\OpenToolApi\OpenToolApi.CommandMessage.pas"/>
         <DCCReference Include="Src\OpenToolApi\OpenToolApi.LocalMenuItem.pas"/>
-        <DCCReference Include="Src\OpenToolApi\OpenToolApi.Events.pas"/>
-        <DCCReference Include="Src\OpenToolApi\UtilityFunctions.pas"/>
-        <DCCReference Include="Src\Command\Command.Cmd.pas"/>
-        <DCCReference Include="Src\Command\Command.Message.pas"/>
-        <DCCReference Include="Src\Docker\Docker.Utils.pas"/>
-        <DCCReference Include="Src\Wrapper\Wrapper.Docker.pas"/>
-        <DCCReference Include="Src\Wrapper\Wrapper.DockerCompose.pas"/>
+        <DCCReference Include="Src\OpenToolApi\OpenToolApi.Tools.pas"/>
         <DCCReference Include="Src\Docker\Docker.RunWithDocker.pas"/>
         <DCCReference Include="Src\Constants\Constants.Version.pas"/>
+        <DCCReference Include="Src\OpenToolApi\OpenToolApi.MenuItem.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

Src/Command/Command.Cmd.pas

@@ -3,7 +3,7 @@
 interface
 
 uses
-  DOSCommand, OpenToolApi.CommandMessage, UtilityFunctions, System.Classes;
+  DOSCommand, OpenToolApi.CommandMessage, OpenToolApi.Tools, System.Classes;
 
 type
   TRunnerReturn = record
@@ -20,13 +20,20 @@ implementation
 uses
   System.SysUtils, Vcl.Forms;
 
+procedure OnReadLine(ASender: TObject; const ANewLine: string; AOutputType: TOutputType);
+begin
+  TCommandMessage.GetInstance.WriteLn(ANewLine);
+end;
+
 function DoRunner(APath, ACommand: string): TRunnerReturn;
 var
   LDosCommand: TDosCommand;
 begin
   LDosCommand := TDosCommand.Create(nil);
   try
-    LDosCommand.InputToOutput := True;
+    TCommandMessage.GetInstance.WriteLn(APath + '>' + ACommand);
+    LDosCommand.OnNewLine := OnReadLine;
+    LDosCommand.InputToOutput := False;
     LDosCommand.CurrentDir := APath;
     LDosCommand.CommandLine := ACommand;
     LDosCommand.Execute;

Src/Command/Command.Message.pas

@@ -3,69 +3,47 @@
 interface
 
 uses
-  UtilityFunctions, SysUtils;
+  OpenToolApi.Tools, SysUtils, ToolsAPI;
 
 type
   TRunWithDocker = class
   const
     COMMAND_ERROR = 1;
     COMMAND_SUCESS = 0;
   public
-    procedure Execute;
+    procedure Execute(AProject: IOTAProject);
   end;
 
 implementation
 
 uses
-  Vcl.Dialogs, Command.Runner, Constants.Version, System.Classes;
+  Vcl.Dialogs, Command.Runner, Constants.Version, System.Classes, Vcl.Menus;
 
 { TRunWithDocker }
 
-procedure TRunWithDocker.Execute;
+procedure TRunWithDocker.Execute(AProject: IOTAProject);
 var
-  LLine, LContainerVersion, LContainerName: string;
   LReturn: TRunnerReturn;
-  LPAServerPort: Integer;
-  LHasPAServerPort: Boolean;
-  LPorts: TArray<string>;
+  LMainMenu: TMainMenu;
+  LMenuItem: TMenuItem;
 begin
+  ProjectGroup.ActiveProject := AProject;
+
   if not(ActiveProject.CurrentPlatform = 'Linux64') then
     raise Exception.Create('Plataform not suported');
 
-  LContainerVersion := TVersion.GetInstance.Semantic + '-' + TVersion.GetInstance.Name;
-  LContainerName := ExtractFileName(ActiveProject.FileName).Split(['.'])[0] + '_' + LContainerVersion;
-
-  LReturn := Runner('docker start ' + LContainerName);
-
-  if LReturn.ExitCode = COMMAND_ERROR then
-    LReturn := Runner('docker run -tP --name ' + LContainerName + ' hashload/delphi-dev:' +
-      LContainerVersion);
+  LReturn := Runner('docker-compose up -d');
 
   if LReturn.ExitCode = COMMAND_SUCESS then
   begin
-    LReturn := Runner('docker ps --filter name=teste_10.3.0-rio --format "{{.Ports}}"');
-
-    LPorts := LReturn.Output.Split([',']);
-    for LLine in LPorts do
-    begin
-      LHasPAServerPort := False;
-      if LLine.Contains('->64211/tcp') then
-      begin
-        LPAServerPort := LLine.Substring(LLine.IndexOf(':') + 1, LLine.IndexOf('->') - LLine.IndexOf(':') - 1)
-          .ToInteger;
-        LHasPAServerPort := True;
-        Break;
-      end;
-    end;
+    LMainMenu := NativeServices.MainMenu;
 
-    if not LHasPAServerPort then
-      raise Exception.Create('PAServer not found');
-  end;
-
-  if LReturn.ExitCode = COMMAND_ERROR then
+    LMenuItem := LMainMenu.Items.Find('Run').Find('Run');
+    if Assigned(LMenuItem) then
+      LMenuItem.Action.Execute;
+  end
+  else
     raise Exception.Create(LReturn.Output);
-
-  ShowMessage('Version ' + TVersion.GetInstance.Semantic);
 end;
 
 end.

Src/Command/Command.Runner.pas

@@ -46,7 +46,6 @@ procedure TCommandMessage.Initialize(AService: IOTAMessageServices);
 
   FGroup.AutoScroll := True;
   FGroup.CanClose := False;
-  FService.AddTitleMessage('Docker initialized..', FGroup);
 end;
 
 procedure TCommandMessage.WriteLn(ALine: string);