Changeset 229

Timestamp:

Mar 25, 2007, 10:16:07 PM (14 years ago)

Author:

Peter Johansson

Message:

Modified behaviour of Configuration. Fixes #114, #115, #116

Location:

trunk

Files:

• bin/Parameter.cc (modified) (7 diffs)
• bin/Parameter.h (modified) (2 diffs)
• bin/svndigest.cc (modified) (4 diffs)
• lib/Configuration.cc (added)
• lib/Configuration.h (added)
• lib/Makefile.am (modified) (2 diffs)

trunk/bin/Parameter.cc

@@ -45 +45 @@
       if (myargv=="-c" || myargv=="--config"){
         if (++i<argc){
-          config_path_= std::string(argv[i]);
+          config_file_= std::string(argv[i]);
           ok=true;
         }
@@ -55 +55 @@
       else if (myargv=="-f" || myargv=="--force"){
           force_=true;
+          ok=true;
+      }
+      else if (myargv=="-g" || myargv=="--generate-config"){
+          generate_config_=true;
           ok=true;
       }
@@ -95 +99 @@
                                  "\nType 'svndigest --help' for usage.");
     }
-
-    std::string home_path = getenv("HOME") + "/.svndigest";
-    if (!node_exist(home_path))
-      mkdir(home_path);
-    if (!node_exist(home_path+"/config"))
-      print_config(home_path+"/config");
-    read_config(config_path_);
 
     analyse();
@@ -137 +134 @@
     if (chdir(workdir.c_str()))
       runtime_error(string("svndigest: Failed to access cwd: ") + workdir);
+
+    if (config_file_.empty())
+      runtime_error(string("svndigest: Parameter --config requires argument."));
+
   }
 
@@ -142 +143 @@
   void Parameter::defaults(void)
   {
-    config_path_ = getenv("HOME")+"/.svndigest/config";
+    config_file_ = getenv("HOME")+"/.svndigest/config";
     copyright_=false;
     force_=false;
+    generate_config_=false;
     revisions_=false;
     root_=".";
@@ -166 +168 @@
               << "\n"
               << "Valid options:\n"
-              << "  -c [--config] arg : path to config file ["
-              << config_path_ << "]\n"
+              << "  --copyright    : update copyright statement\n" 
+              << "  -c [--config] arg : configuration file ["
+              << config_file_ << "]\n"
               << "  -f [--force]   : remove target directory/file if it exists\n"
               << "                   [no force]. NOTE recursive delete.\n"
+              << "  -g [--generate-config] : write configuration file " 
+              << "to standard output and exit\n"
               << "  -h [--help]    : display this help and exit\n"
               << "  -r [--root] arg : svn controlled directory to perform\n"
@@ -184 +189 @@
 
 
-  void Parameter::print_config(std::string path) const
-  {
-    std::ofstream os(path.c_str());
-    if (!os.good()){
-      os.close();
-      throw std::runtime_error("svndigest: error: cannot create file '" + 
-                               path + "': permission denied");
-    }
-    os << "### This file configures various behaviors for svndigest\n"
-       << "### The commented-out below are intended to demonstrate how to use\n" 
-       << "### this file.\n"
-       << "\n"
-       << "### Section for setting aliases used in copyright update\n"
-       << "#[copyright-alias]\n"
-       << "# jdoe = John Doe\n"
-       << std::endl;
-    os.close();
-  }
-
-
-  void Parameter::read_config(std::string path)
-  {
-    if (!node_exist(path))
-      throw std::runtime_error("svndigest: error: configuration file '" + 
-                               path + "' not found");
-    std::ifstream is(path.c_str());
-    if (!is.good()){
-      is.close();
-      throw std::runtime_error("svndigest: error: cannot open file '" + path +
-                               "' for reading");
-    }
-    std::string line;
-    std::string section;
-    std::string tmp;
-    while (getline(is, line)) {
-      line = ltrim(line);
-      if (line.empty() || line[0]=='#')
-        continue;
-      std::stringstream ss(line);
-      if (line[0] == '[') {
-        getline(ss, tmp, '[');
-        getline(ss, section, ']');
-      }
-      else if (section == "copyright-alias"){
-        getline(ss, tmp, '=');
-        std::string key = trim(tmp);
-        getline(ss, tmp);
-        std::string name = trim(tmp);
-        copyright_alias_[key] = name;
-      }
-    }
-    is.close();
-  }
-
-
   void Parameter::version(void) const
   {

trunk/bin/Parameter.h

@@ -36 +36 @@
   public:
     Parameter(const int argc,const char *argv[]);
+    inline std::string config_file(void) const { return config_file_; }
     inline bool copyright(void) const { return copyright_; }
     /// @todo
-    inline const std::map<std::string, std::string>
-    copyright_alias(void) const { return copyright_alias_; }
     inline bool force(void) const { return force_; }
+    inline bool generate_config(void) const { return generate_config_; }
     inline bool revisions(void) const { return revisions_; }
     /// @return absolute path to root directory
@@ -52 +52 @@
     void defaults(void);
     void help(void);
-    void print_config(std::string) const;
-    void read_config(std::string);
     void version(void) const;
 
-    std::string config_path_;
+    std::string config_file_;
     bool copyright_;
-    std::map<std::string, std::string> copyright_alias_;
     bool force_;
+    bool generate_config_;
     bool revisions_;
     std::string root_;

trunk/bin/svndigest.cc

@@ -25 +25 @@
 #include "Parameter.h"
 
+#include "Configuration.h"
 #include "Directory.h"
 #include "GnuplotFE.h"
@@ -43 +44 @@
 {
   using namespace theplu::svndigest;
+
+  // Reading commandline options
   Parameter* option=NULL;
   try {
@@ -52 +55 @@
     std::cerr << e.what() << std::endl;
     exit(-1);
+  }
+  assert(option);
+
+  // Reading configuration file
+  Configuration* config = NULL;
+  if (node_exist(option->config_file())) {
+    std::ifstream is(option->config_file().c_str());
+    if (!is.good()){
+      is.close();
+      std::cerr << "\nsvndigest: Cannot open config file " 
+                << option->config_file() << std::endl; 
+      exit(-1);
+    }
+    config = new Configuration(is);
+    is.close();
+  }
+  else
+    config = new Configuration;
+  assert(config);
+  
+  // write configuration
+  if (option->generate_config()) {
+    std::cout << *config;
+    exit(0);
   }
 
@@ -147 +174 @@
     std::cerr << "svndigest: " << x.what() << std::endl;
   }
-  
+
   if (option->copyright()){
     try {
       if (option->verbose())
         std::cout << "Updating copyright statements" << std::endl;
-      tree.print_copyright(commit_dates, authors, option->copyright_alias());
+      tree.print_copyright(commit_dates, authors, config->copyright_alias());
     }
     catch (const std::runtime_error& x) {

trunk/lib/Makefile.am

@@ -5 +5 @@
 # Copyright (C) 2005 Jari Häkkinen
 # Copyright (C) 2006 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2007 Peter Johansson
 #
 # This file is part of svndigest, http://lev.thep.lu.se/trac/svndigest
@@ -25 +26 @@
 noinst_LTLIBRARIES = libsvndigest.la
 
-noinst_HEADERS = Directory.h File.h Gnuplot.h GnuplotFE.h             \
+noinst_HEADERS = Configuration.h Directory.h File.h Gnuplot.h GnuplotFE.h \
   html_utility.h Node.h Parser.h rmdirhier.h Stats.h SVN.h SVNblame.h \
   SVNinfo.h SVNproperty.h utility.h
 
-libsvndigest_la_SOURCES = Directory.cc File.cc Gnuplot.cc GnuplotFE.cc  \
+libsvndigest_la_SOURCES = Configuration.cc Directory.cc File.cc \
+  Gnuplot.cc GnuplotFE.cc \
   html_utility.cc Node.cc Parser.cc rmdirhier.cc Stats.cc SVN.cc        \
   SVNblame.cc SVNinfo.cc SVNproperty.cc utility.cc