Changeset 16354

Timestamp:

Feb 7, 2008, 12:18:51 PM (18 years ago)

Author:

jhoblitt

Message:

pickup test DB settings from the env.

Location:

trunk

Files:

• Nebulous-Server/Changes (modified) (1 diff)
• Nebulous-Server/lib/Nebulous/Server.pm (modified) (2 diffs)
• Nebulous/Changes (modified) (1 diff)
• Nebulous/lib/Nebulous/Server.pm (modified) (2 diffs)
• Nebulous/lib/Nebulous/Util.pm (modified) (2 diffs)
• Nebulous/t/Test/Nebulous.pm (modified) (2 diffs)

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.07
+    - pickup test DB settings from the env.
     - add neb-ls -l|-1 option
     - add neb-fsck

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.51 2008-01-31 02:26:33 jhoblitt Exp $
+# $Id: Server.pm,v 1.52 2008-02-07 22:18:51 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -861 +861 @@
     $log->debug( "entered - @_" );
 
+    unless ($pattern) {
+        $log->debug( "leaving" );
+        return [];
+    }
+
+    # attempt to strip off neb:// if it exists
+    if ($pattern =~ m|^neb:|) {
+        $pattern = parse_neb_key($pattern);        
+    }
+
     my $query;
-
     eval {
         $query = $db->prepare_cached( $sql->find_objects );

trunk/Nebulous/Changes

@@ -2 +2 @@
 
 0.07
+    - pickup test DB settings from the env.
     - add neb-ls -l|-1 option
     - add neb-fsck

trunk/Nebulous/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.51 2008-01-31 02:26:33 jhoblitt Exp $
+# $Id: Server.pm,v 1.52 2008-02-07 22:18:51 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -861 +861 @@
     $log->debug( "entered - @_" );
 
+    unless ($pattern) {
+        $log->debug( "leaving" );
+        return [];
+    }
+
+    # attempt to strip off neb:// if it exists
+    if ($pattern =~ m|^neb:|) {
+        $pattern = parse_neb_key($pattern);        
+    }
+
     my $query;
-
     eval {
         $query = $db->prepare_cached( $sql->find_objects );

trunk/Nebulous/lib/Nebulous/Util.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Util.pm,v 1.9 2008-01-23 22:46:44 jhoblitt Exp $
+# $Id: Util.pm,v 1.10 2008-02-07 22:18:51 jhoblitt Exp $
 
 package Nebulous::Util;
@@ -83 +83 @@
 {
     my $text = shift;
+    return unless defined $text;
 
     # white space is not allowed

trunk/Nebulous/t/Test/Nebulous.pm

@@ -1 +1 @@
 # Copyright (C) 2004  Joshua Hoblitt
 #
-# $Id: Nebulous.pm,v 1.16 2008-02-02 01:51:29 jhoblitt Exp $
+# $Id: Nebulous.pm,v 1.17 2008-02-07 22:17:45 jhoblitt Exp $
 
 package Test::Nebulous;
@@ -18 +18 @@
 our @EXPORT = qw( $NEB_DB $NEB_USER $NEB_PASS );
 
-our $NEB_DB   = "DBI:mysql:database=nebulous:host=localhost";
-our $NEB_USER = "nebulous";
-our $NEB_PASS = '@neb@';
+our $NEB_DB     = $ENV{'NEB_DB'}   || "DBI:mysql:database=test:host=localhost";
+our $NEB_USER   = $ENV{'NEB_USER'} || "test";
+our $NEB_PASS   = $ENV{'NEB_PASS'} || '';
 
 my $dbh = DBI->connect( $NEB_DB, $NEB_USER, $NEB_PASS );