@cerema/cadriciel 1.4.11 → 1.4.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/cli/global/install.js +25 -21
  2. package/package.json +1 -1
package/cli/global/install.js CHANGED
@@ -33,18 +33,17 @@ module.exports = (args) => {
33
33
  const tasksDocker = new Listr([
34
34
  {
35
35
  title: 'Docker',
36
- task: () => executeCommand('docker ps'),
36
+ task: () => executeCommand('brew install rancher-desktop'),
37
+ enabled: () => isMacOS || isLinux,
37
38
  skip: () =>
38
- executeCommand('docker ps').then(
39
- () => 'Docker is already installed'
40
- ),
39
+ executeCommand('docker ps').then(() => 'Docker est déjà installé.'),
41
40
  },
42
41
  {
43
- title: 'Docker Compose',
42
+ title: 'Docker',
43
+ enabled: () => isWindows,
44
+ task: () => installWithChocolatey('rancher-desktop'),
44
45
  skip: () =>
45
- executeCommand('docker-compose --version').then(
46
- () => 'Docker Compose is already installed'
47
- ),
46
+ executeCommand('docker ps').then(() => 'Docker est déjà installé.'),
48
47
  },
49
48
  ]);
50
49
  const tasks = new Listr([
@@ -57,7 +56,7 @@ module.exports = (args) => {
57
56
  ),
58
57
  skip: () =>
59
58
  executeCommand('brew --version').then(
60
- () => 'Homebrew is already installed'
59
+ () => 'Homebrew est déjà installé.'
61
60
  ),
62
61
  },
63
62
  {
@@ -66,7 +65,7 @@ module.exports = (args) => {
66
65
  task: () => executeCommand('brew install git'),
67
66
  skip: () =>
68
67
  executeCommand('git --version').then(
69
- () => 'Git is already installed'
68
+ () => 'Git est déjà installé.'
70
69
  ),
71
70
  },
72
71
  {
@@ -75,7 +74,7 @@ module.exports = (args) => {
75
74
  task: () => executeCommand('brew install openjdk@17'),
76
75
  skip: () =>
77
76
  executeCommand('java -version').then(
78
- () => 'Java (OpenJDK 17) is already installed'
77
+ () => 'Java (OpenJDK 17) est déjà installé.'
79
78
  ),
80
79
  },
81
80
  {
@@ -83,7 +82,7 @@ module.exports = (args) => {
83
82
  enabled: () => isMacOS || isLinux,
84
83
  task: () => executeCommand('brew install maven'),
85
84
  skip: () =>
86
- executeCommand('mvn -v').then(() => 'Maven is already installed'),
85
+ executeCommand('mvn -v').then(() => 'Maven est déjà installé.'),
87
86
  },
88
87
  {
89
88
  title: 'Install Liquibase',
@@ -91,7 +90,7 @@ module.exports = (args) => {
91
90
  task: () => executeCommand('brew install liquibase'),
92
91
  skip: () =>
93
92
  executeCommand('liquibase --version').then(
94
- () => 'Liquibase is already installed'
93
+ () => 'Liquibase est déjà installé.'
95
94
  ),
96
95
  },
97
96
  {
@@ -103,7 +102,7 @@ module.exports = (args) => {
103
102
  ),
104
103
  skip: () =>
105
104
  executeCommand('choco -v').then(
106
- () => 'Chocolatey is already installed'
105
+ () => 'Chocolatey est déjà installé.'
107
106
  ),
108
107
  },
109
108
  {
@@ -112,7 +111,7 @@ module.exports = (args) => {
112
111
  task: () => installWithChocolatey('git'),
113
112
  skip: () =>
114
113
  executeCommand('git --version').then(
115
- () => 'Git is already installed'
114
+ () => 'Git est déjà installé.'
116
115
  ),
117
116
  },
118
117
  {
@@ -121,7 +120,7 @@ module.exports = (args) => {
121
120
  task: () => installWithChocolatey('openjdk17'),
122
121
  skip: () =>
123
122
  executeCommand('java -version').then(
124
- () => 'Java (OpenJDK 17) is already installed'
123
+ () => 'Java (OpenJDK 17) est déjà installé.'
125
124
  ),
126
125
  },
127
126
  {
@@ -129,7 +128,7 @@ module.exports = (args) => {
129
128
  enabled: () => isWindows,
130
129
  task: () => installWithChocolatey('maven'),
131
130
  skip: () =>
132
- executeCommand('mvn -v').then(() => 'Maven is already installed'),
131
+ executeCommand('mvn -v').then(() => 'Maven est déjà installé.'),
133
132
  },
134
133
  {
135
134
  title: 'Install Liquibase (Windows)',
@@ -137,14 +136,19 @@ module.exports = (args) => {
137
136
  task: () => installWithChocolatey('liquibase'),
138
137
  skip: () =>
139
138
  executeCommand('liquibase --version').then(
140
- () => 'Liquibase is already installed'
139
+ () => 'Liquibase est déjà installé.'
141
140
  ),
142
141
  },
143
142
  ]);
144
143
 
145
- tasks.run().catch((err) => {
146
- console.error(err);
147
- });
144
+ tasks
145
+ .run()
146
+ .then(() => {
147
+ tasksDocker.run().catch((err) => {});
148
+ })
149
+ .catch((err) => {
150
+ console.error(err);
151
+ });
148
152
  },
149
153
  };
150
154
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cerema/cadriciel",
3
- "version": "1.4.11",
3
+ "version": "1.4.12",
4
4
  "main": "index.js",
5
5
  "license": "MIT",
6
6
  "npm": ">=8.0.0",