From 91aa414b4e2865d88b7d272a298d772df3d70092 Mon Sep 17 00:00:00 2001
From: Rogerio Angeliski <angeliski@hotmail.com>
Date: Mon, 12 Jul 2021 18:12:56 -0300
Subject: [PATCH] fix windows paths  fix #6427

Signed-off-by: Rogerio Angeliski <angeliski@hotmail.com>
---
 .../src/actions/fetch/rails/railsArgumentResolver.ts          | 3 ++-
 .../src/actions/fetch/rails/railsNewRunner.test.ts            | 4 ++--
 .../src/actions/fetch/rails/railsNewRunner.ts                 | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
index b1ddadc6d9..60251a702d 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
@@ -56,6 +56,7 @@ export type RailsRunOptions = {
 export const railsArgumentResolver = (
   projectRoot: string,
   options: RailsRunOptions,
+  executionOnContainer = false,
 ): string[] => {
   const argumentsToRun: string[] = [];
 
@@ -103,7 +104,7 @@ export const railsArgumentResolver = (
     argumentsToRun.push(
       options.template.replace(
         `.${separatorPath}`,
-        `${projectRoot}${separatorPath}`,
+        `${projectRoot}${executionOnContainer ? '/' : separatorPath}`,
       ),
     );
   }
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts
index dc3f824236..abf89f6a0d 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts
@@ -137,7 +137,7 @@ describe('Rails Templater', () => {
         owner: 'angeliski',
         storePath: 'https://github.com/angeliski/rails-project',
         name: 'rails-project',
-        railsArguments: { template: './something.rb' },
+        railsArguments: { template: `.${path.sep}something.rb` },
         imageName: 'foo/rails-custom-image',
       };
 
@@ -210,7 +210,7 @@ describe('Rails Templater', () => {
         owner: 'angeliski',
         storePath: 'https://github.com/angeliski/rails-project',
         name: 'rails-project',
-        railsArguments: { template: './something.rb' },
+        railsArguments: { template: `.${path.sep}something.rb` },
         imageName: 'foo/rails-custom-image',
       };
 
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts
index 3e18490587..a828800e84 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts
@@ -68,7 +68,7 @@ export class RailsNewRunner {
         command: baseCommand,
         args: [
           ...baseArguments,
-          `${intermediateDir}/${name}`,
+          `${intermediateDir}${path.sep}${name}`,
           ...arrayExtraArguments,
         ],
         logStream,
@@ -77,6 +77,7 @@ export class RailsNewRunner {
       const arrayExtraArguments = railsArgumentResolver(
         '/input',
         railsArguments as RailsRunOptions,
+        true,
       );
       await this.containerRunner.runContainer({
         imageName: imageName as string,