Remove more references to cratesfyi

README.md

@@ -185,14 +185,14 @@ cargo run -- build crate --local /path/to/source
 
 ```sh
 # Adds a directory into database to serve with `staticfile` crate.
-docker-compose run -- database add-directory <DIRECTORY> [PREFIX]
+cargo run -- database add-directory <DIRECTORY> [PREFIX]
 
 # Updates github stats for crates.
 # You need to set CRATESFYI_GITHUB_USERNAME, CRATESFYI_GITHUB_ACCESSTOKEN
 # environment variables in order to run this command.
 # Set DOCSRS_GITLAB_ACCESSTOKEN to raise the rate limit,
 # or leave it blank to fetch repositories at a slower rate.
-# You can set this environment variables in ~/.cratesfyi.env file.
+# You can set this environment variables in the .env file.
 cargo run -- database update-repository-fields
 ```
 

crates/metadata/lib.rs

@@ -323,7 +323,7 @@ mod test_parsing {
     use std::str::FromStr;
 
     #[test]
-    fn test_cratesfyi_metadata() {
+    fn test_docsrs_metadata() {
         let manifest = r#"
             [package]
             name = "test"

src/bin/cratesfyi.rs

@@ -79,7 +79,7 @@ enum CommandLine {
         reload_templates: bool,
     },
 
-    /// Starts cratesfyi daemon
+    /// Starts the daemon
     Daemon {
         /// Deprecated. Run the server in the foreground instead of detaching a child
         #[structopt(name = "FOREGROUND", short = "f", long = "foreground")]
@@ -278,10 +278,10 @@ enum BuildSubcommand {
     /// Adds essential files for the installed version of rustc
     AddEssentialFiles,
 
-    /// Locks cratesfyi daemon to stop building new crates
+    /// Locks the daemon, preventing it from building new crates
     Lock,
 
-    /// Unlocks cratesfyi daemon to continue building new crates
+    /// Unlocks the daemon to continue building new crates
     Unlock,
 }
 

src/db/add_package.rs

@@ -172,7 +172,7 @@ pub(crate) fn add_build_into_database(
 ) -> Result<i32> {
     debug!("Adding build into database");
     let rows = conn.query(
-        "INSERT INTO builds (rid, rustc_version, cratesfyi_version, build_status)
+        "INSERT INTO builds (rid, rustc_version, docsrs_version, build_status)
         VALUES ($1, $2, $3, $4)
         RETURNING id",
         &[

src/db/migrate.rs

@@ -1,6 +1,5 @@
 //! Database migrations
 
-use crate::error::Result as CratesfyiResult;
 use log::info;
 use postgres::{Client, Error as PostgresError, Transaction};
 use schemamama::{Migration, Migrator, Version};
@@ -50,7 +49,7 @@ macro_rules! migration {
     }};
 }
 
-pub fn migrate(version: Option<Version>, conn: &mut Client) -> CratesfyiResult<()> {
+pub fn migrate(version: Option<Version>, conn: &mut Client) -> crate::error::Result<()> {
     conn.execute(
         "CREATE TABLE IF NOT EXISTS database_versions (version BIGINT PRIMARY KEY);",
         &[],
@@ -730,7 +729,12 @@ pub fn migrate(version: Option<Version>, conn: &mut Client) -> CratesfyiResult<(
                     DROP COLUMN repository_id;
 
                 DROP TABLE repositories;
-            "
+            ",
+        ),
+        migration!(
+            context, 29, "Rename cratesfyi_version to docsrs_version",
+            "ALTER TABLE builds RENAME COLUMN cratesfyi_version TO docsrs_version",
+            "ALTER TABLE builds RENAME COLUMN docsrs_version TO cratesfyi_version",
         ),
     ];
 

src/docbuilder/mod.rs

@@ -31,7 +31,7 @@ impl DocBuilder {
     }
 
     fn lock_path(&self) -> PathBuf {
-        self.config.prefix.join("cratesfyi.lock")
+        self.config.prefix.join("docsrs.lock")
     }
 
     /// Creates a lock file. Daemon will check this lock file and stop operating if its exists.

src/docbuilder/rustwide_builder.rs

@@ -613,7 +613,7 @@ impl RustwideBuilder {
         // this is allowing us to host documents in the root of the crate documentation directory.
         // for example winapi will be available in docs.rs/winapi/$version/winapi/ for it's
         // default target: x86_64-pc-windows-msvc. But since it will be built under
-        // cratesfyi/x86_64-pc-windows-msvc we still need target in this function.
+        // target/x86_64-pc-windows-msvc we still need target in this function.
         if !is_default_target {
             dest = dest.join(target);
         }

src/repositories/updater.rs

@@ -326,16 +326,16 @@ mod test {
 
         // gitlab checks
         assert_name(
-            "https://gitlab.com/onur/cratesfyi",
-            ("onur", "cratesfyi", "gitlab.com"),
+            "https://gitlab.com/pythondude325/hexponent",
+            ("pythondude325", "hexponent", "gitlab.com"),
         );
         assert_name(
-            "http://gitlab.com/onur/cratesfyi",
-            ("onur", "cratesfyi", "gitlab.com"),
+            "http://gitlab.com/pythondude325/hexponent",
+            ("pythondude325", "hexponent", "gitlab.com"),
         );
         assert_name(
-            "https://gitlab.com/onur/cratesfyi.git",
-            ("onur", "cratesfyi", "gitlab.com"),
+            "https://gitlab.com/pythondude325/hexponent.git",
+            ("pythondude325", "hexponent", "gitlab.com"),
         );
         assert_name(
             "https://gitlab.com/docopt/docopt.rs",
@@ -361,16 +361,16 @@ mod test {
 
         // github checks
         assert_name(
-            "https://github.com/onur/cratesfyi",
-            ("onur", "cratesfyi", "github.com"),
+            "https://github.com/rust-lang/rust",
+            ("rust-lang", "rust", "github.com"),
         );
         assert_name(
-            "http://github.com/onur/cratesfyi",
-            ("onur", "cratesfyi", "github.com"),
+            "http://github.com/rust-lang/rust",
+            ("rust-lang", "rust", "github.com"),
         );
         assert_name(
-            "https://github.com/onur/cratesfyi.git",
-            ("onur", "cratesfyi", "github.com"),
+            "https://github.com/rust-lang/rust.git",
+            ("rust-lang", "rust", "github.com"),
         );
         assert_name(
             "https://github.com/docopt/docopt.rs",

src/utils/copy.rs

@@ -26,11 +26,11 @@ mod test {
     #[test]
     fn test_copy_doc_dir() {
         let source = tempfile::Builder::new()
-            .prefix("cratesfyi-src")
+            .prefix("docsrs-src")
             .tempdir()
             .unwrap();
         let destination = tempfile::Builder::new()
-            .prefix("cratesfyi-dst")
+            .prefix("docsrs-dst")
             .tempdir()
             .unwrap();
         let doc = source.path().join("doc");

src/utils/queue.rs

@@ -56,19 +56,16 @@ mod tests {
         wrapper(|env| {
             let db = env.db();
 
-            set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
+            set_crate_priority(&mut db.conn(), "docsrs-%", -100)?;
+            assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-database")?, -100);
+            assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-")?, -100);
+            assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-s3")?, -100);
             assert_eq!(
-                get_crate_priority(&mut db.conn(), "cratesfyi-database")?,
+                get_crate_priority(&mut db.conn(), "docsrs-webserver")?,
                 -100
             );
-            assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
-            assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-s3")?, -100);
             assert_eq!(
-                get_crate_priority(&mut db.conn(), "cratesfyi-webserver")?,
-                -100
-            );
-            assert_eq!(
-                get_crate_priority(&mut db.conn(), "cratesfyi")?,
+                get_crate_priority(&mut db.conn(), "docsrs")?,
                 DEFAULT_PRIORITY
             );
 
@@ -96,15 +93,15 @@ mod tests {
         wrapper(|env| {
             let db = env.db();
 
-            set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
-            assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
+            set_crate_priority(&mut db.conn(), "docsrs-%", -100)?;
+            assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-")?, -100);
 
             assert_eq!(
-                remove_crate_priority(&mut db.conn(), "cratesfyi-%")?,
+                remove_crate_priority(&mut db.conn(), "docsrs-%")?,
                 Some(-100)
             );
             assert_eq!(
-                get_crate_priority(&mut db.conn(), "cratesfyi-")?,
+                get_crate_priority(&mut db.conn(), "docsrs-")?,
                 DEFAULT_PRIORITY
             );
 
@@ -117,16 +114,13 @@ mod tests {
         wrapper(|env| {
             let db = env.db();
 
-            set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
+            set_crate_priority(&mut db.conn(), "docsrs-%", -100)?;
 
+            assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-database")?, -100);
+            assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-")?, -100);
+            assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-s3")?, -100);
             assert_eq!(
-                get_crate_priority(&mut db.conn(), "cratesfyi-database")?,
-                -100
-            );
-            assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
-            assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-s3")?, -100);
-            assert_eq!(
-                get_crate_priority(&mut db.conn(), "cratesfyi-webserver")?,
+                get_crate_priority(&mut db.conn(), "docsrs-webserver")?,
                 -100
             );
             assert_eq!(
@@ -144,7 +138,7 @@ mod tests {
             let db = env.db();
 
             assert_eq!(
-                get_crate_priority(&mut db.conn(), "cratesfyi")?,
+                get_crate_priority(&mut db.conn(), "docsrs")?,
                 DEFAULT_PRIORITY
             );
             assert_eq!(get_crate_priority(&mut db.conn(), "rcc")?, DEFAULT_PRIORITY);

src/utils/rustc_version.rs

@@ -26,7 +26,7 @@ fn test_parse_rustc_version() {
         "20160523-1.10.0-nightly-57ef01513"
     );
     assert_eq!(
-        parse_rustc_version("cratesfyi 0.2.0 (ba9ae23 2016-05-26)").unwrap(),
+        parse_rustc_version("docsrs 0.2.0 (ba9ae23 2016-05-26)").unwrap(),
         "20160526-0.2.0-ba9ae23"
     );
 }

src/web/build_details.rs

@@ -44,7 +44,7 @@ pub fn build_details_handler(req: &mut Request) -> IronResult<Response> {
         conn.query_opt(
             "SELECT
                 builds.rustc_version,
-                builds.cratesfyi_version,
+                builds.docsrs_version,
                 builds.build_status,
                 builds.build_time,
                 builds.output,
@@ -69,7 +69,7 @@ pub fn build_details_handler(req: &mut Request) -> IronResult<Response> {
         BuildDetails {
             id,
             rustc_version: row.get("rustc_version"),
-            docsrs_version: row.get("cratesfyi_version"),
+            docsrs_version: row.get("docsrs_version"),
             build_status: row.get("build_status"),
             build_time: row.get("build_time"),
             output,

src/web/builds.rs

@@ -80,7 +80,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
                 releases.target_name,
                 builds.id,
                 builds.rustc_version,
-                builds.cratesfyi_version,
+                builds.docsrs_version,
                 builds.build_status,
                 builds.build_time
              FROM builds
@@ -97,7 +97,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
         .map(|row| Build {
             id: row.get("id"),
             rustc_version: row.get("rustc_version"),
-            docsrs_version: row.get("cratesfyi_version"),
+            docsrs_version: row.get("docsrs_version"),
             build_status: row.get("build_status"),
             build_time: row.get("build_time"),
         })

src/web/mod.rs

@@ -119,13 +119,13 @@ const STATIC_FILE_CACHE_DURATION: u64 = 60 * 60 * 24 * 30 * 12; // 12 months
 
 const DEFAULT_BIND: &str = "0.0.0.0:3000";
 
-struct CratesfyiHandler {
+struct MainHandler {
     shared_resource_handler: Box<dyn Handler>,
     router_handler: Box<dyn Handler>,
     inject_extensions: InjectExtensions,
 }
 
-impl CratesfyiHandler {
+impl MainHandler {
     fn chain<H: Handler>(inject_extensions: InjectExtensions, base: H) -> Chain {
         let mut chain = Chain::new(base);
         chain.link_before(inject_extensions);
@@ -136,26 +136,23 @@ impl CratesfyiHandler {
         chain
     }
 
-    fn new(
-        template_data: Arc<TemplateData>,
-        context: &dyn Context,
-    ) -> Result<CratesfyiHandler, Error> {
+    fn new(template_data: Arc<TemplateData>, context: &dyn Context) -> Result<MainHandler, Error> {
         let inject_extensions = InjectExtensions::new(context, template_data)?;
 
         let routes = routes::build_routes();
         let shared_resources =
             Self::chain(inject_extensions.clone(), rustdoc::SharedResourceHandler);
         let router_chain = Self::chain(inject_extensions.clone(), routes.iron_router());
 
-        Ok(CratesfyiHandler {
+        Ok(MainHandler {
             shared_resource_handler: Box::new(shared_resources),
             router_handler: Box::new(router_chain),
             inject_extensions,
         })
     }
 }
 
-impl Handler for CratesfyiHandler {
+impl Handler for MainHandler {
     fn handle(&self, req: &mut Request) -> IronResult<Response> {
         fn if_404(
             e: IronError,
@@ -438,8 +435,7 @@ impl Server {
         template_data: Arc<TemplateData>,
         context: &dyn Context,
     ) -> Result<Self, Error> {
-        let cratesfyi = CratesfyiHandler::new(template_data, context)?;
-        let mut iron = Iron::new(cratesfyi);
+        let mut iron = Iron::new(MainHandler::new(template_data, context)?);
         if cfg!(test) {
             iron.threads = 1;
         }

templates/about-base.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block header %}
-    <div class="cratesfyi-package-container">
+    <div class="docsrs-package-container">
         <div class="container">
             <div class="description-container">
                 <h1 id="crate-title" class="no-description">Docs.rs documentation</h1>

templates/error.html

@@ -1,7 +1,7 @@
 {%- extends "base.html" -%}
 
 {%- block header -%}
-    <div class="cratesfyi-package-container">
+    <div class="docsrs-package-container">
         <div class="container">
             <h1 id="crate-title">{{ title }}</h1>
         </div>

templates/header/package_navigation.html

@@ -13,7 +13,7 @@
            and tera requires all parameters without defaults to be filled
 #}
 {% macro package_navigation(title=false, metadata, active_tab) %}
-    <div class="cratesfyi-package-container">
+    <div class="docsrs-package-container">
         <div class="container">
             <div class="description-container">
                 {# The partial path of the crate, `:name/:release` #}

templates/releases/header.html

@@ -12,7 +12,7 @@
         * `owner` A string, used for the owners page
 #}
 {% macro header(title, description, tab, owner=false) %}
-    <div class="cratesfyi-package-container">
+    <div class="docsrs-package-container">
         <div class="container">
             <div class="description-container">
                 <h1 id="crate-title">{{ title }}</h1>

templates/style/base.scss

@@ -539,7 +539,7 @@ div.package-page-container {
     }
 }
 
-div.cratesfyi-package-container {
+div.docsrs-package-container {
     text-align: left;
     background-color: var(--color-background-code);
     border-bottom: 1px solid var(--color-border);

templates/style/rustdoc.scss

@@ -19,7 +19,7 @@ body.blur {
     }
 
     > div.nav-container > *,
-    > div.cratesfyi-package-container > *,
+    > div.docsrs-package-container > *,
     > div.rustdoc > :not(#help) {
         filter: blur(8px);
         -webkit-filter: blur(8px);