/[cvs]/nfo/perl/libs/shortcuts.pm

Diff of /nfo/perl/libs/shortcuts.pm

Parent Directory | Revision Log | View Patch Patch

-revision 1.6 by joko,
Fri Mar 28 06:58:06 2003 UTC
+revision 1.12 by joko,
Mon Jun 23 19:43:19 2003 UTC
 Line 2
  ##  $Id$
  ## ---------------------------------------------------------------------------
  ##  $Log$
+ ##  Revision 1.12  2003/06/23 19:43:19  joko
+ ##  minor cleanup
+ ##  now using IPC::Session::NoShell
+ ##
+ ##  Revision 1.11  2003/06/23 17:41:50  jonen
+ ##  + NEW - used IPC::Session instead of IPC::Run to get better results at linux
+ ##
+ ##  Revision 1.10  2003/06/23 15:59:16  joko
+ ##  major/minor fixes?
+ ##
+ ##  Revision 1.9  2003/05/13 05:36:24  joko
+ ##  heavy modifications to run_cmd
+ ##  + sub get_executable
+ ##  + sub get_executable_wrapper
+ ##
+ ##  Revision 1.8  2003/04/04 17:31:59  joko
+ ##  + sub make_guid
+ ##
+ ##  Revision 1.7  2003/03/29 07:24:10  joko
+ ##  enhanced 'run_cmd': now tries to execute program with appropriate application (e.g. 'cmd.exe' or 'perl')
+ ##
  ##  Revision 1.6  2003/03/28 06:58:06  joko
  ##  new: 'run_cmd' now asynchronous! (via IPC::Run...)
  ##
-Line 36 
 our @EXPORT_OK = qw(
+Line 57 
 our @EXPORT_OK = qw(
    run_cmd run_cmds
    get_chomped
    bool2status
+   make_guid
  );
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   main
  use Data::Dumper;
  use POSIX qw( strftime );
  #use IPC::Run qw( run timeout );
- use IPC::Run qw( start pump finish timeout ) ;
+ use IPC::Run qw( start pump finish timeout run ) ;
+ use Carp;
+ # NEW - 2003-06-23
+ use IPC::Session::NoShell;
  # $now_string = strftime "%a %b %e %H:%M:%S %Y", localtime;
  # see "perldoc -f localtime"
  sub now {
    my $options = shift;
    my $pattern = "%Y-%m-%d %H:%M:%S";
-Line 61 
 sub today {
+Line 85 
 sub today {
    return strftime("%Y-%m-%d", localtime);
  }
+ sub RUNNING_IN_HELL () { $^O eq 'MSWin32' }
+ sub get_executable {
+   my $cmd = shift;
+   # FIXME: detect type of program and run with proper application/interpreter
+   # using IPC::Run we have to dispatch this on our own! *no* os-interaction or interpolation here!?
+   # => better use absolute path-names only?!
+   my $application = '';
+   if ($cmd =~ m/\w+\.pl\s*.*/) {
+     # NEW 2003-06-23 - needed if used with IPC::Session (at Linux)
+     #  whats about Win32?
+     $application = 'perl ';
+   } else {
+     $application = './';
+   }
+   return $application;
+ }
+ sub get_executable_wrapper {
+   my $cmd = shift;
+   my $application = '';
+   # Required to adapt to IPC::Run on win32.
+   #if (RUNNING_IN_HELL()) {
+     #$application = 'cmd.exe /C';
+   #}
+   return $application;
+ }
  sub run_cmd {
    my $cmd = shift;
    my $caption = shift;
    my $options = shift;
-   #$cmd = 'perl ' . $cmd;
+   #print Dumper($options);
    # report - header
    my $sep = "-" x 60;
-   print $sep, "\n";
+   print STDERR $sep, "\n";
-   #print "  ", $cmd, "\n";
+   print STDERR "  ", $cmd;
-   #print "  ", "  $caption", "\n" if $caption;
+   print STDERR " - ", $caption if $caption;
-   print "  ", $cmd;
+   print STDERR "\n", $sep, "\n";
-   print " - ", $caption if $caption;
-   print "\n";
-   print $sep, "\n";
    # strip name of executable from full command string
    $cmd =~ m/(.+?)\s/;
    my $executable = $1;
+ =pod
    # for unix: check if executable is in local directory, if so - prefix with './'
    if (!RUNNING_IN_HELL()) {
      #if ($cmd !~ m/\//) {
      if (-e $executable) {
-       $cmd = "./$cmd";
      }
    }
+ =cut
+   # new of 2003-05-07: basedir option to be prepended to command string
+   my $basedir = $options->{BASEDIR};
+   my $use_path = $options->{USE_PATH};
+   # for all systems: check existance of files - use basedir if given, try current directory otherwise
+   if ($basedir) {
+     -e "$basedir/$executable" or die("$basedir/$executable does not exist.");
+     $basedir .= '/';
+   } elsif ($use_path) {
+     $basedir = "";
+   } else {
+     -e $executable or die("$executable does not exist.");
+     #$basedir = ".";
+     #$basedir .= './';
+     $basedir = "";
+   }
+   $cmd = "$basedir$cmd";
    # V1 - backticks or qq{}
    #`$cmd`;
    #qq{$cmd};
-Line 96 
 sub run_cmd {
+Line 167 
 sub run_cmd {
    # V2 - via 'system'
    #system($cmd);
-   # V3 - using IPC::Run (optional)
+   if (not $use_path) {
+     my $application = get_executable($cmd);
+     $cmd = "$application$cmd" if $application;
+   }
+   # V3 - using IPC (optional)
    if ($options->{async}) {
-     # FIXME: detect type of program and run with proper application/interpreter
-     # using IPC::Run we have to dispatch this on our own! *no* os-interaction or interpolation here!
+     #$cmd = "$application $cmd" if $application;
-     # => better use absolute path-names only?!
+     #my $application = get_executable_wrapper($cmd);
-     $cmd = "perl $cmd";
-     print "IPC::Run: $cmd", "\n";
-     #run \@cmd, \$in, \$out, \$err, timeout( 10 ) or die "cat: $?";
+     print STDERR "run_cmd: IPC::Session::NoShell: $cmd", "\n";
+     #run \@cmd, \$in, \$out, \$err, timeout( 10 ) or die "cat: $?";
      my @cmd = split(' ', $cmd);
-     my $in; my $out; my $err;
-     start \@cmd, timeout(0) or die("IPC::Run could not start '$cmd'.");
+     # V3.1 - using IPC::Run
+     #
+     # tests:
+     #my $in; my $out; my $err;
+     #print "IPC::Run: $cmd", "\n";
+     #start \@cmd, timeout(0) or croak("run_cmd: IPC::Run could not start '$cmd'.");
+     #
+     # success on Win32, but seems broken at 'timeout' on linux:
+     #run(\@cmd, timeout(2)) or croak("run_cmd: IPC::Run could not start '$cmd'.");
+     # other tests ;)
      #$IPC::Run::Timer::timeout = 2000;
      #start $cmd or die("IPC::Run could not start '$cmd'.");
+     # V3.2 - using IPC::Session
+     #  success on Linux AND Win32 ??
+     #
+     # set timeout:
+     #  (don't really know why we needs 2 secconds
+     #   to wait for init of process !?!)
+     my $session_timeout = 2;
+     # set session name (default: cmd as string):
+     my $session_command = $cmd;
+     # create session:
+     my $session = new IPC::Session::NoShell($session_command, $session_timeout);
+     # send 'cmd' to session - not required since complete command is sent via constructor above
+     #$session->send(\@cmd);
+     # optional switch case:
+     #for ($session->stdout()) {
+     #}
+     # optional get error:
+     #my $err = session->stderr();
    } else {
+     print STDERR "run_cmd: system('$cmd').", "\n";
      system($cmd);
    }
-   print "ready.", "\n";
+   print STDERR "run_cmd: ready.", "\n";
  }
  sub run_cmds {
+   my $options = {};
+   if (ref $_[$#_] eq 'HASH') {
+     #print "YAI", "\n";
+     $options = pop @_;
+   }
    foreach (@_) {
-     run_cmd($_);
+     run_cmd($_, '', $options);
    }
  }
-Line 138 
 sub bool2status {
+Line 252 
 sub bool2status {
    return ($bool ? 'ok' : 'failed');
  }
- sub RUNNING_IN_HELL () { $^O eq 'MSWin32' }
+ # create global unique identifers using Data::UUID
+ # if updating this code, please also modify Tangram::Storage::make_guid
+ sub make_guid
+   {
+     my $self = shift;
+     my $guid;
+     # try to use Data::UUID first ...
+     eval("use Data::UUID;");
+     if (!$@) {
+       my $ug = Data::UUID->new();
+       $guid = $ug->create_str();
+     # ... if this fails, try to fallback to Data::UUID::PurePerl instead ...
+     } else {
+       eval("use Data::UUID::PurePerl;");
+       if (!$@) {
+         $guid = Data::UUID::PurePerl::generate_id();
+       } else {
+         croak "couldn't create globally unique identifier";
+       }
+     }
+     return $guid;
+   }
 ;
+ __END__

 Legend:



Removed from v.1.6
 


changed lines


 
Added in v.1.12
 Legend:



Removed from v.1.6
 


changed lines


 
Added in v.1.12
-Removed from v.1.6
+Added in v.1.12

MailToCvsAdmin">MailToCvsAdmin	ViewVC Help
Powered by ViewVC 1.1.26