[Bps-public-commit] Prophet - A disconnected, replicated p2p database branch, master, updated. 686e831b95df4fabc719f0b3a00933773f8930ec

[jesse]

The branch, master has been updated
       via  686e831b95df4fabc719f0b3a00933773f8930ec (commit)
      from  baedb85c6039a9ae1d814539491251741214c1fb (commit)

Summary of changes:
 lib/Prophet/CLI/Command.pm          |    2 +-
 lib/Prophet/CLI/Command/Aliases.pm  |    2 +-
 lib/Prophet/CLI/Command/Merge.pm    |    2 +-
 lib/Prophet/CLI/Command/Pull.pm     |    2 +-
 lib/Prophet/CLI/Command/Server.pm   |    2 +-
 lib/Prophet/CLI/Command/Settings.pm |    2 +-
 lib/Prophet/CLI/Command/Show.pm     |    2 +-
 lib/Prophet/CLI/Command/Update.pm   |    2 +-
 lib/Prophet/Config.pm               |    2 --
 9 files changed, 8 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 686e831b95df4fabc719f0b3a00933773f8930ec
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Feb 20 17:05:42 2009 -0500

    Remove code that triggered an implicit dependency on Class::Method::Modifiers

diff --git a/lib/Prophet/CLI/Command.pm b/lib/Prophet/CLI/Command.pm
index 7671040..4866fd2 100644
--- a/lib/Prophet/CLI/Command.pm
+++ b/lib/Prophet/CLI/Command.pm
@@ -39,7 +39,7 @@ to have short commands.
 
 To use, have your command subclass do:
 
-    around ARG_TRANSLATIONS => sub { shift->(),  f => 'file' };
+    sub ARG_TRANSLATIONS { shift->SUPER::ARG_TRANSLATIONS(),  f => 'file' };
 
 You can register as many translations at a time as you want.
 The arguments will be translated when the command object is
diff --git a/lib/Prophet/CLI/Command/Aliases.pm b/lib/Prophet/CLI/Command/Aliases.pm
index 5306fa9..5cadcb1 100644
--- a/lib/Prophet/CLI/Command/Aliases.pm
+++ b/lib/Prophet/CLI/Command/Aliases.pm
@@ -5,7 +5,7 @@ use Params::Validate qw/validate/;
 extends 'Prophet::CLI::Command';
 with 'Prophet::CLI::TextEditorCommand';
 
-around ARG_TRANSLATIONS => sub { shift->(),  a => 'add', d => 'delete', s => 'show' };
+sub ARG_TRANSLATIONS { shift->SUPER::ARG_TRANSLATIONS(),  a => 'add', d => 'delete', s => 'show' };
 
 sub run {
     my $self     = shift;
diff --git a/lib/Prophet/CLI/Command/Merge.pm b/lib/Prophet/CLI/Command/Merge.pm
index 0a6c96b..23e1ab3 100644
--- a/lib/Prophet/CLI/Command/Merge.pm
+++ b/lib/Prophet/CLI/Command/Merge.pm
@@ -5,7 +5,7 @@ extends 'Prophet::CLI::Command';
 has source => ( isa => 'Prophet::Replica', is => 'rw');
 has target => ( isa => 'Prophet::Replica', is => 'rw');
 
-around ARG_TRANSLATIONS => sub { shift->(),  f => 'force' };
+sub ARG_TRANSLATIONS { shift->SUPER::ARG_TRANSLATIONS(),  f => 'force' };
 
 sub run {
     my $self = shift;
diff --git a/lib/Prophet/CLI/Command/Pull.pm b/lib/Prophet/CLI/Command/Pull.pm
index 9e64fbf..0ef091a 100644
--- a/lib/Prophet/CLI/Command/Pull.pm
+++ b/lib/Prophet/CLI/Command/Pull.pm
@@ -2,7 +2,7 @@ package Prophet::CLI::Command::Pull;
 use Any::Moose;
 extends 'Prophet::CLI::Command::Merge';
 
-around ARG_TRANSLATIONS => sub { shift->(),  l => 'local' };
+sub ARG_TRANSLATIONS { shift->SUPER::ARG_TRANSLATIONS(),  l => 'local' };
 
 sub run {
     my $self = shift;
diff --git a/lib/Prophet/CLI/Command/Server.pm b/lib/Prophet/CLI/Command/Server.pm
index ecb466e..a00ece0 100644
--- a/lib/Prophet/CLI/Command/Server.pm
+++ b/lib/Prophet/CLI/Command/Server.pm
@@ -2,7 +2,7 @@ package Prophet::CLI::Command::Server;
 use Any::Moose;
 extends 'Prophet::CLI::Command';
 
-around ARG_TRANSLATIONS =>  sub { shift->(),  p => 'port', w => 'writable' };
+sub ARG_TRANSLATIONS { shift->SUPER::ARG_TRANSLATIONS(),  p => 'port', w => 'writable' };
 
 use Prophet::Server;
 
diff --git a/lib/Prophet/CLI/Command/Settings.pm b/lib/Prophet/CLI/Command/Settings.pm
index 393ae6f..bc35d3a 100644
--- a/lib/Prophet/CLI/Command/Settings.pm
+++ b/lib/Prophet/CLI/Command/Settings.pm
@@ -6,7 +6,7 @@ use JSON;
 extends 'Prophet::CLI::Command';
 with 'Prophet::CLI::TextEditorCommand';
 
-around ARG_TRANSLATIONS => sub { shift->(),  s => 'show' };
+sub ARG_TRANSLATIONS { shift->SUPER::ARG_TRANSLATIONS(),  s => 'show' };
 
 sub run {
     my $self     = shift;
diff --git a/lib/Prophet/CLI/Command/Show.pm b/lib/Prophet/CLI/Command/Show.pm
index 82182e5..18bc6db 100644
--- a/lib/Prophet/CLI/Command/Show.pm
+++ b/lib/Prophet/CLI/Command/Show.pm
@@ -4,7 +4,7 @@ use Params::Validate;
 extends 'Prophet::CLI::Command';
 with 'Prophet::CLI::RecordCommand';
 
-around ARG_TRANSLATIONS => sub { shift->(),  'b' => 'batch' };
+sub ARG_TRANSLATIONS { shift->SUPER::ARG_TRANSLATIONS(),  'b' => 'batch' };
 
 sub run {
     my $self = shift;
diff --git a/lib/Prophet/CLI/Command/Update.pm b/lib/Prophet/CLI/Command/Update.pm
index b0820c1..aa4425e 100644
--- a/lib/Prophet/CLI/Command/Update.pm
+++ b/lib/Prophet/CLI/Command/Update.pm
@@ -3,7 +3,7 @@ use Any::Moose;
 extends 'Prophet::CLI::Command';
 with 'Prophet::CLI::RecordCommand';
 
-around ARG_TRANSLATIONS => sub { shift->(), e => 'edit' };
+sub ARG_TRANSLATIONS { shift->SUPER::ARG_TRANSLATIONS(), e => 'edit' };
 
 sub edit_record {
     my $self   = shift;
diff --git a/lib/Prophet/Config.pm b/lib/Prophet/Config.pm
index 3563a20..ec8ed04 100644
--- a/lib/Prophet/Config.pm
+++ b/lib/Prophet/Config.pm
@@ -51,8 +51,6 @@ sub replica_config_file {
     return File::Spec->catfile( $self->app_handle->handle->fs_root => 'prophetrc' )
 }
 
-#my $singleton;
-#around new => sub { return $singleton if $singleton; my $orig = shift; return $singleton = $orig->(@_); };
 
 sub load_from_files {
     my $self = shift;

-----------------------------------------------------------------------