Changeset 1220

Timestamp:

Oct 13, 2010, 6:10:52 AM (13 years ago)

Author:

Peter Johansson

Message:

closes #480. Quote files with 'file' (same style as subversion). Add a test to check output of some failures and use variable GREP rather than hardcoding grep.

Location:

trunk

Files:

• bin/Parameter.cc (modified) (5 diffs)
• bin/svndigestParameter.cc (modified) (3 diffs)
• lib/File.cc (modified) (2 diffs)
• lib/Node.cc (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/cmd_format_test.sh (modified) (1 diff)
• test/config2_test.sh (modified) (1 diff)
• test/config3_test.sh (modified) (1 diff)
• test/error_test.sh (added)
• test/init.sh.in (modified) (1 diff)
• test/svncopyright_test.sh (modified) (1 diff)

trunk/bin/Parameter.cc

@@ -97 +97 @@
       check_existence(root_.value());
       check_readable(root_.value());
+      check_is_dir(root_.value());
       chdir(root_.value());
       root_.value(pwd());
@@ -116 +117 @@
       if (S_ISDIR(nodestat.st_mode)) {
         std::stringstream ss;
-        ss << cmd_.program_name() << ": `" << config_file_.value() 
+        ss << cmd_.program_name() << ": '" << config_file_.value() 
            << "' is a directory";
         throw yat::utility::cmd_error(ss.str());
@@ -130 +131 @@
       return;
     std::stringstream ss;
-    ss << cmd_.program_name() << ": cannot stat `" << path << "': " 
+    ss << cmd_.program_name() << ": cannot stat '" << path << "': " 
        << strerror(errno);
     throw yat::utility::cmd_error(ss.str());
@@ -136 +137 @@
 
   
+  void Parameter::check_is_dir(std::string path) const
+  {
+    if (node_exist(path)) {
+      struct stat buf;
+      stat(path.c_str(), &buf);
+      if (S_ISDIR(buf.st_mode))
+        return;
+    }
+    std::stringstream ss;
+    ss << cmd_.program_name() << ": '" << path << "': " 
+       << strerror(errno);
+    throw yat::utility::cmd_error(ss.str());
+  }
+
+  
   void Parameter::check_readable(std::string path) const
   {
@@ -141 +157 @@
       return;
     std::stringstream ss;
-    ss << cmd_.program_name() << ": cannot open `" << path << "': " 
+    ss << cmd_.program_name() << ": cannot open '" << path << "': " 
        << strerror(errno);
     throw yat::utility::cmd_error(ss.str());

trunk/bin/svndigestParameter.cc

@@ -85 +85 @@
     std::string save_wd = pwd();
 
-    // check root but not if -g option given
     if (!generate_config()) {
       // check target (only if we write report)
@@ -91 +90 @@
         check_existence(target_.value());
         check_readable(target_.value());
+        check_is_dir(target_.value());
         std::string base_root = file_name(root());
         std::string path = concatenate_path(target_.value(),base_root); 
         if (access_rights(target_.value(), "w")) {
           std::stringstream ss;
-          ss << "svndigest: cannot create directory `" << path 
+          ss << "svndigest: cannot create directory '" << path 
              << "': " << strerror(errno);
           throw yat::utility::cmd_error(ss.str());
@@ -101 +101 @@
         if (node_exist(path) && !force()) {
           std::stringstream ss;
-          ss << "svndigest: cannot create directory `" << path << "' "
+          ss << "svndigest: cannot create directory '" << path << "' "
              << strerror(EEXIST);
           throw yat::utility::cmd_error(ss.str());

trunk/lib/File.cc

@@ -205 +205 @@
   {
     if (verbose)
-      std::cout << "Parsing " << path_ << std::endl; 
+      std::cout << "Parsing '" << path_ << "'" << std::endl; 
     stats_.reset();
     std::string cache_dir = directory_name(path()) + std::string(".svndigest/"); 
@@ -343 +343 @@
       return;
     if (verbose)
-      std::cout << "Updating copyright in " << path_ << std::endl; 
+      std::cout << "Updating copyright in '" << path_ << "'" << std::endl; 
     update_copyright(new_block, start_line, end_line);
   }

trunk/lib/Node.cc

@@ -203 +203 @@
       return;
     if (verbose)
-      std::cout << "Printing output for " << path_ << std::endl;
+      std::cout << "Printing output for '" << path_ << "'" << std::endl;
     const SVNlog& log = this->log();
     typedef std::map<std::string, Stats*>::const_iterator iter;

trunk/test/Makefile.am

@@ -39 +39 @@
 distributed_TESTS += config3_test.sh
 distributed_TESTS += copyright2_test.sh
+distributed_TESTS += error_test.sh
 distributed_TESTS += repo_status_test.sh
 distributed_TESTS += repo_test.sh

trunk/test/cmd_format_test.sh

@@ -27 +27 @@
 SVNDIGEST_run 1 -f --format=banana
 test -s stderr || exit_fail
-grep 'invalid argument.*banana.*format' stderr || exit_fail
+$GREP 'invalid argument.*banana.*format' stderr || exit_fail
 
 SVNDIGEST_run 0 -g --format=svg --anchor-format=svg
-grep 'format = svg' stdout || exit_fail
-grep 'anchor_format = svg' stdout || exit_fail
+$GREP 'format = svg' stdout || exit_fail
+$GREP 'anchor_format = svg' stdout || exit_fail
 
 exit_success;

trunk/test/config2_test.sh

@@ -36 +36 @@
 
 SVNDIGEST_run 1 -g --config-file tmp_config
-grep 'unknown format.* apple' stderr || exit_fail
+$GREP 'unknown format.* apple' stderr || exit_fail
 
 exit_success

trunk/test/config3_test.sh

@@ -28 +28 @@
 SVNDIGEST_run 0 -g --config-file /dev/null
 SVNDIGEST_run 1 -g --config-file .
-grep 'is a directory' stderr || exit_fail
+$GREP 'is a directory' stderr || exit_fail
 
 exit_success

trunk/test/init.sh.in

@@ -54 +54 @@
 test -z "$srcdir" && srcdir="@srcdir@";
 test -z "$SVN" && SVN=svn;
+test -z "$GREP" && GREP=@GREP@;
 
 # some helpful derived variables

trunk/test/svncopyright_test.sh

@@ -31 +31 @@
 done
 
-$SVNCOPYRIGHT --version | head -n 1 | grep svncopyright || exit_fail
+$SVNCOPYRIGHT --version | head -n 1 | $GREP svncopyright || exit_fail
 
 exit_success