add vscode conf generation, fix Dockerfile ordering (#8)

* add vscode conf generation

* add vscode conf generation

* fix bad ordering in Dockerfile

* bump cargo ver

* clean

* clean

* clean

* clean

* clean

* clean

* clean

* clean

* clean

* clean

* clean

* clean

* clean

Author: ysawa0

.github/workflows/ci.yaml

@@ -20,6 +20,9 @@ jobs:
         with:
           python-version: "3.10"
 
+      - name: Install Rust Toolchain
+        uses: dtolnay/rust-toolchain@nightly
+
       - name: Set shfmt version environment variable
         run: echo "SHFMT_VERSION=v3.7.0" >> $GITHUB_ENV
 
@@ -64,6 +67,8 @@ jobs:
             sudo mv shfmt /usr/local/bin/
           fi
           sudo apt-get install shellcheck
+          rustup component add clippy
+          rustup component add rustfmt
 
       - name: Run pre-commits
         env:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cpa"
-version = "0.0.4"
+version = "0.0.7"
 edition = "2018"
 
 [dependencies]

Cargo.toml

@@ -0,0 +1,9 @@
+{
+  "recommendations": [
+    "ms-python.python",
+    "ms-python.vscode-pylance",
+    "ms-python.isort",
+    "ms-python.black-formatter",
+    "ms-python.flake8"
+  ]
+}

example/.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+  "[python]": {
+    "editor.formatOnType": true,
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "ms-python.black-formatter"
+  },
+  "flake8.args": ["--config=.cpa/flake8.cfg"],
+  "files.insertFinalNewline": true
+}

example/.vscode/settings.json

@@ -1,12 +1,11 @@
 FROM python:3.10-slim
 
-# Set the working directory in the container to /app
+# Create and set the working directory
 WORKDIR /app
 
-# Copy the current directory contents into the container at /app
-COPY . .
-
-# Install any needed packages specified in requirements.txt
+COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
 
+COPY . .
+
 CMD ["python", "./main.py"]

example/Dockerfile

@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "example"
+name = "create-python-app"
 version = "0.0.1"
 description = ""
 authors = [

pyproject.toml

@@ -1,4 +1,5 @@
-max_width = 120
+max_width = 140
+# Below require nightly channel, run: rustup default nightly
 imports_granularity = "Crate"
 group_imports = "StdExternalCrate"
 imports_layout = "Horizontal"

rustfmt.toml

@@ -11,10 +11,7 @@ use python::setup_preset;
     long_about = "CPA is a cli tool designed to expedite the setup of new projects by automating the creation of various configuration files."
 )]
 enum Cli {
-    #[clap(
-        about = "Create a new project",
-        long_about = "Create a new project using specified preset."
-    )]
+    #[clap(about = "Create a new project", long_about = "Create a new project using specified preset.")]
     Create(CreateArgs),
     #[clap(
         about = "Update existing project",

src/main.rs

@@ -1,15 +1,24 @@
 extern crate regex;
 
+use std::{
+    fs::{self, File}, io::Write, process
+};
+
 use askama::Template;
 use regex::Regex;
-use std::fs::{self, File};
-use std::io::Write;
-use std::process;
 
 #[derive(Template)]
 #[template(path = ".gitignore", escape = "none")]
 struct GitIgnore {}
 
+#[derive(Template)]
+#[template(path = ".vscode/settings.json", escape = "none")]
+struct VSCodeSettings {}
+
+#[derive(Template)]
+#[template(path = ".vscode/extensions.json", escape = "none")]
+struct VSCodeExtensions {}
+
 #[derive(Template)]
 #[template(path = "Makefile", escape = "none")]
 struct Makefile {}
@@ -57,55 +66,74 @@ pub fn setup_preset(mut preset: String, name: String, create: bool) {
         prefix = format!("./{}", name)
     }
 
+    // Create needed dirs
     let _ = fs::create_dir_all(format!("{}/.cpa", prefix));
+    let _ = fs::create_dir_all(format!("{}/.vscode", prefix));
+    let _ = fs::create_dir_all(format!("{}/.github/workflows", prefix));
 
     // Render Github Actions CI
-    let _ = fs::create_dir_all(format!("{}/.github/workflows", prefix));
     File::create(format!("{}/.github/workflows/ci.yaml", prefix))
-        .and_then(|mut file| file.write_all(GHWorkflowCI {}.render().expect("Failed to render ci.yaml").as_bytes()))
-        .expect("Failed to create or write to ci.yaml");
+        .and_then(|mut file| file.write_all(GHWorkflowCI {}.render().expect("Render fail: ci.yaml").as_bytes()))
+        .expect("Write fail: ci.yaml");
+
+    // Render .vscode/settings.json
+    File::create(format!("{}/.vscode/settings.json", prefix))
+        .and_then(|mut file| file.write_all(VSCodeSettings {}.render().expect("Render fail: .vscode/settings.json").as_bytes()))
+        .expect("Write fail: .vscode/settings.json");
+
+    // Render .vscode/extensions.json
+    File::create(format!("{}/.vscode/extensions.json", prefix))
+        .and_then(|mut file| {
+            file.write_all(
+                VSCodeExtensions {}
+                    .render()
+                    .expect("Render fail: .vscode/extensions.json")
+                    .as_bytes(),
+            )
+        })
+        .expect("Write fail: .vscode/extensions.json");
 
     // Render .gitignore
     File::create(format!("{}/.gitignore", prefix))
-        .and_then(|mut file| file.write_all(GitIgnore {}.render().expect("Failed to render .gitignore").as_bytes()))
-        .expect("Failed to create or write to .gitignore");
+        .and_then(|mut file| file.write_all(GitIgnore {}.render().expect("Render fail: .gitignore").as_bytes()))
+        .expect("Write fail: .gitignore");
 
     // Render Makefile
     File::create(format!("{}/Makefile", prefix))
-        .and_then(|mut file| file.write_all(Makefile {}.render().expect("Failed to render Makefile").as_bytes()))
-        .expect("Failed to create or write to Makefile");
+        .and_then(|mut file| file.write_all(Makefile {}.render().expect("Render fail: Makefile").as_bytes()))
+        .expect("Write fail: Makefile");
 
     // Render Dockerfile
     File::create(format!("{}/Dockerfile", prefix))
-        .and_then(|mut file| file.write_all(Dockerfile {}.render().expect("Failed to render Dockerfile").as_bytes()))
-        .expect("Failed to create or write to Dockerfile");
+        .and_then(|mut file| file.write_all(Dockerfile {}.render().expect("Render fail: Dockerfile").as_bytes()))
+        .expect("Write fail: Dockerfile");
 
     // Render main.py
     File::create(format!("{}/main.py", prefix))
         .and_then(|mut file| file.write_all(MainPy {}.render().expect("Render fail").as_bytes()))
-        .expect("Failed to render or write to main.py");
+        .expect("Render fail: main.py");
 
     // Render pre-commit conf
     File::create(format!("{}/.pre-commit-config.yaml", prefix))
         .and_then(|mut file| {
             file.write_all(
                 PreCommitConfig { python: true }
                     .render()
-                    .expect("Failed to render .pre-commit-config.yaml")
+                    .expect("Render fail: .pre-commit-config.yaml")
                     .as_bytes(),
             )
         })
-        .expect("Failed to create or write to .pre-commit-config.yaml");
+        .expect("Write fail: .pre-commit-config.yaml");
 
     // Render Flake8 conf
     File::create(format!("{}/.cpa/flake8.cfg", prefix))
-        .and_then(|mut file| file.write_all(Flake8 {}.render().expect("Failed to render flake8.cfg").as_bytes()))
-        .expect("Failed to create or write to flake8.cfg");
+        .and_then(|mut file| file.write_all(Flake8 {}.render().expect("Render fail: flake8.cfg").as_bytes()))
+        .expect("Write fail: flake8.cfg");
 
     // Render Prettier conf
     File::create(format!("{}/.cpa/prettier.json", prefix))
-        .and_then(|mut file| file.write_all(Prettier {}.render().expect("Failed to render prettier.json").as_bytes()))
-        .expect("Failed to create or write to prettier.json");
+        .and_then(|mut file| file.write_all(Prettier {}.render().expect("Render fail: prettier.json").as_bytes()))
+        .expect("Write fail: prettier.json");
 
     // Render Poetry conf
     let re = Regex::new(r"python(3\.\d+|4\.\d+)").unwrap();
@@ -124,8 +152,6 @@ pub fn setup_preset(mut preset: String, name: String, create: bool) {
     };
     let out_pyproj: String = pyproj.render().expect("Failed to render");
     let mut f_pyproj = File::create(format!("{}/pyproject.toml", prefix)).expect("Could not create file");
-    f_pyproj
-        .write_all(out_pyproj.as_bytes())
-        .expect("Could not write to file");
+    f_pyproj.write_all(out_pyproj.as_bytes()).expect("Could not write to file");
     println!("Project created at: {}", prefix)
 }