Index: trunk/Nebulous/Changes =================================================================== --- trunk/Nebulous/Changes (revision 17756) +++ trunk/Nebulous/Changes (revision 17763) @@ -2,4 +2,5 @@ 0.09 + - add neb-xattr util - change Nebulous::Client->find() to handle a volume param and to fall back to searching on the ':any' volume if the first search fails Index: trunk/Nebulous/MANIFEST =================================================================== --- trunk/Nebulous/MANIFEST (revision 17756) +++ trunk/Nebulous/MANIFEST (revision 17763) @@ -19,4 +19,5 @@ bin/neb-stat bin/neb-touch +bin/neb-xattr docs/c_api.h docs/database_setup.txt Index: trunk/Nebulous/bin/neb-xattr =================================================================== --- trunk/Nebulous/bin/neb-xattr (revision 17763) +++ trunk/Nebulous/bin/neb-xattr (revision 17763) @@ -0,0 +1,239 @@ +#!/usr/bin/env perl + +# Copyright (C) 2008 Joshua Hoblitt +# +# $Id: neb-xattr,v 1.1 2008-05-21 20:46:18 jhoblitt Exp $ + +use strict; +use warnings FATAL => qw( all ); + +use vars qw( $VERSION ); +$VERSION = '0.01'; + +use Nebulous::Client; + +use Getopt::Long qw( GetOptions :config auto_help auto_version ); +use Pod::Usage qw( pod2usage ); + +my ($server, $delete, $write); + +$server = $ENV{'NEB_SERVER'} unless $server; + +GetOptions( + 'server|s=s' => \$server, + 'delete|d' => \$delete, + 'write|w' => \$write, +) || pod2usage( 2 ); + +my $key = shift; + +#pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV; +pod2usage( -msg => "Required options: --server", -exitval => 2 ) + unless $server; +pod2usage( -msg => "missing nebulous key", exitval => 2 ) + unless defined $key; + +my $neb = Nebulous::Client->new( + proxy => "$server", +); + +die "can't connected to Nebulous Server: $server" + unless defined $neb; + +# -d flag means delete the list of xattrs from key +if (defined $delete) { + die "--delete requires a list of xattr names" unless scalar @ARGV; + delete_xattrs($key, @ARGV); + exit(0); +} + +# key with xattr:value pair and -w flag means write/overwrite xattr:value +if (defined $write) { + die "--write requires a list of xattr:value pairs" unless scalar @ARGV; + write_xattrs($key, @ARGV); + exit(0); +} + +# key without xattr name list means print all xattr:value pairs +if (not scalar @ARGV) { + print_all_xattrs($key); + exit(0); +} + +# key with xattr name list means print the xattr:value pairs +print_xattrs($key, @ARGV); +exit(0); + +sub print_all_xattrs +{ + my $key = shift; + + return unless defined $key; + + my $xattr_names = $neb->listxattr($key) or die $neb->err; + foreach my $name (@$xattr_names) { + print_xattrs($key, $name); + } + + return 1; +} + + +sub print_xattrs +{ + my ($key, @xattr_names) = @_; + + return unless defined $key; + return unless scalar @xattr_names; + + foreach my $arg (@xattr_names) { + my ($name, $value) = parse_xattr_pair($arg); + die "can not process $arg because it is in name:value form" + if defined $value; + $value = $neb->getxattr($key, $name) or die $neb->err; + print "$name:$value\n"; + } + + return 1; +} + + +sub write_xattrs +{ + my ($key, @xattr_pairs) = @_; + + return unless defined $key; + return unless scalar @xattr_pairs; + + foreach my $arg (@xattr_pairs) { + my ($name, $value) = parse_xattr_pair($arg); + die "can not process $arg because it is not in name:value form" + unless defined $name and defined $value; + $neb->setxattr($key, $name, $value, "replace") + or die $neb->err; + } + + return 1; +} + + +sub delete_xattrs +{ + my ($key, @xattr_names) = @_; + + return unless defined $key; + return unless scalar @xattr_names; + + foreach my $arg (@xattr_names) { + my ($name, $value) = parse_xattr_pair($arg); + die "can not process $arg because it is in name:value form" + if defined $value; + $neb->removexattr($key, $name) + or die $neb->err; + } + + return 1; +} + + +sub parse_xattr_pair +{ + my $pair = shift; + + return unless defined $pair; + + no warnings qw( uninitialized ); + my ($name, $value) = split(/:/, $pair); + use warnings; + + return ($name, $value); +} + + +__END__ + +=pod + +=head1 NAME + +neb-xattr - create an empty file + +=head1 SYNOPSIS + + neb-xattr [--server ] [--write] [[=]] + +=head1 DESCRIPTION + +This program creates an empty file with the Nebulous key of C<>. At some +point in the future it will be able to adjust the timestamp of storage +instances assosiated with a Nebulous key similar to C. + +=head1 OPTIONS + +=over 4 + +=item * --server|-s + +URL of the Nebulous server to connect to. + +Optional if the appropriate environment variable is set. + +=item * --volume + +Symbolic name of the volume to create the first instance on. + +Optional. + +=back + +=head1 ENVIRONMENT + +These environment variables may be used in place of the specified command line +options. All command line option will override the corresponding environment +value. + +=over 4 + +=item * C + +Equivalent to --server|-s + +=back + +=head1 CREDITS + +Just me, myself, and I. + +=head1 SUPPORT + +Please contact the author directly via e-mail. + +=head1 AUTHOR + +Joshua Hoblitt + +=head1 COPYRIGHT + +Copyright (C) 2007-2008 Joshua Hoblitt. All rights reserved. + +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place - Suite 330, Boston, MA 02111-1307, USA. + +The full text of the license can be found in the L Pod as supplied +with Perl 5.8.1 and later. + +=head1 SEE ALSO + +L, L, L, L, L + +=cut Index: trunk/Nebulous/lib/Nebulous/Client.pm =================================================================== --- trunk/Nebulous/lib/Nebulous/Client.pm (revision 17756) +++ trunk/Nebulous/lib/Nebulous/Client.pm (revision 17763) @@ -1,5 +1,5 @@ # Copyright (c) 2004-2008 Joshua Hoblitt # -# $Id: Client.pm,v 1.52 2008-05-20 03:46:11 jhoblitt Exp $ +# $Id: Client.pm,v 1.53 2008-05-21 20:46:18 jhoblitt Exp $ package Nebulous::Client; @@ -486,5 +486,5 @@ type => SCALAR, callbacks => { - 'is read or write' => sub { $_[0] =~ /^(?:create|replace)$/i }, + 'is create or replace' => sub { $_[0] =~ /^(?:create|replace)$/i }, }, },