always prefix message with originating host

[bak-git.git] / bak-git-server.pl

diff --git a/bak-git-server.pl b/bak-git-server.pl
index 7fb2ac3..f25e926 100755 (executable)
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -15,6 +15,19 @@ You will want to add following to C<~/.ssh/config>
 
   RemoteForward 9001 localhost:9001
 
+bak command overview:
+
+  bak add /path
+  bak commit [/path [message]]
+  bak diff [host:][/path]
+  bak status [/path]
+  bak log [/path]
+
+  bak ch[anges]
+  bak revert [host:]/path
+
+  bak - push all changed files to server
+
 =cut
 
 use warnings;
@@ -33,12 +46,12 @@ GetOptions(
 ) || die "$!\n";
 
 my ( $dir, $server_ip ) = @ARGV;
-die "usage: $0 /backup/directory\n" unless $dir;
+die "usage: $0 /backup/directory 127.0.0.1\n" unless $dir;
 $server_ip ||= '127.0.0.1';
 
 my $shell_client = <<__SHELL_CLIENT__;
 #!/bin/sh
-echo `hostname -s` `pwd` \$* | nc $server_ip 9001
+echo \$USER/\$SUDO_USER `hostname -s` `pwd` \$* | nc $server_ip 9001
 __SHELL_CLIENT__
 
 chdir $dir;
@@ -57,7 +70,7 @@ if ( $upgrade || $install ) {
                warn "install on $hostname\n";
                system 'ssh-copy-id', "root\@$hostname" if ! -d $hostname;
                system "scp /tmp/bak root\@$hostname:/usr/local/bin/";
-               system "ssh root\@$hostname apt-get install rsync";
+               system "ssh root\@$hostname apt-get install -y rsync";
        }
 }
 
@@ -74,36 +87,70 @@ warn "dir: $dir listen: $server_ip:9001\n"
        , $shell_client
 ;
 
-while (my $client = $server->accept()) {
-       my ($hostname,$pwd,$command,$path,$message) = split(/\s+/,<$client>,5);
+sub pull_changes {
+       my $hostname = shift;
+       system "find $hostname -type f | sed 's,$hostname,,' > /tmp/$hostname.list";
+       system "rsync -avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/"
+}
 
-       $message ||= '';
-       $path = "$pwd/$path" unless $path =~ m{^/};
+while (my $client = $server->accept()) {
+       my $line = <$client>;
+       chomp($line);
+       warn "<<< $line\n";
+       my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
 
-       warn "$hostname [$command] $path | $message\n";
+       my $on_host = $1 if $rel_path =~ s/^([^:]+):(.+)$/$2/ && -e $1;
+       my $path = $rel_path =~ m{^/} ? $rel_path : "$pwd/$rel_path";
 
+       warn "$hostname [$command] $on_host:$path | $message\n";
+       $message ||= "$path [$command]";
+       $message = "$hostname: $message";
 
        my $dir = $path;
        $dir =~ s{/[^/]+$}{};
 
-       mkpath "$hostname/$dir" unless -e "$hostname/$dir";
+       my $backup_path = -e "$hostname/$path" ? "$hostname/$path" : $hostname;
+
+       sub git {
+               my $args = join(' ',@_);
+               warn "# git $args\n";
+               my $out = `git $args`;
+               warn "$out\n# [", length($out), " bytes]\n" if defined $out;
+               return $out;
+       }
 
        if ( ! $command ) {
-               system "find $hostname -type f | sed 's,$hostname,,' > /tmp/$hostname.list";
-               system "rsync -avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/"
+               pull_changes $hostname;
        } elsif ( $command eq 'add' ) {
+               mkpath "$hostname/$dir" unless -e "$hostname/$dir";
                system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path";
-               system 'git', 'add', "$hostname/$path";
+               print $client git 'add', "$hostname/$path";
        } elsif ( $command eq 'commit' ) {
-               system 'rsync', '-avv', "root\@$hostname:$path", "$hostname/$path" if $path;
-               $message ||= "$command $hostname $path";
-               system 'git', 'commit', '-m', $message, "$hostname/$path";
-       } elsif ( $command =~ m{(diff|status|log)} ) {
-               my $opt = '--summary' if $command eq 'log';
-               print $client `git $command $opt $hostname`;
+               pull_changes $hostname;
+               $message =~ s/'/\\'/g;
+               $user =~ s/\/$//;
+               print $client git( "commit -m '$message' --author '$user <$hostname>' $backup_path" );
+       } elsif ( $command =~ m{(diff|status|log|ch)} ) {
+               $command .= ' --stat' if $command eq 'log';
+               $command = 'log --patch-with-stat' if $command =~ m/^ch/;
+               pull_changes $hostname if $command eq 'diff';
+               if ( $on_host ) {
+                       system 'rsync', '-avv', "root\@$on_host:$path", "$on_host/$path";
+                       open(my $diff, '-|', "diff -Nuw $hostname$path $on_host$path");
+                       while(<$diff>) {
+                               print $client $_;
+                       }
+               } else {
+                       # commands without path will show host-wide status/changes
+                       print $client git($command, $rel_path ? $backup_path : $hostname);
+               }
        } elsif ( $command eq 'revert' ) {
-               print $client `git checkout -- $hostname/$path`;
-               system 'rsync', '-avv', "$hostname/$path", "root\@$hostname:$path";
+               if ( $on_host ) {
+                       system 'rsync', '-avv', "$on_host/$path", "root\@$hostname:$path";
+               } else {
+                       print $client git "checkout -- $hostname/$path";
+                       system 'rsync', '-avv', "$hostname/$path", "root\@$hostname:$path";
+               }
        } else {
                print $client "Unknown command: $command\n";
        }