Add --sync flag to use latest schemes with build subcommand

- Simplify github action

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.9.0] - 2024-06-23
+
+### Added
+
+- Add `--sync` flag for the `build` subcommand to sync before building
+
 ## [0.8.0] - 2024-06-23
 
 ### Added
@@ -99,6 +105,8 @@
 - `sync` subcommand support to sync with latest Tinted Theming schemes
 - `build` subcommand to trigger theme template build
 
+[0.9.0]: https://github.com/tinted-theming/tinted-builder-rust/compare/v0.8.0...v0.9.0
+[0.8.0]: https://github.com/tinted-theming/tinted-builder-rust/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/tinted-theming/tinted-builder-rust/compare/v0.6.1...v0.7.0
 [0.6.1]: https://github.com/tinted-theming/tinted-builder-rust/compare/v0.6.0...v0.6.1
 [0.6.0]: https://github.com/tinted-theming/tinted-builder-rust/compare/v0.5.0...v0.6.0

README.md

@@ -61,8 +61,8 @@ The following is a table of the available subcommands for the CLI tool (tinted-b
 
 | Subcommand | Description                          | Arguments            | Example Usage                              | Flags |
 |------------|--------------------------------------|----------------------|--------------------------------------------|-------|
-| `sync`  | Installs and or updates latest schemes. | - | `tinted-builder-rust sync` | `--quiet` or `-q` to silence output |
-| `build` | Builds the themes of a template. | `template_path`: Path to template directory. | `tinted-builder-rust build ./path/to/base16-template` | `--quiet` or `-q` to silence output |
+| `sync`  | Installs and or updates latest schemes. | - | `tinted-builder-rust sync` | `--quiet` (silence stderr and stdout) |
+| `build` | Builds the themes of a template. | `template_path`: Path to template directory. | `tinted-builder-rust build ./path/to/base16-template` | `--quiet` (silence stderr and stdout), `--sync` (equivalent of running `tinted-builder-rust sync` before `tinted-builder-rust build`) |
 
 ## Flags
 

action.yml

@@ -1,9 +1,7 @@
-name: "Tinted Builder Rust"
-description: "Build all the schemes for a base16 or tinted repo"
+name: 'Tinted Builder Rust'
+description: 'Build all the schemes for a base16 or tinted repo'
 
 runs:
-  using: "docker"
-  image: "Dockerfile"
-  entrypoint: "/bin/sh -c"
-  args:
-    - "tinted-builder-rust sync && tinted-builder-rust build ."
+  using: 'docker'
+  image: 'docker://ghcr.io/tinted-theming/tinted-builder-rust:v0.8.0'
+  args: 'build . --sync'

tinted-builder-rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tinted-builder-rust"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 authors = ["Jamy Golden <[email protected]>", "Tinted Theming <[email protected]>"]
 license = "MIT OR Apache-2.0"

tinted-builder-rust/README.md

@@ -51,10 +51,10 @@ tinted-builder-rust build path/to/base16-template
 
 The following is a table of the available subcommands for the CLI tool (tinted-builder-rust), including the descriptions and any notable arguments.
 
-| Subcommand | Description                          | Arguments            | Example Usage                              |
-|------------|--------------------------------------|----------------------|--------------------------------------------|
-| `sync`  | Installs and or updates latest schemes. | - | `tinted-builder-rust sync` |
-| `build` | Builds the themes of a template. | `template_path`: Path to template directory. | `tinted-builder-rust build ./path/to/base16-template` |
+| Subcommand | Description                          | Arguments            | Example Usage                              | Flags |
+|------------|--------------------------------------|----------------------|--------------------------------------------|-------|
+| `sync`  | Installs and or updates latest schemes. | - | `tinted-builder-rust sync` | `--quiet` (silence stderr and stdout) |
+| `build` | Builds the themes of a template. | `template_path`: Path to template directory. | `tinted-builder-rust build ./path/to/base16-template` | `--quiet` (silence stderr and stdout), `--sync` (equivalent of running `tinted-builder-rust sync` before `tinted-builder-rust build`) |
 
 ## Flags
 

tinted-builder-rust/src/cli.rs

@@ -37,6 +37,12 @@ fn build_cli() -> Command {
                         .short('q')
                         .help("Silence stdout")
                         .action(ArgAction::SetTrue),
+                )
+                .arg(
+                    Arg::new("sync")
+                        .long("sync")
+                        .help("Sync with latest schemes before build")
+                        .action(ArgAction::SetTrue),
                 ),
         )
         .subcommand(

tinted-builder-rust/src/main.rs

@@ -54,12 +54,17 @@ fn main() -> Result<()> {
 
     match matches.subcommand() {
         Some(("build", sub_matches)) => {
-            if let (Some(template_dir), Some(is_quiet)) = (
+            if let (Some(template_dir), Some(is_quiet), Some(sync)) = (
                 sub_matches.get_one::<String>("template-dir"),
                 sub_matches.get_one::<bool>("quiet"),
+                sub_matches.get_one::<bool>("sync"),
             ) {
                 let template_path = PathBuf::from(template_dir);
 
+                if *sync {
+                    operations::sync::sync(&schemes_path, *is_quiet)?;
+                }
+
                 operations::build::build(&template_path, &schemes_path, *is_quiet)?;
             }
         }

tinted-builder-rust/tests/operation_build.rs

@@ -96,6 +96,56 @@ fn test_operation_build_quiet_flag() -> Result<()> {
     Ok(())
 }
 
+#[test]
+fn test_operation_build_with_sync() -> Result<()> {
+    // -------
+    // Arrange
+    // -------
+    let name = "test_operation_build_with_sync";
+    let template_theme_path = PathBuf::from(format!("./template-{}", name));
+    let name = "test_operation_sync_first_time";
+    let expected_output = "schemes installed";
+    let expected_schemes_path = PathBuf::from(format!("./{}/schemes", name));
+    println!("expect: {:?}", expected_schemes_path);
+    let expected_data_path = PathBuf::from(name);
+    let expected_git_clone_str = format!("Cloning into '{}/schemes'", name);
+    if expected_data_path.exists() {
+        fs::remove_dir_all(&expected_data_path)?;
+        fs::create_dir(expected_data_path)?;
+    }
+
+    // ---
+    // Act
+    // ---
+    // Build act
+    let (stdout, stderr) = utils::run_command(vec![
+        COMMAND_NAME.to_string(),
+        format!("--data-dir={}", name),
+        "build".to_string(),
+        template_theme_path.display().to_string(),
+        "--sync".to_string(),
+    ])
+    .unwrap();
+
+    // Sync act
+    let is_schemes_dir_empty = fs::read_dir(&expected_schemes_path)?.next().is_none();
+
+    // ------
+    // Assert
+    // ------
+    assert!(
+        stdout.contains(expected_output),
+        "stdout does not contain the expected output"
+    );
+    assert!(
+        stderr.contains(&expected_git_clone_str),
+        "stderr does not contain the expected output"
+    );
+    assert!(expected_schemes_path.exists() && !is_schemes_dir_empty,);
+
+    Ok(())
+}
+
 /// Tests schemes/*.yaml generation with base16 system
 #[test]
 fn test_operation_build_base16() -> Result<()> {