r50871 - in /branches/upstream/libsocialtext-resting-utils-perl/current: ./ lib/Socialtext/ lib/Socialtext/Resting/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Wed Jan 13 19:22:26 UTC 2010
Author: jawnsy-guest
Date: Wed Jan 13 19:22:16 2010
New Revision: 50871
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50871
Log:
[svn-upgrade] Integrating new upstream version, libsocialtext-resting-utils-perl (0.21)
Modified:
branches/upstream/libsocialtext-resting-utils-perl/current/Changes
branches/upstream/libsocialtext-resting-utils-perl/current/META.yml
branches/upstream/libsocialtext-resting-utils-perl/current/Makefile.PL
branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/EditPage.pm
branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/DefaultRester.pm
branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Getopt.pm
branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Utils.pm
branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/WikiObject.pm
branches/upstream/libsocialtext-resting-utils-perl/current/t/getopt.t
branches/upstream/libsocialtext-resting-utils-perl/current/t/object.t
branches/upstream/libsocialtext-resting-utils-perl/current/t/rester.conf
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/Changes?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/Changes (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/Changes Wed Jan 13 19:22:16 2010
@@ -1,6 +1,10 @@
Revision history for Socialtext-Utils
-0.20 - Sat May 23 23:09:00 PDT 2009
+0.21 - Tue Jan 12 19:54:04 PST 2010
+ - Add dependency on Crypt::DES
+
+0.20 - Tue Apr 21 13:46:23 PDT 2009
+ - Add ability to use an NLW-user cookie instead of user/pass.
- Bugfixes to better work with and without Crypt::CBC
0.19 - Mon Apr 20 11:22:58 PDT 2009
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/META.yml?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/META.yml (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/META.yml Wed Jan 13 19:22:16 2010
@@ -1,17 +1,29 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Socialtext-Resting-Utils
-version: 0.20
-version_from: lib/Socialtext/Resting/Utils.pm
-installdirs: site
+--- #YAML:1.0
+name: Socialtext-Resting-Utils
+version: 0.21
+abstract: Utilities for Socialtext REST APIs
+author:
+ - Luke Closs <cpan at 5thplane.com>
+license: unknown
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
requires:
- Crypt::CBC: 0
- Getopt::Long: 2.36
- JSON::XS: 2.1
- Socialtext::Resting: 0.27
- Test::Mock::LWP: 0
- Test::More: 0
- YAML: 0
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+ Crypt::CBC: 0
+ Crypt::DES: 0
+ Getopt::Long: 2.36
+ JSON::XS: 2.01
+ Socialtext::Resting: 0.27
+ Test::Mock::LWP: 0
+ Test::More: 0
+ YAML: 0
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.50
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/Makefile.PL?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/Makefile.PL (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/Makefile.PL Wed Jan 13 19:22:16 2010
@@ -13,9 +13,10 @@
'Test::More' => 0,
'Test::Mock::LWP' => 0,
'Getopt::Long' => '2.36',
- 'JSON::XS' => '2.1',
+ 'JSON::XS' => '2.01',
'YAML' => 0,
'Crypt::CBC' => 0,
+ 'Crypt::DES' => 0,
},
EXE_FILES => [
'bin/wikedit',
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/EditPage.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/EditPage.pm?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/EditPage.pm (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/EditPage.pm Wed Jan 13 19:22:16 2010
@@ -158,7 +158,7 @@
if ($@ =~ /412/) { # collision detected!
print "A collision was detected. I will merge the changes and "
. "re-open your editor.\nHit enter.\n";
- <>;
+ sleep 2;
print "Merging...\n";
$orig_content = $self->_get_page($page);
my $updated_file = _write_file(undef, $orig_content);
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/DefaultRester.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/DefaultRester.pm?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/DefaultRester.pm (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/DefaultRester.pm Wed Jan 13 19:22:16 2010
@@ -57,6 +57,12 @@
Your password will become crypted the first time it is loaded if Crypt::CBC
is installed.
+
+Alternately, you can use this format:
+
+ server = your-server
+ workspace = some-workspace
+ user_cookie = an-NLW-user-cookie
=cut
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Getopt.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Getopt.pm?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Getopt.pm (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Getopt.pm Wed Jan 13 19:22:16 2010
@@ -32,11 +32,12 @@
Getopt::Long::Configure('pass_through');
GetOptions(
\%opts,
- 'server=s',
- 'workspace=s',
- 'username=s',
- 'password=s',
- 'rester-config=s',
+ 'server|s=s',
+ 'workspace|w=s',
+ 'username|u=s',
+ 'password|p=s',
+ 'user_cookie=s',
+ 'rester-config|c=s',
);
Getopt::Long::Configure('no_pass_through');
return Socialtext::Resting::DefaultRester->new(%opts);
@@ -55,6 +56,7 @@
--server Socialtext server
--username User to login as
--password User password
+ --user_cookie NLW-user cookie to use (supercedes username & password)
--workspace Workspace to use
--rester-config Config file containing 'key = value'
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Utils.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Utils.pm?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Utils.pm (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/Resting/Utils.pm Wed Jan 13 19:22:16 2010
@@ -8,7 +8,7 @@
=cut
-our $VERSION = '0.20';
+our $VERSION = '0.21';
=head1 SYNOPSIS
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/WikiObject.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/WikiObject.pm?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/WikiObject.pm (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/lib/Socialtext/WikiObject.pm Wed Jan 13 19:22:16 2010
@@ -146,6 +146,7 @@
my $heading_level = length(shift || '') - $self->{heading_level_start};
my $new_heading = shift;
warn "hl=$heading_level hls=$self->{heading_level_start} ($new_heading)\n" if $DEBUG;
+ push @{$self->{headings}}, $new_heading;
my $cur_heading = $self->{current_heading};
while (@{$self->{parent_stack}} > $heading_level) {
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/t/getopt.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/t/getopt.t?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/t/getopt.t (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/t/getopt.t Wed Jan 13 19:22:16 2010
@@ -1,7 +1,7 @@
#!/usr/bin/perl
use strict;
use warnings;
-use Test::More tests => 37;
+use Test::More tests => 51;
BEGIN {
use_ok 'Socialtext::Resting::Getopt', 'get_rester';
@@ -19,6 +19,11 @@
Rester_options: {
run_ok("--server foo", server => 'foo');
run_ok("--workspace monkey", workspace => 'monkey');
+}
+
+Shorthand: {
+ run_ok("-s foo", server => 'foo');
+ run_ok("-w monkey", workspace => 'monkey');
}
sub run_ok {
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/t/object.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/t/object.t?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/t/object.t (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/t/object.t Wed Jan 13 19:22:16 2010
@@ -41,6 +41,9 @@
Food
EOT
expected => {
+ headings => [
+ 'Currently listening to', 'Getting oriented',
+ ],
page => 'Test Page',
rester => $rester,
text => "Stuff\n",
@@ -75,6 +78,7 @@
items => [ 'Item 1', 'Item 2' ],
text => "Other text\nMore text\n",
},
+ headings => ['Contact Info'],
},
);
}
@@ -112,10 +116,10 @@
table => $table_two,
text => "These are some things I see:\n",
},
+ headings => ['Other things'],
},
);
}
-
exit;
sub object_ok {
@@ -249,6 +253,18 @@
items => [
$storyboards,
],
+ headings => [
+ 'Theme',
+ 'People',
+ 'Story Boards',
+ '[SetupApache]',
+ 'Tasks',
+ '[ModPerl HelloWorld]',
+ 'Tasks',
+ '[Styled Homepage]',
+ 'Tasks',
+ 'Other Information',
+ ],
};
push @data, {
@@ -298,6 +314,11 @@
items => [
$morning_top,
],
+ headings => [
+ 'Top of the morning',
+ 'Ball Tricks',
+ 'Club Tricks',
+ ],
};
push @data, {
page => $page_name,,
Modified: branches/upstream/libsocialtext-resting-utils-perl/current/t/rester.conf
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocialtext-resting-utils-perl/current/t/rester.conf?rev=50871&op=diff
==============================================================================
--- branches/upstream/libsocialtext-resting-utils-perl/current/t/rester.conf (original)
+++ branches/upstream/libsocialtext-resting-utils-perl/current/t/rester.conf Wed Jan 13 19:22:16 2010
@@ -1,5 +1,5 @@
username = user-name
-password = CRYPTED_53616c7465645f5f2d397bd8c1652e2f91cd5a4e89a6c1a603aabd84b7340aea
+password = CRYPTED_53616c7465645f5fbbf5d55045f42def3fafbc460b8f76e45cdd802553c46128
workspace = work-space
server = http://socialtext.net
class = Socialtext::Resting::Mock
More information about the Pkg-perl-cvs-commits
mailing list