[Catalyst-commits] r6907 - in trunk/Catalyst-Model-Search: . lib/Catalyst/Model/Search t/lib/TestApp/M/Search

marcus at dev.catalyst.perl.org marcus at dev.catalyst.perl.org
Sun Sep 16 19:04:41 GMT 2007


Author: marcus
Date: 2007-09-16 19:04:40 +0100 (Sun, 16 Sep 2007)
New Revision: 6907

Removed:
   trunk/Catalyst-Model-Search/Build.PL
Modified:
   trunk/Catalyst-Model-Search/Changes
   trunk/Catalyst-Model-Search/META.yml
   trunk/Catalyst-Model-Search/Makefile.PL
   trunk/Catalyst-Model-Search/lib/Catalyst/Model/Search/Plucene.pm
   trunk/Catalyst-Model-Search/t/lib/TestApp/M/Search/LuceneWebService.pm
   trunk/Catalyst-Model-Search/t/lib/TestApp/M/Search/Plucene.pm
Log:
Catalyst::Model::Search prepped for CPAN

Deleted: trunk/Catalyst-Model-Search/Build.PL
===================================================================
--- trunk/Catalyst-Model-Search/Build.PL	2007-09-15 00:41:39 UTC (rev 6906)
+++ trunk/Catalyst-Model-Search/Build.PL	2007-09-16 18:04:40 UTC (rev 6907)
@@ -1,22 +0,0 @@
-use strict;
-use Module::Build;
-
-my $build = Module::Build->new(
-    create_makefile_pl => 'passthrough',
-    license            => 'perl',
-    module_name        => 'Catalyst::Model::Search',
-    requires           => { 
-        'Catalyst'   => '5.33',
-        'Class::Std' => 0,
-    },
-    recommends         => {
-        'Plucene'       => '1.24',
-        'Plucene::Plugin::Analyzer::SnowballAnalyzer' => '1.1',
-        'Net::LuceneWS' => 0,
-    },
-    create_makefile_pl => 'passthrough',
-    test_files   => [
-        glob('t/*.t') 
-    ]
-);
-$build->create_build_script;

Modified: trunk/Catalyst-Model-Search/Changes
===================================================================
--- trunk/Catalyst-Model-Search/Changes	2007-09-15 00:41:39 UTC (rev 6906)
+++ trunk/Catalyst-Model-Search/Changes	2007-09-16 18:04:40 UTC (rev 6907)
@@ -1,4 +1,4 @@
 Revision history for Perl extension Catalyst::Model::Search
 
-0.01 
+0.01    16. 2007-09-16 19:24:34
         - initial release

Modified: trunk/Catalyst-Model-Search/META.yml
===================================================================
--- trunk/Catalyst-Model-Search/META.yml	2007-09-15 00:41:39 UTC (rev 6906)
+++ trunk/Catalyst-Model-Search/META.yml	2007-09-16 18:04:40 UTC (rev 6907)
@@ -1,18 +1,18 @@
----
+--- 
+abstract: ~
+author: Andy Grundman, <andy at hybridized.org>
+distribution_type: module
+generated_by: Module::Install version 0.67
+license: perl
+meta-spec: 
+  url: http://module-build.sourceforge.net/META-spec-v1.3.html
+  version: 1.3
 name: Catalyst-Model-Search
+no_index: 
+  directory: 
+    - inc
+    - t
+requires: 
+  Catalyst: 5.62
+  Class::Std: 0
 version: 0.01
-author: ~
-abstract: ~
-license: perl
-requires:
-  Catalyst: 5.33
-recommends:
-  Plucene: 0
-provides:
-  Catalyst::Model::Search:
-    file: lib/Catalyst/Model/Search.pm
-    version: 0.01
-  Catalyst::Model::Search::Plucene:
-    file: lib/Catalyst/Model/Search/Plucene.pm
-    version: 0.01
-generated_by: Module::Build version 0.2611

Modified: trunk/Catalyst-Model-Search/Makefile.PL
===================================================================
--- trunk/Catalyst-Model-Search/Makefile.PL	2007-09-15 00:41:39 UTC (rev 6906)
+++ trunk/Catalyst-Model-Search/Makefile.PL	2007-09-16 18:04:40 UTC (rev 6907)
@@ -1,31 +1,18 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
-    
-    unless (eval "use Module::Build::Compat 0.02; 1" ) {
-      print "This module requires Module::Build to install itself.\n";
-      
-      require ExtUtils::MakeMaker;
-      my $yn = ExtUtils::MakeMaker::prompt
-	('  Install Module::Build now from CPAN?', 'y');
-      
-      unless ($yn =~ /^y/i) {
-	die " *** Cannot install without Module::Build.  Exiting ...\n";
-      }
-      
-      require Cwd;
-      require File::Spec;
-      require CPAN;
-      
-      # Save this 'cause CPAN will chdir all over the place.
-      my $cwd = Cwd::cwd();
-      my $makefile = File::Spec->rel2abs($0);
-      
-      CPAN::Shell->install('Module::Build::Compat')
-	or die " *** Cannot install without Module::Build.  Exiting ...\n";
-      
-      chdir $cwd or die "Cannot chdir() back to $cwd: $!";
-    }
-    eval "use Module::Build::Compat 0.02; 1" or die $@;
-    use lib '_build/lib';
-    Module::Build::Compat->run_build_pl(args => \@ARGV);
-    require Module::Build;
-    Module::Build::Compat->write_makefile(build_class => 'Module::Build');
+use inc::Module::Install;
+
+name('Catalyst-Model-Search');
+all_from('lib/Catalyst/Model/Search/Plucene.pm');
+
+include('ExtUtils::AutoInstall');
+
+requires 'Catalyst' => '5.62';
+requires 'Class::Std';
+
+feature 'Plucene Support',
+    'Plucene'       => '1.24',
+    'Plucene::Plugin::Analyzer::SnowballAnalyzer' => '1.1';
+feature  'Lucene support',
+    'Net::LuceneWS';
+
+auto_install();
+&WriteAll;

Modified: trunk/Catalyst-Model-Search/lib/Catalyst/Model/Search/Plucene.pm
===================================================================
--- trunk/Catalyst-Model-Search/lib/Catalyst/Model/Search/Plucene.pm	2007-09-15 00:41:39 UTC (rev 6906)
+++ trunk/Catalyst-Model-Search/lib/Catalyst/Model/Search/Plucene.pm	2007-09-16 18:04:40 UTC (rev 6907)
@@ -31,7 +31,7 @@
             analyzer     => $self->config->{analyzer},
             return_style => $self->config->{return_style},
         } );
-    
+                   
     $self->_plucene( $plucene );
     
     $self->optimize;
@@ -233,6 +233,7 @@
 =head1 AUTHOR
 
 Andy Grundman, <andy at hybridized.org>
+Marcus Ramberg, <mramberg at cpan.org>
 
 =head1 THANKS
 

Modified: trunk/Catalyst-Model-Search/t/lib/TestApp/M/Search/LuceneWebService.pm
===================================================================
--- trunk/Catalyst-Model-Search/t/lib/TestApp/M/Search/LuceneWebService.pm	2007-09-15 00:41:39 UTC (rev 6906)
+++ trunk/Catalyst-Model-Search/t/lib/TestApp/M/Search/LuceneWebService.pm	2007-09-16 18:04:40 UTC (rev 6907)
@@ -1,12 +1,21 @@
 package TestApp::M::Search::LuceneWebService;
 
 use strict;
-use base qw/Catalyst::Model::Search::LuceneWebService/;
 
-__PACKAGE__->config(
-    # change debug to 1 to see the XML to/from the service
-    debug => 0,
-);
+our @ISA;
 
+
+eval {
+    require Catalyst::Model::Search::LuceneWebService;
+    push @ISA,'Catalyst::Model::Search::LuceneWebService';
+
+    __PACKAGE__->config(
+        # change debug to 1 to see the XML to/from the service
+        debug => 0,
+    );
+};                                          
+
+
+
 1;
 

Modified: trunk/Catalyst-Model-Search/t/lib/TestApp/M/Search/Plucene.pm
===================================================================
--- trunk/Catalyst-Model-Search/t/lib/TestApp/M/Search/Plucene.pm	2007-09-15 00:41:39 UTC (rev 6906)
+++ trunk/Catalyst-Model-Search/t/lib/TestApp/M/Search/Plucene.pm	2007-09-16 18:04:40 UTC (rev 6907)
@@ -1,11 +1,17 @@
 package TestApp::M::Search::Plucene;
+    
+our @ISA;
 
 use strict;
-use base qw/Catalyst::Model::Search::Plucene/;
+eval {
+    require Catalyst::Model::Search::Plucene;
+    push @ISA,'Catalyst::Model::Search::Plucene';
+                                          
+    __PACKAGE__->config(
+        index => 't/var/plucene',
+    );
+};      
 
-__PACKAGE__->config(
-    index => 't/var/plucene',
-);
 
 1;
 




More information about the Catalyst-commits mailing list