From 83894e6c668381effd8d8fba81f8bfab06d58567 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Quelin?= <jquelin@gmail.com>
Date: Fri, 30 Jan 2009 18:37:44 +0100
Subject: [PATCH] module_*available() replaced by upstream_status()

---
 lib/App/CPAN2Pkg.pm        | 31 +++++++++++--------------------
 lib/App/CPAN2Pkg/Module.pm | 10 +++-------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/lib/App/CPAN2Pkg.pm b/lib/App/CPAN2Pkg.pm
index 7b9685e..9f90809 100644
--- a/lib/App/CPAN2Pkg.pm
+++ b/lib/App/CPAN2Pkg.pm
@@ -23,8 +23,7 @@ sub spawn {
     my $session = POE::Session->create(
         inline_states => {
             # public events
-            module_available     => \&module_available,
-            module_not_available => \&module_not_available,
+            upstream_status      => \&upstream_status,
             install_status       => \&install_status,
             module_spawned       => \&module_spawned,
             package              => \&package,
@@ -63,14 +62,10 @@ sub spawn {
 
 # -- public events
 
-sub module_available {
-    my ($k, $module) = @_[KERNEL, ARG0];
-    $k->post($module, 'install_from_dist');
-}
-
-sub module_not_available {
-    my ($k, $module) = @_[KERNEL, ARG0];
-    $k->post($module, 'find_prereqs');
+sub upstream_status {
+    my ($k, $module, $is_available) = @_[KERNEL, ARG0, ARG1];
+    my $event = $is_available ? 'install_from_dist' : 'find_prereqs';
+    $k->post($module, $event);
 }
 
 sub install_status {
@@ -163,16 +158,6 @@ A list of modules to start packaging.
 The following events are the module's API.
 
 
-=head2 module_available( $module )
-
-Sent when C<$module> knows it is available upstream.
-
-
-=head2 module_not_available( $module )
-
-Sent when C<$module> knows it isn't available upstream.
-
-
 =head2 install_status( $module, $is_installed )
 
 Sent when C<$module> knows whether it is installed locally (C<$is_installed>
@@ -191,6 +176,12 @@ that the module can be either the top-most module of a distribution or
 deep inside said distribution.
 
 
+=head2 upstream_status( $module, $is_available )
+
+Sent when C<$module> knows whether it is available upstream (C<$is_available>
+set to true) or not.
+
+
 
 =head1 BUGS
 
diff --git a/lib/App/CPAN2Pkg/Module.pm b/lib/App/CPAN2Pkg/Module.pm
index f9569fd..ac7fa42 100644
--- a/lib/App/CPAN2Pkg/Module.pm
+++ b/lib/App/CPAN2Pkg/Module.pm
@@ -207,13 +207,9 @@ sub _is_in_dist {
     my $name  = $self->name;
     my $exval = $rv >> 8;
 
-    if ( ! $exval ) {
-        $self->_log_result( "$name is already packaged upstream." );
-        $k->post('app', 'module_available', $self);
-    } else {
-        $self->_log_result( "$name is not packaged upstream." );
-        $k->post('app', 'module_not_available', $self);
-    }
+    my $status = $exval ? 'not' : 'already';
+    $self->_log_result( "$name is $status packaged upstream." );
+    $k->post('app', 'upstream_status', $self, !$exval);
 }
 
 sub _stderr {
-- 
2.11.4.GIT