| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377 | #!/usr/bin/perluse strict;use warnings;use Getopt::Long qw(GetOptions);use Log::Log4perl qw(:easy);# TODO: This needs to be scoped properlyuse lib "/usr/local/lib";use SimplyGit::Shellex qw(shellex findBin);use SimplyGit::Git qw(readConfig getStatus returnState addFiles commitChanges pushChanges stashAndReset resetFromUpstream updateGitIgnore appendRepoUserConfig);# TODO: This should maybe be more robust?if ( ! -d ".git" ) {	print "Not a git dir, exiting...\n";	exit 1;}sub initSG($) {	my $sgDir = shift;	my $pwdCmd = findBin("pwd");	my $pwd = shellex($pwdCmd);	chomp $pwd;	my $path = $pwd . "/" . $sgDir;	my $logFile = $pwd . "/" . $sgDir . "/" . "sgLog.txt";	if ( ! -d $path ) {		print "Creating $path\n";		shellex("mkdir $path");	}	if ( ! -f $logFile ) {		print "Creating $logFile\n";		shellex("touch $logFile");	}	return ( $path, $logFile );	}my ( $sgPath, $sgLogFile ) = initSG(".sg");sub getLogName { return $sgLogFile; };my $log_conf = q(        log4perl.rootLogger              = ERROR, LOG1        log4perl.appender.LOG1           = Log::Log4perl::Appender::File        log4perl.appender.LOG1.filename  = sub { getLogName(); }        log4perl.appender.LOG1.mode      = append        log4perl.appender.LOG1.layout    = Log::Log4perl::Layout::PatternLayout        log4perl.appender.LOG1.layout.ConversionPattern = %d %p %m %n);Log::Log4perl::init(\$log_conf);my $logger = get_logger();my $gitCmd = findBin("git",$logger);# Create or append to .gitignore so that we don't push the log# Maybe this should be an opt?updateGitIgnore(".","/.sg",$logger);my %args;GetOptions(	\%args,	'push-all',	'interactive',	'view',	'reset-from-master',	'reset-from-upstream',	'upstream-url=s',	'commit-msg=s',	'dump-config',	'configure-local-user',	'user=s',	'email=s',);sub printHelp {	my $help = <<EOFsimply-gitUsage:	--view	Display git status of files and other information	--dump-config	Dump .git/config to STDOUT. Not really useful but exposed for testing of reading config into internal data structure	--push-all [--commit-msg]	Push all untracked and modified files 		* Can be used with interactive mode		* Can provide a commit msg with --commit-msg (otherwise a generic will be provided)	--interactive	Enable interactive mode with supported opts	--reset-from-master	Reset all current changes so that the file tree matches origin master	--reset-from-upstream [ --upstream-url ]	If upstream is defined will reset local branch to match upstream ( does not push changes to origin )		* Assumes you have an upstream configured		* Pass SSH/HTTPS URL to --upstream-url to add an upstream	--configure-local-user [--user,--email]	Configure local git user		* Can be used with interactive modeEOF;	print "$help\n";}if ( scalar keys %args < 1 ) {	printHelp();}#### TODO: This args processing is better and more predictable than it was, bit there is still# likely a lot of room for improvement...###sub parseArgs {	if ( defined $args{'view'} && scalar keys %args > 1 ) {		print "Can't pass other args with --view\n";		exit 1;	}	if ( defined $args{'dump-config'} && scalar keys %args > 1 ) {		print "Can't pass other args with --dump-config\n";		exit 1;	}	if ( defined $args{'reset-from-master'} && scalar keys %args > 1 ) {		print "Can't pass other args with --reset-from-master\n";		exit 1;	}	if ( defined $args{'push-all'} ) {		foreach my $arg ( keys %args ) {			if ( $arg eq "interactive" || $arg eq "commit-msg" || $arg eq "push-all" ) {				next;			} else {				print "Can only pass --interactive and --commit-msg with --push-all\n";				exit 1;			}		}	}	if ( defined $args{'configure-local-user'} ) {		if ( scalar keys %args < 2 ) {			print "Must pass either --interactive or --user AND --email to --configure-local-user\n";			exit 1;		}		foreach my $arg ( keys %args ) {			if ( $arg eq "interactive" || $arg eq "user" || $arg eq "email" || $arg eq "configure-local-user" ) {				next;			} else {				print "Must/can only pass --interactive, OR --user AND --email with --configure-local-user\n";				exit 1;			}		}		if ( ! defined $args{'interactive'} && ! defined $args{'user'} || ! defined $args{'interactive'} && ! defined $args{'email'} ) {			print "If not using --interactive with --configure-local-user, --user and --email MUST be defined\n";			exit 1;		}	}	if ( defined $args{'reset-from-upstream'} ) {		if ( scalar keys %args > 2  ) {			print "Can only pass --upstream-url with --reset-from-upstream\n";			exit 1;		}		foreach my $arg ( keys %args ) {			if ( $arg eq "reset-from-upstream" || $arg eq "upstream-url" ) {				next;			} else {				print "Can only pass --upstream-url with --reset-from-upstream\n";				exit 1;			}		}	}}parseArgs();#print "Args parsed successfully\n";#exit 0;# TODO: This sub could be more concise with a sub to print array refsif ( defined $args{'view'} ) {	my ( $untrackedRef, $modifiedRef, $addedRef, $deletedRef ) = returnState($logger);	my $refs = shellex("$gitCmd show-ref",$logger);	my $branch = shellex("$gitCmd show-branch",$logger);	my $name = shellex("$gitCmd config --get user.name",$logger);	chomp $name;	my $email = shellex("$gitCmd config --get user.email",$logger);	chomp $email;	print "-->Username: $name\n-->Email: $email\n";	print "On [branch] @ commit: $branch";	print "$refs\n";	my $swpWarning = "\t# Likely a Vi .swp file";	my $untrackedTotal = scalar @$untrackedRef;	print "* $untrackedTotal untracked file(s):\n";	foreach my $file ( @$untrackedRef ) {		if ( $file =~ m/.swp/ ) {			print "\t$file $swpWarning\n";		} else {			print "\t$file\n";		}	}	my $modifiedTotal = scalar @$modifiedRef;	print "* $modifiedTotal modified file(s):\n";	foreach my $file ( @$modifiedRef ) {		if ( $file =~ m/.swp/ ) {			print "\t$file $swpWarning\n";		} else {			print "\t$file\n";		}	}	my $commitTotal = scalar @$addedRef;	print "* $commitTotal file(s) added to commit:\n";	foreach my $file ( @$addedRef ) {		if ( $file =~ m/.swp/ ) {			print "\t$file $swpWarning\n";		} else {			print "\t$file\n";		}	}	my $deletedTotal = scalar @$deletedRef;	print "* $deletedTotal file(s) to be deleted from commit:\n";	foreach my $file ( @$deletedRef ) {		if ( $file =~ m/.swp/ ) {			print "\t$file $swpWarning\n";		} else {			print "\t$file\n";		}	}}if ( defined $args{'push-all'} ) {	my ( $untrackedRef, $modifiedRef ) = returnState($logger);	my @files;	push(@files,@$untrackedRef); push(@files,@$modifiedRef);	my @filesToCommit;	if ( defined $args{'interactive'} ) {		foreach my $file ( @files ) {			print "Add $file to commit (y/n): ";			my $input = <STDIN>;			chomp $input;			if ( $input =~ m/^Y|^y/ ) {				push(@filesToCommit,$file);			} else {				next;			}		}	} else {		@filesToCommit = @files;	}			print "Commiting the following files:\n";	foreach my $file ( @filesToCommit ) {		print "\t$file\n";	}	if ( defined $args{'interactive'} ) {		print "Does this look correct (y/n) : ";		my $input = <STDIN>;		chomp $input;		if ( $input !~ m/^Y|^y/ ) {			print "Canceling...\n";			exit 1;		}	}		addFiles(\@filesToCommit,$logger);	if ( defined $args{'interactive'} && ! defined $args{'commit-msg'}) {		print "Enter a commit message: ";		my $input = <STDIN>;		chomp $input;		commitChanges($input,$logger);	} elsif ( defined $args{'commit-msg'} ) { 		my $commitMsg = "$args{'commit-msg'}";		commitChanges($commitMsg,$logger);	} else {		my $epoch = time();		my $commitMsg = "Generic Commit at $epoch";		commitChanges($commitMsg,$logger);	}	if ( defined $args{'interactive'} ) {		print "Push changes? (y/n): ";		my $input = <STDIN>;		chomp $input;		if ( $input !~ m/^Y|^y/ ) {			# TODO: Unstage changes?			print "Canceling...\n";			exit 1;		}		my $gitOutput = pushChanges($logger);		print "Git returned:\n$gitOutput";	} else {		pushChanges($logger);		my $gitOutput = pushChanges($logger);		print "Git returned:\n$gitOutput";	}}if ( defined $args{'reset-from-master'} ) {	stashAndReset($logger);}if ( defined $args{'reset-from-upstream'} ) {	if ( defined $args{'upstream-url'} ) {		print "Setting upstream to $args{'upstream-url'}\n";		chomp $args{'upstream-url'};		shellex("$gitCmd remote add upstream $args{'upstream-url'}",$logger);		shellex("$gitCmd fetch upstream",$logger);		resetFromUpstream($logger);	} else {		resetFromUpstream($logger);	}}if ( defined $args{'dump-config'} ) {	my %configHash = readConfig(".",$logger);	foreach my $key ( keys %configHash ) {		my $hRef = $configHash{$key};		print "[$key]\n";		foreach my $ckey ( keys %$hRef ) {			print "\t$ckey = ${$hRef}{$ckey}\n";		}	}}if ( defined $args{'configure-local-user'} ) {	if ( defined $args{'interactive'} ) {		print "Enter user to set: ";		my $desiredName = <STDIN>;		chomp $desiredName;		print "Enter email to set: ";		my $desiredEmail = <STDIN>;		chomp $desiredEmail;		appendRepoUserConfig($desiredName,$desiredEmail,$logger);	} else {		appendRepoUserConfig($args{'user'},$args{'email'},$logger);	}}
 |