adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Switch CommandRunner to OsStr

Browse source
This commit is contained in:
Adrian Heine 2017-09-06 21:33:05 +02:00
parent b8bac1142c
commit 3b45b0f77c
22 changed files with 220 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/symbols/user.rs
View file

@ -71,14 +71,14 @@ impl fmt::Display for UserError {
}
}
pub struct User<'a, E, A> where E: Error + Sized, A: 'a + UserAdder<SubE=E> {
pub struct User<'a, C: 'a + CommandRunner, E, A> where E: Error + Sized, A: 'a + UserAdder<SubE=E> {
user_name: Cow<'a, str>,
command_runner: &'a CommandRunner,
command_runner: &'a C,
user_adder: &'a A
}
impl<'a, E: Error + Sized, A: 'a + UserAdder<SubE=E>> User<'a, E, A> {
pub fn new(user_name: Cow<'a, str>, command_runner: &'a CommandRunner, user_adder: &'a A) -> User<'a, E, A> {
impl<'a, C: CommandRunner, E: Error + Sized, A: 'a + UserAdder<SubE=E>> User<'a, C, E, A> {
pub fn new(user_name: Cow<'a, str>, command_runner: &'a C, user_adder: &'a A) -> Self {
User {
user_name: user_name,
command_runner: command_runner,
@ -87,13 +87,13 @@ impl<'a, E: Error + Sized, A: 'a + UserAdder<SubE=E>> User<'a, E, A> {
}
}
impl<'a, E: Error, A: UserAdder<SubE=E>> fmt::Display for User<'a, E, A> {
impl<'a, C: CommandRunner, E: Error, A: UserAdder<SubE=E>> fmt::Display for User<'a, C, E, A> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "User {}", self.user_name)
}
}
impl<'a, E: 'static + Error, A: UserAdder<SubE=E>> Symbol for User<'a, E, A> {
impl<'a, C: CommandRunner, E: 'static + Error, A: UserAdder<SubE=E>> Symbol for User<'a, C, E, A> {
fn target_reached(&self) -> Result<bool, Box<Error>> {
let output = try!(self.command_runner.run_with_args("getent", &["passwd", &*self.user_name]));
match output.status.code() {
@ -120,17 +120,17 @@ impl<'a, E: 'static + Error, A: UserAdder<SubE=E>> Symbol for User<'a, E, A> {
}
}
pub struct SystemUserAdder<'a> {
command_runner: &'a CommandRunner
pub struct SystemUserAdder<'a, C: 'a + CommandRunner> {
command_runner: &'a C
}
impl<'a> SystemUserAdder<'a> {
pub fn new(command_runner: &'a CommandRunner) -> SystemUserAdder<'a> {
impl<'a, C: CommandRunner> SystemUserAdder<'a, C> {
pub fn new(command_runner: &'a C) -> Self {
SystemUserAdder { command_runner: command_runner }
}
}
impl<'a> UserAdder for SystemUserAdder<'a> {
impl<'a, C: CommandRunner> UserAdder for SystemUserAdder<'a, C> {
type SubE = IoError;
fn add_user(&self, user_name: &str) -> Result<(), UserAdderError<IoError>> {
let output = self.command_runner.run_with_args(