Make README template customizable (#17)

* Make README template customizable

* update tests to use different fixtures

* formatting and updating rust

* bump version to 0.3.0

---------

Co-authored-by: Perry Hertler <[email protected]>

Author: ashleywillard

Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "pks"
-version = "0.2.23"
+version = "0.3.0"
 edition = "2021"
 description = "Welcome! Please see https://github.com/rubyatscale/pks for more information!"
 license = "MIT"

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.77.2"
+channel = "1.83.0"
 components = ["clippy", "rustfmt"]
 targets = ["x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu"]

src/packs/caching/mod.rs

@@ -12,8 +12,10 @@ pub enum CacheResult {
 
 #[derive(Debug, Default)]
 pub struct EmptyCacheEntry {
+    #[allow(dead_code)]
     pub filepath: PathBuf,
     pub file_contents_digest: String,
+    #[allow(dead_code)]
     pub file_name_digest: String,
     pub cache_file_path: PathBuf,
 }

src/packs/configuration.rs

@@ -32,6 +32,7 @@ pub struct Configuration {
     pub ignored_definitions: HashMap<String, HashSet<PathBuf>>,
     pub autoload_roots: HashMap<PathBuf, String>,
     pub inflections_path: PathBuf,
+    pub readme_template_path: PathBuf,
     pub custom_associations: Vec<String>,
     pub stdin_file_path: Option<PathBuf>,
     // Note that it'd probably be better to use the logger library, `tracing` (see logger.rs)
@@ -139,6 +140,12 @@ pub(crate) fn from_raw(
             .unwrap_or(PathBuf::from("config/initializers/inflections.rb")),
     );
 
+    let readme_template_path = absolute_root.join(
+        raw_config
+            .readme_template_path
+            .unwrap_or(PathBuf::from("README_TEMPLATE.md")),
+    );
+
     let custom_associations = raw_config
         .custom_associations
         .iter()
@@ -162,6 +169,7 @@ pub(crate) fn from_raw(
         ignored_definitions,
         autoload_roots,
         inflections_path,
+        readme_template_path,
         custom_associations,
         stdin_file_path: None,
         print_files: false,
@@ -370,7 +378,11 @@ mod tests {
 
         assert_eq!(expected_packs, actual.pack_set.packs);
 
-        assert!(!actual.cache_enabled)
+        assert!(!actual.cache_enabled);
+
+        let expected_readme_template_path =
+            absolute_root.join("README_TEMPLATE.md");
+        assert_eq!(actual.readme_template_path, expected_readme_template_path);
     }
 
     #[test]
@@ -456,4 +468,16 @@ mod tests {
 
         assert_eq!(actual_associations, expected_paths);
     }
+
+    #[test]
+    fn with_readme_template_path() {
+        let absolute_root =
+            PathBuf::from("tests/fixtures/app_with_custom_readme");
+        let actual = configuration::get(&absolute_root).unwrap();
+
+        let actual_readme_template_path = actual.readme_template_path;
+        let expected_readme_template_path =
+            absolute_root.join("config/packs/README_EXAMPLE.md");
+        assert_eq!(actual_readme_template_path, expected_readme_template_path);
+    }
 }

src/packs/creator.rs

@@ -52,15 +52,20 @@ pub fn create(
             .context("failed to create spec")?;
     }
 
-    let readme = readme(name);
+    let readme = readme(configuration, name);
     let readme_path = &new_pack_path.join("README.md");
     std::fs::write(readme_path, readme).context("Failed to write README.md")?;
 
     Ok(CreateResult::Success)
 }
 
-fn readme(pack_name: &str) -> String {
-    format!(
+fn readme(configuration: &Configuration, pack_name: &str) -> String {
+    let readme_template_path = configuration.readme_template_path.clone();
+
+    if readme_template_path.exists() {
+        std::fs::read_to_string(readme_template_path).unwrap()
+    } else {
+        format!(
 "Welcome to `{}`!
 
 If you're the author, please consider replacing this file with a README.md, which may contain:
@@ -76,8 +81,9 @@ If you're the author, please consider replacing this file with a README.md, whic
 README.md should change as your public API changes.
 
 See https://github.com/rubyatscale/pks#readme for more info!",
-    pack_name
-)
+            pack_name
+        )
+    }
 }
 
 fn is_rails(configuration: &Configuration) -> bool {

src/packs/pack_set.rs

@@ -108,8 +108,8 @@ impl PackSet {
     pub fn all_pack_dependencies<'a>(
         &'a self,
         configuration: &'a Configuration,
-    ) -> Result<Vec<PackDependency>> {
-        let mut pack_refs: Vec<PackDependency> = Vec::new();
+    ) -> Result<Vec<PackDependency<'a>>> {
+        let mut pack_refs: Vec<PackDependency<'a>> = Vec::new();
         for from_pack in &configuration.pack_set.packs {
             for dependency_pack_name in &from_pack.dependencies {
                 match configuration.pack_set.for_pack(dependency_pack_name) {

src/packs/parsing/ruby/experimental/parser.rs

@@ -25,7 +25,7 @@ struct ReferenceCollector<'a> {
     pub custom_associations: Vec<String>,
 }
 
-impl<'a> Visitor for ReferenceCollector<'a> {
+impl Visitor for ReferenceCollector<'_> {
     fn on_class(&mut self, node: &nodes::Class) {
         // We're not collecting definitions, so no need to visit the class definitioname);
         let namespace_result = fetch_const_name(&node.name);

src/packs/parsing/ruby/packwerk/parser.rs

@@ -36,7 +36,7 @@ struct ReferenceCollector<'a> {
     pub custom_associations: Vec<String>,
 }
 
-impl<'a> Visitor for ReferenceCollector<'a> {
+impl Visitor for ReferenceCollector<'_> {
     fn on_class(&mut self, node: &nodes::Class) {
         // We're not collecting definitions, so no need to visit the class definitioname);
         let namespace_result = fetch_const_name(&node.name);

src/packs/raw_configuration.rs

@@ -52,6 +52,10 @@ pub(crate) struct RawConfiguration {
     #[serde(default)]
     pub layers: Vec<String>,
 
+    // Path to the README template
+    #[serde(default)]
+    pub readme_template_path: Option<PathBuf>,
+
     // Experimental parser
     #[serde(default)]
     pub experimental_parser: bool,

tests/common/mod.rs

@@ -31,6 +31,30 @@ pub fn delete_foobar() {
     }
 }
 
+#[allow(dead_code)]
+pub fn delete_foobaz() {
+    let directory =
+        PathBuf::from("tests/fixtures/simple_packs_first_app/packs/foobaz");
+    if let Err(err) = fs::remove_dir_all(directory) {
+        eprintln!(
+            "Failed to remove tests/fixtures/simple_packs_first_app/packs/foobaz during test teardown: {}",
+            err
+        );
+    }
+}
+
+#[allow(dead_code)]
+pub fn delete_foobar_app_with_custom_readme() {
+    let directory =
+        PathBuf::from("tests/fixtures/app_with_custom_readme/packs/foobar");
+    if let Err(err) = fs::remove_dir_all(directory) {
+        eprintln!(
+            "Failed to remove tests/fixtures/app_with_custom_readme/packs/foobar during test teardown: {}",
+            err
+        );
+    }
+}
+
 // In case we want our tests to call `update` or otherwise mutate the file system
 #[allow(dead_code)]
 pub fn set_up_fixtures() {