Changeset 893

Timestamp:

Jun 26, 2010, 2:13:20 PM (15 years ago)

Author:

joergs

Message:

better option handling

File:

• dasscm/trunk/usr/bin/dasscm (modified) (9 diffs)

dasscm/trunk/usr/bin/dasscm

@@ -41 +41 @@
 
 my %COMMANDS = (
-    '--help'            => 'help',
     'help'              => 'help',
     'login'             => 'login',
@@ -105 +104 @@
         'desc'     => [],
         'params'   => ["PATH_PROD"],
+        'options'  => [ 'verbose', 'message=s' ],
         'require'  => ["WRITE"],
         'function' => \&add
@@ -111 +111 @@
         'desc'     => [],
         'params'   => ["PATH_REPO"],
+        'options'  => [ 'verbose', 'message=s' ],
         'require'  => ["WRITE"],
         'function' => \&commit
@@ -432 +433 @@
 }
 
+sub get_command_possible_options( $ )
+{
+    my $command = get_command_uniform_name( $_[0] );
+    my @params  = ();
+    if ( $command && defined( $COMMAND_DEFINITIONS{$command}{'options'} ) ) {
+        @params = @{ $COMMAND_DEFINITIONS{$command}{'options'} };
+    }
+    return @params;
+}
+
 sub get_command_requirements( $ )
 {
@@ -994 +1005 @@
 sub help(;@)
 {
-    if ( @_ == 0 ) {
+    if ( not @_ ) {
         usage();
     } else {
-        print "help for @_: ...\n";
+        print "help for ", join( " ", @_ ), ": ...\n";
         usage();
     }
@@ -1562 +1573 @@
     my @input            = @_;
 
+    # TODO: check global options
+
     if ( $number_arguments <= 1 ) {
 
         # complete dasscm commands
         my $input = $input[0] || "";
-        foreach my $i ( keys %COMMANDS ) {
-            $_ = $i;
-            if (m/^$input/) {
-
-                #my $command = get_command_uniform_name($i);
-                #print $command, "\n";
-                print $i, "\n";
-            }
-        }
+        map { m/^$input/ && print $_, "\n" } ( keys %COMMANDS );
     } else {
 
@@ -1659 +1664 @@
 my $number_arguments = @ARGV;
 
+# global options
+# stops at first non-option
+Getopt::Long::Configure( 'require_order' );
+if( not GetOptions( \%options, 'help', 'verbose' ) ) {
+    usage();
+    exit $RETURN_NOK;
+}
+
+# set verbose to command line option
+$verbose = $options{'verbose'};
+
+if( $options{'help'} ) {
+    help(@ARGV);
+    exit;
+}
+
 # get subcommand and remove it from @ARGV
 if( defined( $ARGV[0] ) ) {
@@ -1664 +1685 @@
     shift @ARGV;
 }
+
 if( not defined($command) ) {
         usage();
-        $return_code = $RETURN_NOK;
-} else {
-    $DASSCM_LOCAL_REPOSITORY_BASE = $config->{'DASSCM_LOCAL_REPOSITORY_BASE'};
-    $DASSCM_REPOSITORY_NAME       = $config->{'DASSCM_REPOSITORY_NAME'};
-
-    # TODO: check variables
-    $DASSCM_SVN_REPOSITORY =
-      $config->{'DASSCM_SVN_REPOSITORY_BASE'} . "/" . $DASSCM_REPOSITORY_NAME;
-
-    $DASSCM_CHECKOUT_USERNAME = $config->{'DASSCM_CHECKOUT_USERNAME'};
-    $DASSCM_CHECKOUT_PASSWORD = $config->{'DASSCM_CHECKOUT_PASSWORD'};
-
-    #
-    # if a user is given by dasscm configuration file, we use it.
-    # Otherwise we expect that read-only account is configured
-    # as local subversion configuration.
-    # If this is also not the case,
-    # user is required to type username and password.
-    # This will be stored as local subversion configuration thereafter.
-    #
-    if ( $DASSCM_CHECKOUT_USERNAME && $DASSCM_CHECKOUT_PASSWORD ) {
-        $svnCheckoutCredentials =
-          " --username $DASSCM_CHECKOUT_USERNAME --password $DASSCM_CHECKOUT_PASSWORD ";
-    }
-
-    $DASSCM_PERMISSION_FILE = $config->{'DASSCM_PERMISSION_FILE'}
-      || "/etc/permissions.d/dasscm.permission_backup";
-
+        exit $RETURN_NOK;
+}
+
+$DASSCM_LOCAL_REPOSITORY_BASE = $config->{'DASSCM_LOCAL_REPOSITORY_BASE'};
+$DASSCM_REPOSITORY_NAME       = $config->{'DASSCM_REPOSITORY_NAME'};
+
+# TODO: check variables
+$DASSCM_SVN_REPOSITORY =
+    $config->{'DASSCM_SVN_REPOSITORY_BASE'} . "/" . $DASSCM_REPOSITORY_NAME;
+
+$DASSCM_CHECKOUT_USERNAME = $config->{'DASSCM_CHECKOUT_USERNAME'};
+$DASSCM_CHECKOUT_PASSWORD = $config->{'DASSCM_CHECKOUT_PASSWORD'};
+
+#
+# if a user is given by dasscm configuration file, we use it.
+# Otherwise we expect that read-only account is configured
+# as local subversion configuration.
+# If this is also not the case,
+# user is required to type username and password.
+# This will be stored as local subversion configuration thereafter.
+#
+if ( $DASSCM_CHECKOUT_USERNAME && $DASSCM_CHECKOUT_PASSWORD ) {
+    $svnCheckoutCredentials =
+        " --username $DASSCM_CHECKOUT_USERNAME --password $DASSCM_CHECKOUT_PASSWORD ";
+}
+
+$DASSCM_PERMISSION_FILE = $config->{'DASSCM_PERMISSION_FILE'}
+    || "/etc/permissions.d/dasscm.permission_backup";
+
+# check for command options
+my @cmd_options = get_command_possible_options( $command );
+if( @cmd_options ) {
     # get command line options and store them in options hash
-    my $result = GetOptions( \%options, 'verbose', 'message=s' );
+    my $result = GetOptions( \%options, @cmd_options );
 
     # print options
@@ -1701 +1727 @@
         print "${option}: $options{$option}\n";
     }
-
-    # set verbose to command line option
-    $verbose = $options{'verbose'};
-
-    #
-    # action accordinly to command are taken
-    #
-    &{ get_command_function($command) }(@ARGV);
-}
+}
+
+#
+# action accordinly to command are taken
+#
+&{ get_command_function($command) }(@ARGV);
 
 exit $return_code;