Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed slight dependency, and..

skip interop tests if Couchbase::Config not installed
moved Log::Fu as a Makefile.PL dependency
moved ExtUtils::H2PM as configure dependency
removed unneeded modules from MockServer.pm
added parens around (qw())
  • Loading branch information...
commit 34d6bd7776088a6467ebe49eab6e2173fb60f904 1 parent e067c89
M. Nunberg mnunberg authored
13 Makefile.PL
@@ -112,27 +112,30 @@ WriteMakefile(
112 112
113 113 CONFIGURE_REQUIRES => {
114 114 'Dir::Self' => 0,
  115 + 'Log::Fu' => 0.25,
  116 + },
  117 +
  118 + BUILD_REQUIRES => {
  119 + 'ExtUtils::H2PM' => 0.08,
115 120 },
116 121
117 122 PREREQ_PM => {
118 123 'Array::Assign' => 0,
119   - 'ExtUtils::H2PM' => 0.08,
120 124 'Class::XSAccessor' => 1.11,
121 125 'Test::More' => 0,
122 126
123 127 #These modules are needed for tests, but not strictly required for
124 128 #functionality
125 129
126   - 'Log::Fu' => 0.25,
127 130 'Test::Class' => 0.36,
128   -
  131 +
129 132 #these are needed for asynchronous tests and modules
130 133 'POE::Sugar::Attributes' => 0.02,
131 134 'POE' => 1.312,
132 135 },
133 136
134 137 dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
135   - clean => { FILES => 'Couchbase-Client-* COMPILER_FLAGS' },
  138 + clean => { FILES => 'Couchbase-Client-* COMPILER_FLAGS log.test-*' },
136 139 %MM_Options,
137 140 );
138 141
@@ -161,7 +164,7 @@ sub const_cccmd {
161 164
162 165 sub libscan {
163 166 my ($self,$path) = @_;
164   - if($path =~ /\.pl$/i) {
  167 + if($path =~ /\.pl$/i || $path =~ /PLCB_Conf/) {
165 168 return "";
166 169 } else {
167 170 return $path;
2  lib/Couchbase/Client.pm
@@ -2,7 +2,7 @@ package Couchbase::Client;
2 2
3 3 BEGIN {
4 4 require XSLoader;
5   - our $VERSION = '0.14_0';
  5 + our $VERSION = '0.15_0';
6 6 XSLoader::load(__PACKAGE__, $VERSION);
7 7 }
8 8
2  lib/Couchbase/Client/Async.pm
... ... @@ -1,7 +1,7 @@
1 1 package Couchbase::Client::Async;
2 2 use strict;
3 3 use warnings;
4   -our $VERSION = '0.14_0';
  4 +our $VERSION = '0.15_0';
5 5 require XSLoader;
6 6 XSLoader::load('Couchbase::Client', $VERSION);
7 7 use Couchbase::Client;
4 lib/Couchbase/MockServer.pm
... ... @@ -1,13 +1,9 @@
1 1 package Couchbase::MockServer;
2 2 use strict;
3 3 use warnings;
4   -use File::Basename;
5   -use URI;
6   -use File::Path qw(mkpath);
7 4 use IO::Socket::INET;
8 5 use Socket;
9 6 use POSIX qw(:errno_h :signal_h :sys_wait_h);
10   -use Time::HiRes;
11 7 use Log::Fu { level => "warn" };
12 8 use Data::Dumper;
13 9 use Time::HiRes qw(sleep);
7 lib/Couchbase/Test/Interop.pm
@@ -25,6 +25,11 @@ if($] < 5.010) {
25 25 "segfaults on perls < 5.10");
26 26 }
27 27
  28 +eval {
  29 + require Couchbase::Config::UA; 1;
  30 +} or __PACKAGE__->SKIP_CLASS(
  31 + "Need Couchbase::Config for interop tests\n$@");
  32 +
28 33
29 34 sub _setup_client :Test(startup) {
30 35 my $self = shift;
@@ -79,7 +84,7 @@ sub T30_interop_init :Test(no_plan)
79 84 {
80 85 my $self = shift;
81 86 my $memd = $self->memd();
82   - foreach my $key qw(foo bar baz) {
  87 + foreach my $key (qw(foo bar baz)) {
83 88 my $value = scalar reverse($key);
84 89 ok($memd->set($key, $value), "Set value OK");
85 90 is($memd->get($key), $value, "Got back our value");

0 comments on commit 34d6bd7

Please sign in to comment.
Something went wrong with that request. Please try again.