diff options
Diffstat (limited to 'crates/shirabe/src/package')
37 files changed, 259 insertions, 213 deletions
diff --git a/crates/shirabe/src/package/alias_package.rs b/crates/shirabe/src/package/alias_package.rs index 0049d89..0d687a1 100644 --- a/crates/shirabe/src/package/alias_package.rs +++ b/crates/shirabe/src/package/alias_package.rs @@ -3,13 +3,13 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, in_array}; -use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::Constraint; -use crate::package::base_package::BasePackage; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::BasePackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct AliasPackage { @@ -185,7 +185,10 @@ impl AliasPackage { Some(link_type.to_string()), Some(pretty_version.clone()), ); - shirabe_semver::constraint::constraint_interface::ConstraintInterface::set_pretty_string(&mut constraint, Some(pretty_version.clone())); + shirabe_semver::constraint::ConstraintInterface::set_pretty_string( + &mut constraint, + Some(pretty_version.clone()), + ); new_links.push(new_link); } } @@ -205,7 +208,10 @@ impl AliasPackage { Some(link_type.to_string()), Some(pretty_version.clone()), ); - shirabe_semver::constraint::constraint_interface::ConstraintInterface::set_pretty_string(&mut constraint, Some(pretty_version.clone())); + shirabe_semver::constraint::ConstraintInterface::set_pretty_string( + &mut constraint, + Some(pretty_version.clone()), + ); links[index] = new_link; } } diff --git a/crates/shirabe/src/package/archiver/archivable_files_finder.rs b/crates/shirabe/src/package/archiver/archivable_files_finder.rs index 72ffabf..2e06e4d 100644 --- a/crates/shirabe/src/package/archiver/archivable_files_finder.rs +++ b/crates/shirabe/src/package/archiver/archivable_files_finder.rs @@ -1,11 +1,11 @@ //! ref: composer/src/Composer/Package/Archiver/ArchivableFilesFinder.php -use crate::package::archiver::composer_exclude_filter::ComposerExcludeFilter; -use crate::package::archiver::git_exclude_filter::GitExcludeFilter; -use crate::util::filesystem::Filesystem; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::finder::finder::Finder; -use shirabe_external_packages::symfony::component::finder::spl_file_info::SplFileInfo; +use crate::package::archiver::ComposerExcludeFilter; +use crate::package::archiver::GitExcludeFilter; +use crate::util::Filesystem; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::finder::Finder; +use shirabe_external_packages::symfony::component::finder::SplFileInfo; use shirabe_php_shim::{RuntimeException, preg_quote, realpath}; pub struct ArchivableFilesFinder { diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs index 094ddc3..390efc4 100644 --- a/crates/shirabe/src/package/archiver/archive_manager.rs +++ b/crates/shirabe/src/package/archiver/archive_manager.rs @@ -1,22 +1,22 @@ //! ref: composer/src/Composer/Package/Archiver/ArchiveManager.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ InvalidArgumentException, RuntimeException, bin2hex, file_exists, random_bytes, realpath, sys_get_temp_dir, }; -use crate::downloader::download_manager::DownloadManager; -use crate::json::json_file::JsonFile; -use crate::package::archiver::archiver_interface::ArchiverInterface; -use crate::package::archiver::phar_archiver::PharArchiver; -use crate::package::archiver::zip_archiver::ZipArchiver; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::util::filesystem::Filesystem; +use crate::downloader::DownloadManager; +use crate::json::JsonFile; +use crate::package::CompletePackageInterface; +use crate::package::RootPackageInterface; +use crate::package::archiver::ArchiverInterface; +use crate::package::archiver::PharArchiver; +use crate::package::archiver::ZipArchiver; +use crate::util::Filesystem; +use crate::util::SyncHelper; use crate::util::r#loop::Loop; -use crate::util::sync_helper::SyncHelper; pub struct ArchiveManager { pub(crate) download_manager: std::rc::Rc<std::cell::RefCell<DownloadManager>>, diff --git a/crates/shirabe/src/package/archiver/base_exclude_filter.rs b/crates/shirabe/src/package/archiver/base_exclude_filter.rs index 1a716d0..d3c0da1 100644 --- a/crates/shirabe/src/package/archiver/base_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/base_exclude_filter.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Package/Archiver/BaseExcludeFilter.php -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::finder::glob::Glob; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::finder::Glob; #[derive(Debug)] pub struct BaseExcludeFilterBase { diff --git a/crates/shirabe/src/package/archiver/composer_exclude_filter.rs b/crates/shirabe/src/package/archiver/composer_exclude_filter.rs index 979e67e..e685a4a 100644 --- a/crates/shirabe/src/package/archiver/composer_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/composer_exclude_filter.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Archiver/ComposerExcludeFilter.php -use super::base_exclude_filter::BaseExcludeFilterBase; +use super::BaseExcludeFilterBase; #[derive(Debug)] pub struct ComposerExcludeFilter { diff --git a/crates/shirabe/src/package/archiver/git_exclude_filter.rs b/crates/shirabe/src/package/archiver/git_exclude_filter.rs index 1a0ec4d..ffa349c 100644 --- a/crates/shirabe/src/package/archiver/git_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/git_exclude_filter.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Package/Archiver/GitExcludeFilter.php -use crate::package::archiver::base_exclude_filter::BaseExcludeFilterBase; -use shirabe_external_packages::composer::pcre::preg::Preg; +use crate::package::archiver::BaseExcludeFilterBase; +use shirabe_external_packages::composer::pcre::Preg; use std::path::Path; pub struct GitExcludeFilter { diff --git a/crates/shirabe/src/package/archiver/mod.rs b/crates/shirabe/src/package/archiver/mod.rs index ecf86c8..b4df5b0 100644 --- a/crates/shirabe/src/package/archiver/mod.rs +++ b/crates/shirabe/src/package/archiver/mod.rs @@ -7,3 +7,13 @@ pub mod composer_exclude_filter; pub mod git_exclude_filter; pub mod phar_archiver; pub mod zip_archiver; + +pub use archivable_files_filter::*; +pub use archivable_files_finder::*; +pub use archive_manager::*; +pub use archiver_interface::*; +pub use base_exclude_filter::*; +pub use composer_exclude_filter::*; +pub use git_exclude_filter::*; +pub use phar_archiver::*; +pub use zip_archiver::*; diff --git a/crates/shirabe/src/package/archiver/phar_archiver.rs b/crates/shirabe/src/package/archiver/phar_archiver.rs index 17bc05b..bf5332a 100644 --- a/crates/shirabe/src/package/archiver/phar_archiver.rs +++ b/crates/shirabe/src/package/archiver/phar_archiver.rs @@ -6,9 +6,9 @@ use shirabe_php_shim::{ file_put_contents, function_exists, gzcompress, pack, str_repeat, strrpos, unlink, }; -use crate::package::archiver::archivable_files_filter::ArchivableFilesFilter; -use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder; -use crate::package::archiver::archiver_interface::ArchiverInterface; +use crate::package::archiver::ArchivableFilesFilter; +use crate::package::archiver::ArchivableFilesFinder; +use crate::package::archiver::ArchiverInterface; fn formats() -> IndexMap<&'static str, i64> { let mut m = IndexMap::new(); diff --git a/crates/shirabe/src/package/archiver/zip_archiver.rs b/crates/shirabe/src/package/archiver/zip_archiver.rs index a5dd4f4..79d714b 100644 --- a/crates/shirabe/src/package/archiver/zip_archiver.rs +++ b/crates/shirabe/src/package/archiver/zip_archiver.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Package/Archiver/ZipArchiver.php -use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder; -use crate::package::archiver::archiver_interface::ArchiverInterface; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; +use crate::package::archiver::ArchivableFilesFinder; +use crate::package::archiver::ArchiverInterface; +use crate::util::Filesystem; +use crate::util::Platform; use indexmap::IndexMap; use shirabe_php_shim::{ PhpMixed, RuntimeException, ZipArchive, class_exists, fileperms, method_exists, pack, realpath, diff --git a/crates/shirabe/src/package/base_package.rs b/crates/shirabe/src/package/base_package.rs index 109fdb4..75bd22f 100644 --- a/crates/shirabe/src/package/base_package.rs +++ b/crates/shirabe/src/package/base_package.rs @@ -5,10 +5,10 @@ use std::sync::LazyLock; use indexmap::IndexMap; use shirabe_php_shim::{LogicException, UnexpectedValueException, preg_quote}; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; pub struct SupportedLinkType { pub description: &'static str, @@ -93,7 +93,7 @@ pub trait BasePackage: PackageInterface + std::fmt::Display { // as_alias_package / as_complete_package_interface inherited from PackageInterface. - fn as_alias_package_mut(&mut self) -> Option<&mut crate::package::alias_package::AliasPackage> { + fn as_alias_package_mut(&mut self) -> Option<&mut crate::package::AliasPackage> { None } diff --git a/crates/shirabe/src/package/comparer/comparer.rs b/crates/shirabe/src/package/comparer/comparer.rs index 8f406a5..73c94f4 100644 --- a/crates/shirabe/src/package/comparer/comparer.rs +++ b/crates/shirabe/src/package/comparer/comparer.rs @@ -3,7 +3,7 @@ use indexmap::IndexMap; use std::path::Path; -use crate::util::platform::Platform; +use crate::util::Platform; #[derive(Debug)] pub struct Comparer { diff --git a/crates/shirabe/src/package/comparer/mod.rs b/crates/shirabe/src/package/comparer/mod.rs index 4c5c6d2..d6ce6cb 100644 --- a/crates/shirabe/src/package/comparer/mod.rs +++ b/crates/shirabe/src/package/comparer/mod.rs @@ -1 +1,3 @@ pub mod comparer; + +pub use comparer::*; diff --git a/crates/shirabe/src/package/complete_alias_package.rs b/crates/shirabe/src/package/complete_alias_package.rs index d187eea..530bd03 100644 --- a/crates/shirabe/src/package/complete_alias_package.rs +++ b/crates/shirabe/src/package/complete_alias_package.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Package/CompleteAliasPackage.php -use crate::package::alias_package::AliasPackage; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; +use crate::package::AliasPackage; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; #[derive(Debug)] pub struct CompleteAliasPackage { diff --git a/crates/shirabe/src/package/complete_package.rs b/crates/shirabe/src/package/complete_package.rs index f6ee7ae..dee84da 100644 --- a/crates/shirabe/src/package/complete_package.rs +++ b/crates/shirabe/src/package/complete_package.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Package/CompletePackage.php -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package::Package; -use crate::package::package_interface::PackageInterface; +use crate::package::CompletePackageInterface; +use crate::package::Package; +use crate::package::PackageInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; @@ -26,7 +26,7 @@ pub struct CompletePackage { impl CompletePackage { pub fn new(name: String, version: String, pretty_version: String) -> Self { Self { - inner: crate::package::package::Package::new(name, version, pretty_version), + inner: crate::package::Package::new(name, version, pretty_version), repositories: Vec::new(), license: Vec::new(), keywords: Vec::new(), @@ -273,23 +273,23 @@ impl PackageInterface for CompletePackage { todo!() } - fn get_requires(&self) -> IndexMap<String, super::link::Link> { + fn get_requires(&self) -> IndexMap<String, super::Link> { todo!() } - fn get_conflicts(&self) -> IndexMap<String, super::link::Link> { + fn get_conflicts(&self) -> IndexMap<String, super::Link> { todo!() } - fn get_provides(&self) -> IndexMap<String, super::link::Link> { + fn get_provides(&self) -> IndexMap<String, super::Link> { todo!() } - fn get_replaces(&self) -> IndexMap<String, super::link::Link> { + fn get_replaces(&self) -> IndexMap<String, super::Link> { todo!() } - fn get_dev_requires(&self) -> IndexMap<String, super::link::Link> { + fn get_dev_requires(&self) -> IndexMap<String, super::Link> { todo!() } @@ -315,14 +315,12 @@ impl PackageInterface for CompletePackage { fn set_repository( &mut self, - repository: Box<dyn crate::repository::repository_interface::RepositoryInterface>, + repository: Box<dyn crate::repository::RepositoryInterface>, ) -> anyhow::Result<()> { todo!() } - fn get_repository( - &self, - ) -> Option<&dyn crate::repository::repository_interface::RepositoryInterface> { + fn get_repository(&self) -> Option<&dyn crate::repository::RepositoryInterface> { todo!() } diff --git a/crates/shirabe/src/package/complete_package_interface.rs b/crates/shirabe/src/package/complete_package_interface.rs index d1120ac..e638021 100644 --- a/crates/shirabe/src/package/complete_package_interface.rs +++ b/crates/shirabe/src/package/complete_package_interface.rs @@ -3,7 +3,7 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait CompletePackageInterface: PackageInterface { fn get_scripts(&self) -> IndexMap<String, Vec<String>>; @@ -56,7 +56,7 @@ pub trait CompletePackageInterface: PackageInterface { fn set_archive_excludes(&mut self, excludes: Vec<String>); - fn as_package_interface(&self) -> &dyn crate::package::package_interface::PackageInterface { + fn as_package_interface(&self) -> &dyn crate::package::PackageInterface { todo!() } } diff --git a/crates/shirabe/src/package/dumper/array_dumper.rs b/crates/shirabe/src/package/dumper/array_dumper.rs index cbff605..4bd9b56 100644 --- a/crates/shirabe/src/package/dumper/array_dumper.rs +++ b/crates/shirabe/src/package/dumper/array_dumper.rs @@ -3,12 +3,12 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::base_package::SUPPORTED_LINK_TYPES; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package::RootPackage; -use crate::package::root_package_interface::RootPackageInterface; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::package::RootPackage; +use crate::package::RootPackageInterface; +use crate::package::SUPPORTED_LINK_TYPES; #[derive(Debug)] pub struct ArrayDumper; @@ -133,7 +133,7 @@ impl ArrayDumper { // corresponds to: foreach (BasePackage::$supportedLinkTypes as $type => $opts) { $links = $package->{'get'.ucfirst($opts['method'])}(); ... } for (type_name, opts) in SUPPORTED_LINK_TYPES.iter() { // TODO(phase-b): PackageInterface needs get_links_by_method to mimic PHP magic call - let links: Vec<crate::package::link::Link> = Vec::new(); + let links: Vec<crate::package::Link> = Vec::new(); let _ = (&opts.method, package); if links.is_empty() { continue; diff --git a/crates/shirabe/src/package/dumper/mod.rs b/crates/shirabe/src/package/dumper/mod.rs index b50c878..c501aec 100644 --- a/crates/shirabe/src/package/dumper/mod.rs +++ b/crates/shirabe/src/package/dumper/mod.rs @@ -1 +1,3 @@ pub mod array_dumper; + +pub use array_dumper::*; diff --git a/crates/shirabe/src/package/link.rs b/crates/shirabe/src/package/link.rs index 2732075..80a98c7 100644 --- a/crates/shirabe/src/package/link.rs +++ b/crates/shirabe/src/package/link.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Package/Link.php use shirabe_php_shim::UnexpectedValueException; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub struct Link { pub(crate) source: String, diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs index 82b2ef7..ffbe465 100644 --- a/crates/shirabe/src/package/loader/array_loader.rs +++ b/crates/shirabe/src/package/loader/array_loader.rs @@ -3,23 +3,23 @@ use anyhow::Result; use chrono::{DateTime, TimeZone, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ E_USER_DEPRECATED, Exception, LogicException, PhpMixed, UnexpectedValueException, is_scalar, is_string, json_encode, ltrim, sprintf, stripos, strpos, strtolower, strval, substr, trigger_error, trim, ucfirst, }; -use crate::package::base_package::{BasePackage, SUPPORTED_LINK_TYPES}; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::root_alias_package::RootAliasPackage; -use crate::package::root_package::RootPackage; -use crate::package::version::version_parser::VersionParser; +use crate::package::CompleteAliasPackage; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootAliasPackage; +use crate::package::RootPackage; +use crate::package::loader::LoaderInterface; +use crate::package::version::VersionParser; +use crate::package::{BasePackage, SUPPORTED_LINK_TYPES}; #[derive(Debug)] pub struct ArrayLoader { diff --git a/crates/shirabe/src/package/loader/json_loader.rs b/crates/shirabe/src/package/loader/json_loader.rs index cb3cbeb..e0589bb 100644 --- a/crates/shirabe/src/package/loader/json_loader.rs +++ b/crates/shirabe/src/package/loader/json_loader.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Package/Loader/JsonLoader.php -use crate::json::json_file::JsonFile; -use crate::package::base_package::BasePackage; -use crate::package::loader::loader_interface::LoaderInterface; +use crate::json::JsonFile; +use crate::package::BasePackage; +use crate::package::loader::LoaderInterface; use anyhow::Result; use std::path::Path; diff --git a/crates/shirabe/src/package/loader/loader_interface.rs b/crates/shirabe/src/package/loader/loader_interface.rs index 2b93bc5..d10b7be 100644 --- a/crates/shirabe/src/package/loader/loader_interface.rs +++ b/crates/shirabe/src/package/loader/loader_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Loader/LoaderInterface.php -use crate::package::base_package::BasePackage; +use crate::package::BasePackage; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe/src/package/loader/mod.rs b/crates/shirabe/src/package/loader/mod.rs index 402b59c..1073172 100644 --- a/crates/shirabe/src/package/loader/mod.rs +++ b/crates/shirabe/src/package/loader/mod.rs @@ -4,3 +4,10 @@ pub mod json_loader; pub mod loader_interface; pub mod root_package_loader; pub mod validating_array_loader; + +pub use array_loader::*; +pub use invalid_package_exception::*; +pub use json_loader::*; +pub use loader_interface::*; +pub use root_package_loader::*; +pub use validating_array_loader::*; diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index 15f1114..231c807 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -1,28 +1,28 @@ //! ref: composer/src/Composer/Package/Loader/RootPackageLoader.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ LogicException, RuntimeException, UnexpectedValueException, strtolower, ucfirst, }; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::package::base_package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::loader::validating_array_loader::ValidatingArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::root_alias_package::RootAliasPackage; -use crate::package::root_package::RootPackage; -use crate::package::root_package_interface::RootPackageInterface; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_manager::RepositoryManager; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::package::RootAliasPackage; +use crate::package::RootPackage; +use crate::package::RootPackageInterface; +use crate::package::loader::ArrayLoader; +use crate::package::loader::LoaderInterface; +use crate::package::loader::ValidatingArrayLoader; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; +use crate::package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; +use crate::repository::RepositoryFactory; +use crate::repository::RepositoryManager; +use crate::util::Platform; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct RootPackageLoader { diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs index f01b774..59fc266 100644 --- a/crates/shirabe/src/package/loader/validating_array_loader.rs +++ b/crates/shirabe/src/package/loader/validating_array_loader.rs @@ -3,24 +3,24 @@ use chrono::TimeZone; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::composer::spdx_licenses::spdx_licenses::SpdxLicenses; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses; use shirabe_php_shim::{ E_USER_DEPRECATED, Exception, FILTER_VALIDATE_EMAIL, PHP_EOL, PhpMixed, array_intersect_key, array_values, filter_var, get_debug_type, is_array, is_bool, is_int, is_numeric, is_scalar, is_string, json_encode, parse_url_all, php_to_string, sprintf, str_replace, strcasecmp, strtolower, strtotime, substr, trigger_error, trim, var_export, }; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::match_none_constraint::MatchNoneConstraint; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MatchNoneConstraint; use shirabe_semver::intervals::Intervals; -use crate::package::base_package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; -use crate::package::loader::invalid_package_exception::InvalidPackageException; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::platform_repository::PlatformRepository; +use crate::package::loader::InvalidPackageException; +use crate::package::loader::LoaderInterface; +use crate::package::version::VersionParser; +use crate::package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; +use crate::repository::PlatformRepository; #[derive(Debug)] pub struct ValidatingArrayLoader { diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index 72339e8..5dd7ab4 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -3,8 +3,8 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::seld::json_lint::parsing_exception::ParsingException; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::seld::json_lint::ParsingException; use shirabe_php_shim::{ DATE_RFC3339, LogicException, PhpMixed, RuntimeException, array_intersect, array_keys, array_map, array_merge, call_user_func, file_get_contents, filemtime, function_exists, hash, @@ -12,27 +12,27 @@ use shirabe_php_shim::{ trim, usort, }; -use crate::installer::installation_manager::InstallationManager; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::BasePackage; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::link::Link; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::package::version::version_parser::VersionParser; +use crate::installer::InstallationManager; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::CompleteAliasPackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::loader::LoaderInterface; +use crate::package::version::VersionParser; use crate::plugin::plugin_interface::{self, PluginInterface}; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::lock_array_repository::LockArrayRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::FindPackageConstraint; -use crate::repository::root_package_repository::RootPackageRepository; -use crate::util::git::Git as GitUtil; -use crate::util::process_executor::ProcessExecutor; +use crate::repository::FindPackageConstraint; +use crate::repository::InstalledRepository; +use crate::repository::LockArrayRepository; +use crate::repository::PlatformRepository; +use crate::repository::RootPackageRepository; +use crate::util::Git as GitUtil; +use crate::util::ProcessExecutor; /// Reads/writes project lockfile (composer.lock). #[derive(Debug)] diff --git a/crates/shirabe/src/package/mod.rs b/crates/shirabe/src/package/mod.rs index 77a01a2..611f36a 100644 --- a/crates/shirabe/src/package/mod.rs +++ b/crates/shirabe/src/package/mod.rs @@ -15,3 +15,21 @@ pub mod root_alias_package; pub mod root_package; pub mod root_package_interface; pub mod version; + +pub use alias_package::*; +pub use archiver::*; +pub use base_package::*; +pub use comparer::*; +pub use complete_alias_package::*; +pub use complete_package::*; +pub use complete_package_interface::*; +pub use dumper::*; +pub use link::*; +pub use loader::*; +pub use locker::*; +pub use package::*; +pub use package_interface::*; +pub use root_alias_package::*; +pub use root_package::*; +pub use root_package_interface::*; +pub use version::*; diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index b36de7a..75b4e54 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -3,15 +3,15 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::composer::util::composer_mirror::ComposerMirror; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::composer::util::ComposerMirror; use shirabe_php_shim::{E_USER_DEPRECATED, PhpMixed, strpos, trigger_error}; -use crate::package::base_package::BasePackage; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::BasePackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; +use crate::repository::RepositoryInterface; /// Mirror entry, e.g. `['url' => 'https://...', 'preferred' => true]`. #[derive(Debug, Clone)] diff --git a/crates/shirabe/src/package/package_interface.rs b/crates/shirabe/src/package/package_interface.rs index e6ffbed..1c9cf2e 100644 --- a/crates/shirabe/src/package/package_interface.rs +++ b/crates/shirabe/src/package/package_interface.rs @@ -4,8 +4,8 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::link::Link; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::Link; +use crate::repository::RepositoryInterface; /// Defines the essential information a package has that is used during solving/installation /// @@ -201,7 +201,7 @@ pub trait PackageInterface: std::fmt::Display + std::fmt::Debug { fn get_suggests(&self) -> IndexMap<String, String>; /// PHP helper that switches on the link kind (require/require-dev/conflict/etc.). - fn get_links_for_type(&self, link_type: &str) -> IndexMap<String, crate::package::link::Link> { + fn get_links_for_type(&self, link_type: &str) -> IndexMap<String, crate::package::Link> { match link_type { "require" => self.get_requires(), "require-dev" => self.get_dev_requires(), @@ -298,25 +298,21 @@ pub trait PackageInterface: std::fmt::Display + std::fmt::Debug { todo!() } - fn as_alias_package(&self) -> Option<&crate::package::alias_package::AliasPackage> { + fn as_alias_package(&self) -> Option<&crate::package::AliasPackage> { None } fn as_complete_package_interface( &self, - ) -> Option<&dyn crate::package::complete_package_interface::CompletePackageInterface> { + ) -> Option<&dyn crate::package::CompletePackageInterface> { None } - fn as_complete_package( - &self, - ) -> Option<&dyn crate::package::complete_package_interface::CompletePackageInterface> { + fn as_complete_package(&self) -> Option<&dyn crate::package::CompletePackageInterface> { None } - fn as_root_package_interface( - &self, - ) -> Option<&dyn crate::package::root_package_interface::RootPackageInterface> { + fn as_root_package_interface(&self) -> Option<&dyn crate::package::RootPackageInterface> { None } } diff --git a/crates/shirabe/src/package/root_alias_package.rs b/crates/shirabe/src/package/root_alias_package.rs index cb458f3..d6dafa9 100644 --- a/crates/shirabe/src/package/root_alias_package.rs +++ b/crates/shirabe/src/package/root_alias_package.rs @@ -4,13 +4,13 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package::RootPackage; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::CompleteAliasPackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackage; +use crate::package::RootPackageInterface; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct RootAliasPackage { diff --git a/crates/shirabe/src/package/root_package.rs b/crates/shirabe/src/package/root_package.rs index af8d1f5..7e79530 100644 --- a/crates/shirabe/src/package/root_package.rs +++ b/crates/shirabe/src/package/root_package.rs @@ -4,12 +4,12 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct RootPackage { @@ -90,23 +90,23 @@ impl RootPackageInterface for RootPackage { &self.aliases } - fn set_requires(&mut self, requires: Vec<super::link::Link>) { + fn set_requires(&mut self, requires: Vec<super::Link>) { todo!() } - fn set_dev_requires(&mut self, dev_requires: Vec<super::link::Link>) { + fn set_dev_requires(&mut self, dev_requires: Vec<super::Link>) { todo!() } - fn set_conflicts(&mut self, conflicts: Vec<super::link::Link>) { + fn set_conflicts(&mut self, conflicts: Vec<super::Link>) { todo!() } - fn set_provides(&mut self, provides: Vec<super::link::Link>) { + fn set_provides(&mut self, provides: Vec<super::Link>) { todo!() } - fn set_replaces(&mut self, replaces: Vec<super::link::Link>) { + fn set_replaces(&mut self, replaces: Vec<super::Link>) { todo!() } diff --git a/crates/shirabe/src/package/root_package_interface.rs b/crates/shirabe/src/package/root_package_interface.rs index a053e28..2370e25 100644 --- a/crates/shirabe/src/package/root_package_interface.rs +++ b/crates/shirabe/src/package/root_package_interface.rs @@ -3,10 +3,10 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; +use crate::package::CompletePackageInterface; +use crate::package::Link; pub trait RootPackageInterface: CompletePackageInterface { fn get_aliases(&self) -> &[IndexMap<String, String>]; diff --git a/crates/shirabe/src/package/version/mod.rs b/crates/shirabe/src/package/version/mod.rs index a734e23..b2f32a2 100644 --- a/crates/shirabe/src/package/version/mod.rs +++ b/crates/shirabe/src/package/version/mod.rs @@ -3,3 +3,9 @@ pub mod version_bumper; pub mod version_guesser; pub mod version_parser; pub mod version_selector; + +pub use stability_filter::*; +pub use version_bumper::*; +pub use version_guesser::*; +pub use version_parser::*; +pub use version_selector::*; diff --git a/crates/shirabe/src/package/version/stability_filter.rs b/crates/shirabe/src/package/version/stability_filter.rs index 5053e9d..da2f1a6 100644 --- a/crates/shirabe/src/package/version/stability_filter.rs +++ b/crates/shirabe/src/package/version/stability_filter.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Version/StabilityFilter.php -use crate::package::base_package::STABILITIES; +use crate::package::STABILITIES; use indexmap::IndexMap; pub struct StabilityFilter; diff --git a/crates/shirabe/src/package/version/version_bumper.rs b/crates/shirabe/src/package/version/version_bumper.rs index f7c2377..a9b5a67 100644 --- a/crates/shirabe/src/package/version/version_bumper.rs +++ b/crates/shirabe/src/package/version/version_bumper.rs @@ -1,14 +1,14 @@ //! ref: composer/src/Composer/Package/Version/VersionBumper.php -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::util::platform::Platform; +use crate::package::PackageInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::version::VersionParser; +use crate::util::Platform; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_semver::constraint::ConstraintInterface; use shirabe_semver::intervals::Intervals; #[derive(Debug)] diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index c229c97..51a54e0 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -2,8 +2,8 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::process::process::Process; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::process::Process; use shirabe_php_shim::{ PHP_INT_MAX, PhpMixed, RuntimeException, array_keys, array_map, array_merge, empty, function_exists, implode, is_string, json_encode, preg_quote, str_replace, strlen, @@ -12,15 +12,15 @@ use shirabe_php_shim::{ use shirabe_semver::version_parser::VersionParser as SemverVersionParser; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::package::version::version_parser::VersionParser; -use crate::repository::vcs::hg_driver::HgDriver; -use crate::util::git::Git as GitUtil; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::svn::Svn as SvnUtil; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::package::version::VersionParser; +use crate::repository::vcs::HgDriver; +use crate::util::Git as GitUtil; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Svn as SvnUtil; /// Try to guess the current version number based on different VCS configuration. /// @@ -518,8 +518,9 @@ impl VersionGuesser { strnatcasecmp(b, a) }); - let mut promises: Vec<Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>> = - vec![]; + let mut promises: Vec< + Box<dyn shirabe_external_packages::react::promise::PromiseInterface>, + > = vec![]; self.process.borrow_mut().set_max_jobs(30); // TODO(phase-b): try/finally with resetMaxJobs let result: Result<()> = (|| -> Result<()> { diff --git a/crates/shirabe/src/package/version/version_parser.rs b/crates/shirabe/src/package/version/version_parser.rs index 4286419..46a2356 100644 --- a/crates/shirabe/src/package/version/version_parser.rs +++ b/crates/shirabe/src/package/version/version_parser.rs @@ -3,12 +3,12 @@ use indexmap::IndexMap; use std::sync::{Arc, LazyLock, Mutex}; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_semver::constraint::ConstraintInterface; use shirabe_semver::semver::Semver; use shirabe_semver::version_parser::VersionParser as SemverVersionParser; -use crate::repository::platform_repository::PlatformRepository; +use crate::repository::PlatformRepository; static CONSTRAINTS: LazyLock<Mutex<IndexMap<String, Arc<dyn ConstraintInterface + Send + Sync>>>> = LazyLock::new(|| Mutex::new(IndexMap::new())); diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs index 6496dea..832f64c 100644 --- a/crates/shirabe/src/package/version/version_selector.rs +++ b/crates/shirabe/src/package/version/version_selector.rs @@ -4,27 +4,27 @@ use crate::io::io_interface; use std::any::Any; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, strtolower, version_compare, }; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; -use crate::filter::platform_requirement_filter::ignore_all_platform_requirement_filter::IgnoreAllPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::ignore_list_platform_requirement_filter::IgnoreListPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory; -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; -use crate::io::io_interface::IOInterface; -use crate::package::alias_package::AliasPackage; +use crate::filter::platform_requirement_filter::IgnoreAllPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::io::IOInterface; +use crate::package::AliasPackage; +use crate::package::PackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_set::RepositorySet; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::version::VersionParser; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositorySet; #[derive(Debug)] pub struct VersionSelector { @@ -36,7 +36,7 @@ pub struct VersionSelector { impl VersionSelector { pub fn new( repository_set: RepositorySet, - platform_repo: Option<&crate::repository::platform_repository::PlatformRepository>, + platform_repo: Option<&crate::repository::PlatformRepository>, ) -> anyhow::Result<Self> { let mut platform_constraints: IndexMap<String, Vec<Box<dyn ConstraintInterface>>> = IndexMap::new(); |