Move fun_run to its own crate

buildpacks/ruby/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- The `fun_run` commons library was moved to it's own crate ([#232](https://github.com/heroku/buildpacks-ruby/pull/232))
+
 ## [2.1.2] - 2023-10-31
 
 ### Fixed

buildpacks/ruby/Cargo.toml

@@ -25,6 +25,7 @@ thiserror = "1"
 ureq = "2"
 url = "2"
 clap = { version = "4", features = ["derive"] }
+fun_run = { version = "0.1", features = ["which_problem"] }
 
 [dev-dependencies]
 libcnb-test = "=0.15.0"

buildpacks/ruby/src/bin/agentmon_loop.rs

@@ -88,7 +88,7 @@ where
  let mut cmd = Command::new(path);
  cmd.args(args);
 
- eprintln!("Running: {}", commons::fun_run::display(&mut cmd));
+ eprintln!("Running: {}", fun_run::display(&mut cmd));
 
  cmd.status()
 }

buildpacks/ruby/src/bin/launch_daemon.rs

@@ -105,7 +105,7 @@ fn main() {
  command.status().unwrap_or_else(|error| {
  eprintln!(
  "Command failed {}. Details: {error}",
- commons::fun_run::display(&mut command)
+ fun_run::display(&mut command)
  );
  exit(1)
  });

buildpacks/ruby/src/gem_list.rs

@@ -1,10 +1,10 @@
-use commons::fun_run::{CmdError, CommandWithName};
 use commons::gem_version::GemVersion;
 use commons::output::{
  fmt,
  section_log::{log_step_timed, SectionLogger},
 };
 use core::str::FromStr;
+use fun_run::{CmdError, CommandWithName};
 use regex::Regex;
 use std::collections::HashMap;
 use std::ffi::OsStr;

buildpacks/ruby/src/layers/bundle_download_layer.rs

@@ -5,8 +5,8 @@ use commons::output::{
 
 use crate::RubyBuildpack;
 use crate::RubyBuildpackError;
-use commons::fun_run::{self, CommandWithName};
 use commons::gemfile_lock::ResolvedBundlerVersion;
+use fun_run::{self, CommandWithName};
 use libcnb::build::BuildContext;
 use libcnb::data::layer_content_metadata::LayerTypes;
 use libcnb::layer::{ExistingLayerStrategy, Layer, LayerData, LayerResult, LayerResultBuilder};

buildpacks/ruby/src/layers/bundle_install_layer.rs

@@ -4,13 +4,11 @@ use commons::output::{
 };
 
 use crate::{BundleWithout, RubyBuildpack, RubyBuildpackError};
-use commons::fun_run::CommandWithName;
 use commons::{
- display::SentenceList,
- fun_run::{self, CmdError},
- gemfile_lock::ResolvedRubyVersion,
- metadata_digest::MetadataDigest,
+ display::SentenceList, gemfile_lock::ResolvedRubyVersion, metadata_digest::MetadataDigest,
 };
+use fun_run::CommandWithName;
+use fun_run::{self, CmdError};
 use libcnb::{
  build::BuildContext,
  data::{buildpack::StackId, layer_content_metadata::LayerTypes},

buildpacks/ruby/src/main.rs

@@ -2,13 +2,13 @@
 #![warn(clippy::pedantic)]
 #![allow(clippy::module_name_repetitions)]
 use commons::cache::CacheError;
-use commons::fun_run::CmdError;
 use commons::gemfile_lock::GemfileLock;
 use commons::metadata_digest::MetadataDigest;
 use commons::output::warn_later::WarnGuard;
 #[allow(clippy::wildcard_imports)]
 use commons::output::{build_log::*, fmt};
 use core::str::FromStr;
+use fun_run::CmdError;
 use layers::{
  bundle_download_layer::{BundleDownloadLayer, BundleDownloadLayerMetadata},
  bundle_install_layer::{BundleInstallLayer, BundleInstallLayerMetadata},

buildpacks/ruby/src/rake_task_detect.rs

@@ -3,8 +3,8 @@ use commons::output::{
  section_log::{log_step_timed, SectionLogger},
 };
 
-use commons::fun_run::{CmdError, CommandWithName};
 use core::str::FromStr;
+use fun_run::{CmdError, CommandWithName};
 use std::{ffi::OsStr, process::Command};
 
 /// Run `rake -P` and parse output to show what rake tasks an application has

buildpacks/ruby/src/steps/rake_assets_install.rs

@@ -2,11 +2,11 @@ use crate::rake_task_detect::RakeDetect;
 use crate::RubyBuildpack;
 use crate::RubyBuildpackError;
 use commons::cache::{mib, AppCacheCollection, CacheConfig, KeepPath};
-use commons::fun_run::{self, CmdError, CommandWithName};
 use commons::output::{
  fmt::{self, HELP},
  section_log::{log_step, log_step_stream, SectionLogger},
 };
+use fun_run::{self, CmdError, CommandWithName};
 use libcnb::build::BuildContext;
 use libcnb::Env;
 use std::process::Command;

buildpacks/ruby/src/user_errors.rs

@@ -7,7 +7,7 @@ use commons::output::{
 };
 
 use crate::RubyBuildpackError;
-use commons::fun_run::{CmdError, CommandWithName};
+use fun_run::{CmdError, CommandWithName};
 use indoc::formatdoc;
 
 pub(crate) fn on_error(err: libcnb::Error<RubyBuildpackError>) {

commons/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog for commons features
+
+## 1.0.0
+
+### Changed
+
+- Move `fun_run` commons library to it's own crate (https://github.com/heroku/buildpacks-ruby/pull/232/files)

commons/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "commons"
-version = "0.1.0"
+version = "1.0.0"
 edition = "2021"
 publish = false
 
@@ -26,9 +26,9 @@ sha2 = "0.10"
 tempfile = "3"
 thiserror = "1"
 walkdir = "2"
-which_problem = "0.1"
 ascii_table = { version = "4", features = ["color_codes"] }
 const_format = "0.2"
+fun_run = "0.1"
 
 [dev-dependencies]
 indoc = "2"

commons/bin/print_style_guide.rs

@@ -1,10 +1,10 @@
 use ascii_table::AsciiTable;
-use commons::fun_run::CommandWithName;
 use commons::output::fmt::{self, DEBUG_INFO, HELP};
 use commons::output::{
  build_log::*,
  section_log::{log_step, log_step_stream, log_step_timed},
 };
+use fun_run::CommandWithName;
 use indoc::formatdoc;
 use std::io::stdout;
 use std::process::Command;