raps2: Add cost/echo/pwgen options

2 files changed, 20 insertions, 8 deletions

diff --git a/bin/raps2 b/bin/raps2
index 90d094f..2451e6f 100755
--- a/bin/raps2
+++ b/bin/raps2
@@ -11,17 +11,25 @@ use File::BaseDir qw(data_files data_home);
 use File::Slurp qw(read_dir);
 use Getopt::Long qw(:config no_ignore_case);
 
-my $raps2 = App::Raps2->new();
-my ( $action, @args ) = @ARGV;
+my ( $default_cost, $echo_generated, $pwgen_cmd );
 
 our $VERSION = '0.50';
 
 GetOptions(
-	'h|help'    => sub { cmd_help(0) },
-	'V|version' => sub { say "raps2 version ${VERSION}"; exit 0 },
+	'c|cost=i'      => \$default_cost,
+	'e|echo'        => \$echo_generated,
+	'h|help'        => sub { cmd_help(0) },
+	'p|pwgen_cmd=s' => \$pwgen_cmd,
+	'V|version'     => sub { say "raps2 version ${VERSION}"; exit 0 },
 
 ) or cmd_help(1);
 
+my ( $action, @args ) = @ARGV;
+my $raps2 = App::Raps2->new(
+	cost      => $default_cost,
+	pwgen_cmd => $pwgen_cmd
+);
+
 sub file_must_exist {
 	my ( $file, $name ) = @_;
 
@@ -70,6 +78,10 @@ sub cmd_add {
 			  . $raps2->conf('pwgen_cmd');
 			exit 3;
 		}
+
+		if ($echo_generated) {
+			$raps2->ui->output( [ 'Generated password', $pass ] );
+		}
 	}
 
 	$raps2->pw_save(
diff --git a/lib/App/Raps2.pm b/lib/App/Raps2.pm
index d173adc..897e62e 100644
--- a/lib/App/Raps2.pm
+++ b/lib/App/Raps2.pm
@@ -96,8 +96,8 @@ sub create_config {
 
 	my $cost = $self->{master_cost} = $self->{default}{cost} // 12;
 
-	my $pass = $self->{default}{master_password}
-	  // $self->ui->read_pw( 'Master Password', 1 );
+	my $pass = $self->{default}{master_password} // $self->ui->read_pw(
+		'Running for the first time. Please choose a master password', 1 );
 
 	$self->{pass} = App::Raps2::Password->new(
 		cost       => $self->{master_cost},
@@ -149,8 +149,8 @@ sub load_defaults {
 
 	my $cfg = Config::Tiny->read( $self->{xdg_conf} . '/defaults' );
 
-	$self->{default}{cost}      = $cfg->{_}->{cost};
-	$self->{default}{pwgen_cmd} = $cfg->{_}->{pwgen_cmd};
+	$self->{default}{cost}      //= $cfg->{_}->{cost};
+	$self->{default}{pwgen_cmd} //= $cfg->{_}->{pwgen_cmd};
 
 	return;
 }