Changeset 1794

Timestamp:

08/24/06 07:37:10 (2 years ago)

Author:

fabien

Message:

added color to default actions in pake

Files:

• tools/pake/trunk/lib/pake/pakeApp.class.php (modified) (9 diffs)
• tools/pake/trunk/lib/pake/pakeException.class.php (modified) (2 diffs)
• tools/pake/trunk/lib/pake/pakeFunction.php (modified) (10 diffs)
• tools/pake/trunk/lib/pake/pakeTask.class.php (modified) (3 diffs)

tools/pake/trunk/lib/pake/pakeApp.class.php

@@ -233 +233 @@
-        break;
-      case 'version':
-'pake version '.pakeApp::VERSION
+sprintf('pake version %s', pakeColor::colorize(pakeApp::VERSION, 'INFO'))
-        exit();
-      default:
@@ -243 +243 @@
-  public function usage()
-  {
-Try pake -H for more information
+".pakeColor::colorize("Try pake -H for more information", 'INFO')."
-  }
-
@@ -251 +251 @@
-    $this->usage();
-    echo "\n";
-
+:
-    echo "\n";
-
@@ -262 +262 @@
-          $long .= '='.$match[1];
-      }
-$long, $short
+pakeColor::colorize($long, 'INFO'), pakeColor::colorize($short, 'INFO')
-      printf("      %s\n", $comment);
-    }
@@ -277 +277 @@
-      if ($w > $width) $width = $w;
-    }
-
-
+
+
+
-
-    // display tasks
@@ -293 +294 @@
-      {
-        $mini_name = pakeTask::get_mini_task_name($name);
-$mini_name
+pakeColor::colorize($mini_name, 'INFO')
-      }
-    }
@@ -299 +300 @@
-    if ($has_alias)
-    {
-
+task 
-
-      // display aliases
@@ -307 +308 @@
-        {
-          $mini_name = pakeTask::get_mini_task_name($name);
-Task::get_mini_task_name($name
+Color::colorize(pakeTask::get_mini_task_name($name), 'INFO'
-        }
-      }
@@ -368 +369 @@
-    $subsize = floor(($size - 3) / 2);
-
-'...'
+pakeColor::colorize('...', 'INFO')
-  }
-

tools/pake/trunk/lib/pake/pakeException.class.php

@@ -22 +22 @@
-  function render($e)
-  {
-
+
+
+
+
-
-    $pake = pakeApp::get_instance();
@@ -28 +31 @@
-    if ($pake->get_trace())
-    {
-\n
+exception 
-
-      $trace = $this->trace($e);

tools/pake/trunk/lib/pake/pakeFunction.php

@@ -105 +105 @@
-  }
-
-if ($verbose) echo '>> dir+      '.pakeApp::excerpt($path)."\n"
-
-
+pake_echo_action('dir+', $path)
+
+@
-}
-
@@ -138 +138 @@
-  if ($options['override'] || !file_exists($target_file) || $most_recent)
-  {
-if ($verbose) echo '>> file+     '.pakeApp::excerpt($target_file)."\n"
+pake_echo_action('file+', $target_file)
-    copy($origin_file, $target_file);
-  }
@@ -178 +178 @@
-    if (is_dir($file) && !is_link($file))
-    {
-if ($verbose) echo '>> dir-      '.pakeApp::excerpt($file)."\n"
+pake_echo_action('dir-', $file)
-
-      rmdir($file);
@@ -184 +184 @@
-    else
-    {
-if ($verbose) echo '>> file-     '.pakeApp::excerpt($file)."\n"
+pake_echo_action('file-', $file)
-
-      unlink($file);
@@ -199 +199 @@
-  foreach ($files as $file)
-  {
-if ($verbose) echo '>> file+     '.pakeApp::excerpt($file)."\n"
+pake_echo_action('file+', $file)
-
-    touch($file);
@@ -221 +221 @@
-    }
-
-if ($verbose && $replaced) echo '>> tokens    '.pakeApp::excerpt($target_dir.DIRECTORY_SEPARATOR.$file)."\n"
+pake_echo_action('tokens', $target_dir.DIRECTORY_SEPARATOR.$file)
-
-    file_put_contents($target_dir.DIRECTORY_SEPARATOR.$file, $content);
@@ -245 +245 @@
-  {
-    $verbose = pakeApp::get_instance()->get_verbose();
-if ($verbose) echo '>> symlink+  '.pakeApp::excerpt($target_dir)."\n"
+pake_echo_action('symlink+', $target_dir)
-    symlink($origin_dir, $target_dir);
-  }
@@ -261 +261 @@
-  foreach ($files as $file)
-  {
-if ($verbose) printf('>> chmod %o '.pakeApp::excerpt($target_dir.DIRECTORY_SEPARATOR.$file)."\n", $mod
+pake_echo_action(sprintf('chmod %o', $mode), $target_dir.DIRECTORY_SEPARATOR.$fil
-    chmod($target_dir.DIRECTORY_SEPARATOR.$file, $mode);
-  }
@@ -271 +271 @@
-{
-  $verbose = pakeApp::get_instance()->get_verbose();
-if ($verbose) echo ">> exec      $cmd\n"
-
+pake_echo_action('exec ', $cmd)
+
-  ob_start();
-  passthru($cmd.' 2>&1', $return);
@@ -344 +344 @@
-}
-
+function pake_echo_action($section, $text)
+{
+  if (pakeApp::get_instance()->get_verbose())
+  {
+    echo sprintf('>> %-20s %s', pakeColor::colorize($section, 'INFO'), pakeApp::excerpt($text))."\n";
+  }
+}
+
+function pake_excerpt($text)
+{
+  if (pakeApp::get_instance()->get_verbose())
+  {
+    echo pakeApp::excerpt($text)."\n";
+  }
+}
+
+function pake_echo($text)
+{
+  if (pakeApp::get_instance()->get_verbose())
+  {
+    echo $text."\n";
+  }
+}
+
-// register our default exception handler
-function pake_exception_default_handler($exception)

tools/pake/trunk/lib/pake/pakeTask.class.php

@@ -154 +154 @@
-    if ($this->trace)
-    {
-echo '>> invoke '.$this->name.' '.$this->format_trace_flags()."\n"
+pake_echo_action('invoke', $this->name.' '.$this->format_trace_flags())
-    }
-
@@ -187 +187 @@
-    if ($this->dryrun)
-    {
-echo '>> execute (dry run) '.$this->name."\n"
+pake_echo_action('execute', '(dry run) '.$this->name)
-      return;
-    }
@@ -193 +193 @@
-    if ($this->trace)
-    {
-echo '>> execute '.$this->name."\n"
+pake_echo_action('execute', $this->name)
-    }
-