Changeset 1015 for trunk

Timestamp:

Jan 9, 2010, 3:16:03 PM (14 years ago)

Author:

Peter Johansson

Message:

closes #438. adding an option --format

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• bin/Parameter.cc (modified) (3 diffs)
• bin/Parameter.h (modified) (2 diffs)
• bin/svndigest.cc (modified) (3 diffs)
• lib/Configuration.cc (modified) (2 diffs)
• lib/Configuration.h (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/cmd_format_test.sh (added)
• test/config2_test.sh (modified) (1 diff)
• test/repo_test.sh (modified) (1 diff)

trunk/NEWS

@@ -5 +5 @@
 Version 0.8 (released NOT YET)
   - Gnuplot replaced with plplot (ticket:97)
+  - new option --format (ticket:438)
   - new configure option --with-plplot
   - new default codon for `*.as` in config file

trunk/bin/Parameter.cc

@@ -63 +63 @@
                     std::string("ignore cache files and analyze ") +
                     std::string("everything from repository")),
+      format_(cmd_,"format", "override image format defined in config file"),
       report_(cmd_, "report", "create no HTML report", true),
       revisions_(cmd_, "revisions", 
@@ -219 +220 @@
 
 
+  const yat::utility::OptionArg<std::string>& 
+  Parameter::format(void) const
+  {
+    return format_;
+  }
+
+
   void Parameter::init(void)
   {
@@ -224 +232 @@
     cmd_.program_name() = PACKAGE_NAME;
     config_file_.print_arg("=FILE");
+    format_.print_arg("=FMT");
     root_.print_arg("=ROOT");
     target_.print_arg("=TARGET");

trunk/bin/Parameter.h

@@ -55 +55 @@
     bool generate_config(void) const ;
     bool ignore_cache(void) const;
+    const yat::utility::OptionArg<std::string>& format(void) const;
     bool report(void) const;
     bool revisions(void) const;
@@ -81 +82 @@
     yat::utility::OptionHelp help_;
     yat::utility::OptionSwitch ignore_cache_;
+    yat::utility::OptionArg<std::string> format_;
     yat::utility::OptionSwitch report_;
     yat::utility::OptionSwitch revisions_;

trunk/bin/svndigest.cc

@@ -37 +37 @@
 
 #include "yat/Exception.h"
+#include "yat/OptionArg.h"
 
 #include <cassert>
@@ -81 +82 @@
       config.load(is);
     }
-    catch (std::runtime_error e) {
+    catch (std::runtime_error& e) {
       std::cerr << "svndigest: invalid config file\n"
                 << e.what() << std::endl;
@@ -87 +88 @@
     }
     is.close();
+  }
+
+  // set values from commandline into config object
+  try {
+    if (option->format().present()) 
+      Configuration::instance().image_format(option->format().value());
+  }
+  catch (std::runtime_error& e) {
+    std::cerr << PACKAGE_NAME ": invalid argument `" 
+              << option->format().value() << "' for `--" 
+              << option->format().long_name() << "'\n"
+              << e.what() << "\n"
+              << "Try `" << PACKAGE_NAME << " --help' for more information.\n"; 
+    exit(EXIT_FAILURE);
   }
   

trunk/lib/Configuration.cc

@@ -297 +297 @@
       else if (section == "image") {
         if (lhs == "format") {
-          if (rhs!="none" && rhs!="png" && rhs!="svg") {
-            throw Config_error(line, "unknown format: " + rhs);
+          try {
+            image_format(rhs);
           }
-          image_format_ = rhs;
+          catch (std::runtime_error e) {
+            throw Config_error(line, 
+                               "unknown format: " + rhs + "\n" + e.what());
+          }
         }
         else if (lhs == "image_format") {
@@ -311 +314 @@
     }
     validate_dictionary();
+  }
+
+
+  void Configuration::image_format(const std::string& format)
+  {
+    if (format!="none" && format!="png" && format!="svg") {
+      std::ostringstream oss;
+      oss << "Valid arguments are:\n"
+          << "  - `none'\n"
+          << "  - `png'\n"
+          << "  - `svg'";
+      throw std::runtime_error(oss.str());
+    }
+    image_format_ = format;
   }
 

trunk/lib/Configuration.h

@@ -80 +80 @@
      */
     const std::string& image_format(void) const;
+
+    /**
+       \brief set image_format
+     */
+    void image_format(const std::string&);
 
     /// 

trunk/test/Makefile.am

@@ -28 +28 @@
 
 distributed_TESTS =
+distributed_TESTS += cmd_format_test.sh
 distributed_TESTS += config2_test.sh
 distributed_TESTS += copyright2_test.sh

trunk/test/config2_test.sh

@@ -29 +29 @@
 $SVNDIGEST -g --config-file $srcdir/../.svndigest/config || exit_fail
 
+cat > tmp_config <<EOF
+#
+[image]
+format = apple
+EOF
+
+$SVNDIGEST -g --config-file tmp_config 2> tmp_stderr && exit_fail
+grep 'unknown format.* apple' tmp_stderr || exit_fail
+rm -f tmp_stderr tmp_config
 exit_success

trunk/test/repo_test.sh

@@ -25 +25 @@
 . ./init.sh || exit 1
 
-$mkdir_p $targetdir;
-
 $SVNDIGEST -r $rootdir -t $targetdir --ignore-cache --no-report || exit_fail;