Skip to content

Commit

Permalink
chore: const env!(CARGO_PKG_*) vars
Browse files Browse the repository at this point in the history
  • Loading branch information
EverlastingBugstopper committed Feb 25, 2021
1 parent a8c8195 commit 644e109
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 26 deletions.
8 changes: 4 additions & 4 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{
const FILES_TO_COPY: &[&str; 2] = &["LICENSE", "README.md"];

/// the version of Rover currently set in `Cargo.toml`
const ROVER_VERSION: &str = env!("CARGO_PKG_VERSION");
const PKG_VERSION: &str = env!("CARGO_PKG_VERSION");

fn main() -> Result<()> {
let is_release_build = env::var("PROFILE") == Ok("release".to_string());
Expand Down Expand Up @@ -124,18 +124,18 @@ fn update_version(npm_install_path: &Path, npm_dir: &Path) -> Result<()> {
let command_output = Command::new(npm_install_path)
.current_dir(npm_dir)
.arg("version")
.arg(ROVER_VERSION)
.arg(PKG_VERSION)
.arg("--allow-same-version")
.output()
.with_context(|| {
format!(
"Could not execute 'npm version {} --allow-same-version'.",
ROVER_VERSION
PKG_VERSION
)
})?;

process_command_output(&command_output)
.with_context(|| format!("Could not print output of 'npm version {}'.", ROVER_VERSION))
.with_context(|| format!("Could not print output of 'npm version {}'.", PKG_VERSION))
}

fn dry_run_publish(npm_install_path: &Path, npm_dir: &Path) -> Result<()> {
Expand Down
10 changes: 8 additions & 2 deletions src/bin/rover.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
use command::RoverStdout;
use robot_panic::setup_panic;
use robot_panic::{setup_panic, Metadata};
use rover::*;
use sputnik::Session;
use structopt::StructOpt;

use std::{process, thread};

fn main() {
setup_panic!();
setup_panic!(Metadata {
name: PKG_NAME.into(),
version: PKG_VERSION.into(),
authors: PKG_AUTHORS.into(),
homepage: PKG_HOMEPAGE.into(),
repository: PKG_REPOSITORY.into()
});
if let Err(error) = run() {
tracing::debug!(?error);
eprint!("{}", error);
Expand Down
6 changes: 2 additions & 4 deletions src/command/info.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::command::RoverStdout;
use crate::Result;
use crate::PKG_VERSION;
use serde::Serialize;
use std::env;
use structopt::StructOpt;
Expand All @@ -14,9 +15,6 @@ impl Info {
// something like "/usr/bin/zsh" or "Unknown"
let shell = env::var("SHELL").unwrap_or_else(|_| "Unknown".to_string());

// the version of Rover currently set in `Cargo.toml`
let version: &str = env!("CARGO_PKG_VERSION");

let location = match env::current_exe() {
Ok(path) => path
.into_os_string()
Expand All @@ -27,7 +25,7 @@ impl Info {

eprintln!(
"Rover Info:\nVersion: {}\nInstall Location: {}\nOS: {}\nShell: {}",
version, location, os, shell
PKG_VERSION, location, os, shell
);

Ok(RoverStdout::None)
Expand Down
5 changes: 2 additions & 3 deletions src/command/install/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use structopt::StructOpt;
use binstall::Installer;

use crate::command::RoverStdout;
use crate::PKG_NAME;
use crate::{anyhow, Context, Result};

use std::env;
Expand All @@ -17,11 +18,9 @@ pub struct Install {

impl Install {
pub fn run(&self, override_install_path: Option<PathBuf>) -> Result<RoverStdout> {
let binary_name = env!("CARGO_PKG_NAME").to_string();

if let Ok(executable_location) = env::current_exe() {
let install_location = Installer {
binary_name: binary_name.clone(),
binary_name: PKG_NAME,
force_install: self.force,
override_install_path,
executable_location,
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ mod error;
pub mod utils;

pub use error::{anyhow, Context, Result};

pub use utils::pkg::*;
8 changes: 3 additions & 5 deletions src/utils/client.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
use crate::Result;
use crate::PKG_VERSION;

use houston as config;
use rover_client::blocking::StudioClient;

/// the Apollo graph registry's production API endpoint
const STUDIO_PROD_API_ENDPOINT: &str = "https://graphql.api.apollographql.com/api/graphql";

/// the version of Rover currently set in `Cargo.toml`
const ROVER_VERSION: &str = env!("CARGO_PKG_VERSION");

pub struct StudioClientConfig {
uri: String,
config: config::Config,
Expand All @@ -18,9 +16,9 @@ pub struct StudioClientConfig {
impl StudioClientConfig {
pub fn new(override_endpoint: Option<String>, config: config::Config) -> StudioClientConfig {
let version = if cfg!(debug_assertions) {
format!("{} (dev)", ROVER_VERSION)
format!("{} (dev)", PKG_VERSION)
} else {
ROVER_VERSION.to_string()
PKG_VERSION.to_string()
};

StudioClientConfig {
Expand Down
3 changes: 2 additions & 1 deletion src/utils/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ impl Into<SubgraphCheckContextInput> for GitContext {
#[cfg(test)]
mod tests {
use super::*;
use crate::PKG_NAME;

#[test]
fn removed_user_from_remote_with_only_user() {
Expand Down Expand Up @@ -353,7 +354,7 @@ mod tests {
assert!(git_context.message.is_none());

if let Some(remote_url) = git_context.remote_url {
assert!(remote_url.contains(env!("CARGO_PKG_NAME")));
assert!(remote_url.contains(PKG_NAME));
} else {
panic!("GitContext could not find the remote url");
}
Expand Down
1 change: 1 addition & 0 deletions src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ pub mod env;
pub mod git;
pub mod loaders;
pub mod parsers;
mod pkg;
pub mod stringify;
pub mod telemetry;
5 changes: 5 additions & 0 deletions src/utils/pkg.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pub const PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
pub const PKG_NAME: &str = env!("CARGO_PKG_NAME");
pub const PKG_REPOSITORY: &str = env!("CARGO_PKG_REPOSITORY");
pub const PKG_HOMEPAGE: &str = env!("CARGO_PKG_HOMEPAGE");
pub const PKG_AUTHORS: &str = env!("CARGO_PKG_AUTHORS");
8 changes: 3 additions & 5 deletions src/utils/telemetry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ use url::Url;

use std::path::PathBuf;

use crate::cli::Rover;
use crate::utils::env::RoverEnvKey;
use crate::{cli::Rover, PKG_NAME, PKG_VERSION};
use sputnik::{Command, Report, SputnikError};

use std::collections::HashMap;

const TELEMETRY_URL: &str = "https://install.apollographql.workers.dev/telemetry";
const ROVER_VERSION: &str = env!("CARGO_PKG_VERSION");
const ROVER_NAME: &str = env!("CARGO_PKG_NAME");

fn get_command_from_args(mut raw_arguments: &mut serde_json::Value) -> Command {
let mut commands = Vec::new();
Expand Down Expand Up @@ -98,11 +96,11 @@ impl Report for Rover {
}

fn tool_name(&self) -> String {
ROVER_NAME.to_string()
PKG_NAME.to_string()
}

fn version(&self) -> String {
ROVER_VERSION.to_string()
PKG_VERSION.to_string()
}

fn machine_id_config(&self) -> Result<PathBuf, SputnikError> {
Expand Down
4 changes: 2 additions & 2 deletions tests/info.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use assert_cmd::Command;
use predicates::prelude::*;
use rover::PKG_VERSION;

#[test]
fn it_prints_info() {
let mut cmd = Command::cargo_bin("rover").unwrap();
let result = cmd.arg("info").assert().success();

// the version should always be available in the `info` output
let version = env!("CARGO_PKG_VERSION");
result.stderr(predicate::str::contains(version));
result.stderr(predicate::str::contains(PKG_VERSION));
}

0 comments on commit 644e109

Please sign in to comment.