Changeset 916 for dasscm

Timestamp:

Jul 18, 2010, 9:20:40 PM (14 years ago)

Author:

joergs

Message:

added plugin support

Location:

dasscm/trunk

Files:

• dasscm.spec (modified) (3 diffs)
• etc/dasscm.conf (modified) (1 diff)
• usr/bin/dasscm (modified) (11 diffs)

dasscm/trunk/dasscm.spec

@@ -12 +12 @@
 Autoreqprov:    on
 Summary:        Dass Configuration Management
-Version:        1.0
+Version:        1.1
 Release:        0
 Requires:       subversion perl
@@ -56 +56 @@
 install -m 640 etc/dasscm.conf $RPM_BUILD_ROOT/etc/
 mkdir -p $RPM_BUILD_ROOT/var/lib/dasscm/
+mkdir -p $RPM_BUILD_ROOT/var/lib/dasscm/plugin-results/
 %if %(test -d /etc/bash_completion.d/ && echo 1 || echo 0)
     %define use_bash_completion 1
@@ -80 +81 @@
 %defattr(-,root,root)
 %dir /var/lib/dasscm/
+%dir /var/lib/dasscm/plugin-results/
 /usr/bin/dasscm
 /usr/bin/dasscm_remote_update.sh

dasscm/trunk/etc/dasscm.conf

@@ -37 +37 @@
 # 
 DASSCM_PERMISSION_FILE="/etc/permissions.d/dasscm.permission_backup"
+
+#
+# plugin definitions
+#
+DASSCM_PLUGIN_TEST_RPMLIST="type rpm && test /var/lib/rpm/Packages -nt /var/lib/dasscm/plugin-results/RPMLIST"
+DASSCM_PLUGIN_CMD_RPMLIST="rpm -qa --last"

dasscm/trunk/usr/bin/dasscm

@@ -64 +64 @@
     'complete_path'     => 'complete_path',
     'complete_repopath' => 'complete_repopath',
+    'plugins'           => 'plugins',
 );
 
@@ -185 +186 @@
         'function' => \&complete_repopath
     },
+    'plugins' => {
+        'desc'     => ["internal, perform plugins"],
+        'params'   => [],
+        'function' => \&perform_plugins
+    },
+
 );
 
@@ -190 +197 @@
 my $DASSCM_LOCAL_REPOSITORY_BASE;
 my $DASSCM_REPOSITORY_NAME;
+my $DASSCM_PLUGIN_RESULTS_PATH;
 my $DASSCM_SVN_REPOSITORY;
 my $DASSCM_CHECKOUT_USERNAME;
@@ -360 +368 @@
     if ( $command ne "init" ) {
         if ( not -d $DASSCM_REPO ) {
-            die
-              "Can't access local repository DASSCM_REPO\n($DASSCM_REPO)\nCheck configuration and execute\n    dasscm init\n";
+            fatalerror(
+              "Can't access local repository DASSCM_REPO",
+              "($DASSCM_REPO)",
+              "Check configuration and execute",
+              "dasscm init"
+            );
         }
 
@@ -705 +717 @@
 }
 
+#
+# en- or disable echo mode.
+# used for reading passwords from STDIN
+#
+sub setEchoMode( $ )
+{
+    my $mode = shift;
+    if( $mode ) {
+        run_command( "stty echo" );
+    } else {
+        run_command( "stty -echo" );
+    }
+}
+
+
+sub write_array_to_file( $@ )
+{
+    my $filename = shift;
+    my @array = @_;
+
+    if ( ! -w dirname($filename) ) {
+        warning( "failed to write to $filename", "directory does not exist" );
+        return;
+    }
+
+    # directory exists => write
+    if( ! open( OUTFILE, ">$filename" ) ) {
+        warning( "failed to open $filename: $!" );
+        return;
+    }
+
+    foreach my $line (@array) {
+        print OUTFILE "$line";
+    }
+    close(OUTFILE);
+
+    return 1;
+}
+
+
+sub perform_plugins()
+{
+    check_env();
+
+    my @plugin_results = ();
+
+    # get all defined plugins.
+    # Plugin definitions starting with DASSCM_PLUGIN_
+    my @plugins = grep(/^DASSCM_PLUGIN_CMD_/,  keys( %{$config} ));
+
+    for my $plugin (@plugins) {
+        my $plugin_name = substr( $plugin, length( "DASSCM_PLUGIN_CMD_" ) );
+        my $plugin_test = $config->{'DASSCM_PLUGIN_TEST_' . $plugin_name};
+        ( my $rc_test, my @result_test ) = run_command( $plugin_test );
+        if ($verbose) { print "Plugin $plugin_name: "; }
+        if( $rc_test != 0 ) {
+            if ($verbose) { print "skipped\n"; }
+        } else {
+            if ($verbose) { print "$config->{$plugin}\n"; }
+            ( my $rc, my @result ) = run_command( $config->{$plugin} );
+            if( $rc != 0 ) {
+                warning( "failed to run plugin $plugin" );
+            } else {
+                my $plugin_result_file = $DASSCM_PLUGIN_RESULTS_PATH . "/" . $plugin_name;
+                write_array_to_file( $plugin_result_file, @result );
+                push @plugin_results, $plugin_result_file;
+            }
+        }
+    }
+    return @plugin_results;
+}
+
+
+
 sub svn_check_credentials( $$;$$ )
 {
@@ -1053 +1139 @@
 
     # hidden password input
-    print "Enter password stty for $input_username: ";
-    #ReadMode('noecho');
-    `stty -echo`;
+    print "Enter password for $input_username: ";
+    setEchoMode( 0 );
     my $input_password = <STDIN>;
-    #ReadMode('normal');
-    `stty echo`;
+    setEchoMode( 1 );
     chomp($input_password);
     print "\n";
@@ -1218 +1302 @@
     add_helper($DASSCM_PERMISSION_FILE);
 
+    for my $file ( perform_plugins() ) {
+        add_helper($file);
+    }
+
+
     if ( $options{'message'} ) {
         $svnOptions .= " --message \"$options{'message'}\" ";
@@ -1278 +1367 @@
     # add permissions file
     add_helper($DASSCM_PERMISSION_FILE);
+
+    for my $file ( perform_plugins() ) {
+        add_helper($file);
+    }
+
+
 
     if ( $options{'message'} ) {
@@ -1433 +1528 @@
     # check, if permissions have changed
     permissions();
+    perform_plugins();
 
     # get modified files
@@ -1479 +1575 @@
     # check, if permissions have changed
     permissions();
+    perform_plugins();
 
     # get modified files
@@ -1737 +1834 @@
 $DASSCM_REPOSITORY_NAME       = $config->{'DASSCM_REPOSITORY_NAME'};
 
+$DASSCM_PLUGIN_RESULTS_PATH = $config->{'DASSCM_LOCAL_REPOSITORY_BASE'} . "/" . "plugin-results/";
+
 # TODO: check variables
 $DASSCM_SVN_REPOSITORY =