Changeset 214 for trunk

Timestamp:

Jul 3, 2007, 2:10:55 PM (17 years ago)

Author:

joergs

Message:

improvements, bugfixes

Location:

trunk/dasscm

Files:

• . (modified) (1 prop)
• SOURCES (modified) (1 diff)
• dasscm (modified) (13 diffs)
• dasscm.conf (modified) (1 prop)
• dasscm.spec (modified) (3 diffs, 1 prop)
• doc/KonfigurationsManagement.txt (deleted)
• doc/README (moved) (moved from trunk/dasscm/README )
• doc/dasscm_howto.txt (modified) (2 diffs, 1 prop)
• servers.dass-it (modified) (1 prop)

trunk/dasscm/SOURCES

@@ -1 +1 @@
 dasscm
 dasscm_dumpperm
-README
 Changes
 servers.dass-it
 dasscm.conf
+doc

trunk/dasscm/dasscm

@@ -8 +8 @@
   qw($DASSCM_PROD $DASSCM_REPO $USER $DASSCM_USERNAME $DASSCM_USER $DASSCM_PASSWORD);
 use Cwd;
-use POSIX qw/getpgrp tcgetpgrp/;
-use Term::ReadKey;
+use Getopt::Long;
 use File::Basename;
 use File::Compare;
@@ -16 +15 @@
 use File::stat;
 use File::Path;
-use Getopt::Long;
+use Term::ReadKey;
 
 #
@@ -30 +29 @@
 
 my $config_file = "/etc/dasscm.conf";
-
-# my $config = SmartClient::Config->( $config_file );
-my $config = ConfigFile::read_config_file($config_file);
+my $config      = ConfigFile::read_config_file($config_file);
 my $DASSCM_LOCAL_REPOSITORY_BASE;
 my $DASSCM_REPOSITORY_NAME;
@@ -69 +66 @@
     print "   add <filename>\n";
     print "   commit <filename>\n";
+    print "   status <filename>\n";
     print "   diff <filename>\n";
     print "   help <subcommand>\n";
@@ -76 +74 @@
     print
       "svn checkout --no-auth-cache --username USERNAME https://dass-it.de/svn/dasscm/HOSTNAME\n";
-    print "environment variables\n", "    DASSCM_REPO\n", "    DASSCM_PROD¸n",
+    print "environment variables\n", "    DASSCM_REPO\n", "    DASSCM_PROD\n",
       "    DASSCM_USERNAME\n", "    DASSCM_PASSWORD\n", "are evaluated.\n";
     print "\n";
@@ -174 +172 @@
     my $basename = basename($filename_prod);
 
-    print "dir: " . $dirname_prod . "\n";
-    print "fn: " . $basename . "\n";
+    if ($verbose) {
+        print "dir: " . $dirname_prod . "\n";
+        print "fn: " . $basename . "\n";
+    }
 
     my $dirname_repo  = $DASSCM_REPO . "/" . $dirname_prod;
@@ -301 +301 @@
     } else {
         print "help for @_: ...\n";
+        usage();
     }
 }
@@ -309 +310 @@
     check_env();
 
-    my $output_username = "";
-    if ($DASSCM_USERNAME) {
-        $output_username = " ($DASSCM_USERNAME)";
-    }
-
-    print "Enter DASSCM user name", $output_username, ": ";
-    my $input_username = <STDIN>;
-    chomp($input_username);
+    my $input_username = $1;
+
+    if ( not $input_username ) {
+        my $output_username = "";
+        if ($DASSCM_USERNAME) {
+            $output_username = " ($DASSCM_USERNAME)";
+        }
+
+        print "Enter DASSCM user name", $output_username, ": ";
+        $input_username = <STDIN>;
+        chomp($input_username);
+    }
 
     # hidden password input
@@ -530 +535 @@
 
     # get command line options and store them in options hash
-    my $result = GetOptions( \%options, 'message=s' );
+    my $result = GetOptions( \%options, 'verbose', 'message=s' );
 
     # print options
@@ -537 +542 @@
     }
 
+    # set verbose to command line option
+    $verbose = $options{'verbose'};
+
+    #
+    # action accordinly to command are taken
+    # $command is rewritten in standard format,
+    # so we can test for it later on more simply
+    #
     $_ = $command;
     if (m/help/i) {
@@ -547 +560 @@
         init(@ARGV);
     } elsif (m/add/i) {
-        ## rewrite command
         $command = "add";
         add(@ARGV);
@@ -562 +574 @@
         $command = "status";
         status(@ARGV);
-    } elsif (m/activate/i) {
-        ## TODO
-        activate(@ARGV);
+
+        #     } elsif (m/activate/i) {
+        #         ## TODO
+        #         activate(@ARGV);
     } else {
         usage();
@@ -574 +587 @@
     # commitall
     # revert
-    # status (chkconf)
-}
+}

trunk/dasscm/dasscm.spec

@@ -6 +6 @@
 # package are under the same license as the package itself.
 #
-# $Id: sc_base.spec 2323 2004-08-15 09:59:15Z joergs $
+# $Id$
 
-# neededforbuild  
-# usedforbuild gzip pam-modules tar
-
-Name:         dasscm
-URL:          http://www.dass-it.de/
-License:      GPL
-Group:        Development/Tools/Version Control
-Autoreqprov:  on
-Summary:      dass configuration file management tool
-Version:      0.7
-Release:      0
-Requires:     subversion perl perl-TermReadKey perl-libconfigfile
-Source:       %{name}-%{version}.tar.bz2
-BuildRoot:    /var/tmp/%{name}-build
-BuildArch:    noarch
+Name:           dasscm
+URL:            http://www.dass-it.de/
+License:        GPL
+Group:          Development/Tools/Version Control
+Autoreqprov:    on
+Summary:        dass configuration file management tool
+Version:        0.7
+Release:        0
+Requires:       subversion perl perl-TermReadKey perl-libconfigfile
+Source:         %{name}-%{version}.tar.bz2
+BuildRoot:      /var/tmp/%{name}-build
+BuildArch:      noarch
+BuildRequires:  gzip pam-modules tar
 
 
 %description
-tools for handling configurations file with subversion
+tools for handling configuration files with subversion
 
 Authors:
@@ -46 +44 @@
 install servers.dass-it $RPM_BUILD_ROOT/etc/subversion/
 install -m 640 dasscm.conf $RPM_BUILD_ROOT/etc/
+mkdir -p $RPM_BUILD_ROOT/var/lib/dasscm/
 
 
@@ -55 +54 @@
 %files
 %defattr(-,root,root)
+%dir /var/lib/dasscm/
 /usr/bin/dasscm*
 /etc/subversion/servers.dass-it
 %config(noreplace) /etc/dasscm.conf
-%doc Changes README
+%doc Changes doc/

trunk/dasscm/doc/dasscm_howto.txt

@@ -1 @@
-Beispiel:
-- Benutzer: joergs
-- arbeiten als Benutzer: root
-- Subversion Read-Only Benutzer: lvermgeo
-- neuer Rechner: lxkatest
 
 
-*** neuen Rechner hinzufügen (einmalig pro Rechner):
-ggf. dasscm RPM installieren
+dasscm:
+Kurzbeschreibung der Einrichtung und Nutzung von dasscm
+
+$Id$
+
+*** neuen Rechner hinzufügen (einmalig pro Rechner)
+
+dasscm RPM installieren
 cd /etc/subversion/
-ln -s servers.dass-it servers  ; # oder Einstellungen manuell übertragen
-mkdir /root/svn/joergs
-cd /root/svn/joergs
-svn checkout --username lvermgeo https://dass-it.de/svn/lvermgeo/technical/config
-(ggf. Abzeptieren des Subversion Servers und Eingabe des Passwortes für lvermgeo)
-cd /root/svn/joergs/config/server
-svn mkdir lxkatest
-svn commit --no-auth-cache --username joergs -m "Konfigurationsverzeichnis für den Rechner lxkatest" 
+ln -s servers.dass-it servers  ; # oder /etc/subversion/servers manuell anpassen
+Unique Client Namen ermitteln, normalerweise `hostname -f`
+/etc/dasscm.conf anpassen
+# Subversion Verzeichnis auf dem Server erstellen, z.B.
+svn mkdir --no-auth-cache https://dass-it.de/svn/dasscm/config/<FQHOSTNAME>
+dasscm init
 
 
 
 *** Vorbereitung (pro Login)
-export DASSCM_USER=joergs
-export DASSCM_REPO=/root/svn/joergs
 
-ggf. Festlegung, welche Editor für die Angabe von Checkin Kommentaren verwendet werden soll. Standard ist vi
-export EDITOR=joe
+dasscm login
 
 
 
 *** Datei erstmalig anpassen und einpflegen
+
 cd /etc/sysconfig
 cp -a cups cups.orig ; #(falls cups.orig nicht schon existiert)
@@ -38 +35 @@
 
 
-*** modifizierte Datei einpflegen:
+*** modifizierte Datei einpflegen
+
 dasscm commit -m "Kommentar zu meinen Anpassungen" /etc/sysconfig/cups
+
+
+
+*** Status überprüfen 
+# ermittelt, welche Dateien sich zwischenzeitlich auf dem System verändert haben
+dasscm status