[Bps-public-commit] RT-Extension-Nginx branch, master, updated. 0.02-5-g88dcb82

[Ruslan Zakirov]

The branch, master has been updated
       via  88dcb82a33814cae90f0eda7a165b235e0396782 (commit)
       via  8d1840d974676cdbf88fe8025f179fd1f003886e (commit)
      from  34f0811a8475f3dc14356f6875f91b3da777b8ea (commit)

Summary of changes:
 CHANGES                             |  5 +++++
 META.yml                            |  2 +-
 inc/Module/Install/RTx.pm           | 30 +++++-------------------------
 inc/Module/Install/ReadmeFromPod.pm |  2 +-
 lib/RT/Extension/Nginx.pm           |  2 +-
 5 files changed, 13 insertions(+), 28 deletions(-)

- Log -----------------------------------------------------------------
commit 8d1840d974676cdbf88fe8025f179fd1f003886e
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Dec 7 21:35:32 2012 +0400

    update M::I::*

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 73b9cda..ce01018 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,7 +8,7 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.29';
+our $VERSION = '0.30';
 
 use FindBin;
 use File::Glob     ();
@@ -129,18 +129,7 @@ install ::
 
     my %has_etc;
     if ( File::Glob::bsd_glob("$FindBin::Bin/etc/schema.*") ) {
-
-        # got schema, load factory module
         $has_etc{schema}++;
-        $self->load('RTxFactory');
-        $self->postamble(<< ".");
-factory ::
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxFactory(qw($RTx $name))"
-
-dropdb ::
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxFactory(qw($RTx $name drop))"
-
-.
     }
     if ( File::Glob::bsd_glob("$FindBin::Bin/etc/acl.*") ) {
         $has_etc{acl}++;
@@ -164,28 +153,19 @@ dropdb ::
         print "For first-time installation, type 'make initdb'.\n";
         my $initdb = '';
         $initdb .= <<"." if $has_etc{schema};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(schema))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(schema \$(NAME) \$(VERSION)))"
 .
         $initdb .= <<"." if $has_etc{acl};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(acl))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(acl \$(NAME) \$(VERSION)))"
 .
         $initdb .= <<"." if $has_etc{initialdata};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(insert))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(insert \$(NAME) \$(VERSION)))"
 .
         $self->postamble("initdb ::\n$initdb\n");
         $self->postamble("initialize-database ::\n$initdb\n");
     }
 }
 
-sub RTxInit {
-    unshift @INC, substr( delete( $INC{'RT.pm'} ), 0, -5 ) if $INC{'RT.pm'};
-    require RT;
-    RT::LoadConfig();
-    RT::ConnectToDatabase();
-
-    die "Cannot load RT" unless $RT::Handle and $RT::DatabaseType;
-}
-
 # stolen from RT::Handle so we work on 3.6 (cmp_versions came in with 3.8)
 { my %word = (
     a     => -4,
@@ -228,4 +208,4 @@ sub requires_rt {
 
 __END__
 
-#line 348
+#line 328
diff --git a/inc/Module/Install/ReadmeFromPod.pm b/inc/Module/Install/ReadmeFromPod.pm
index fb7075f..6a80818 100644
--- a/inc/Module/Install/ReadmeFromPod.pm
+++ b/inc/Module/Install/ReadmeFromPod.pm
@@ -7,7 +7,7 @@ use warnings;
 use base qw(Module::Install::Base);
 use vars qw($VERSION);
 
-$VERSION = '0.18';
+$VERSION = '0.20';
 
 sub readme_from {
   my $self = shift;

commit 88dcb82a33814cae90f0eda7a165b235e0396782
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Dec 7 21:37:34 2012 +0400

    bump version, 0.03

diff --git a/CHANGES b/CHANGES
index 704bdad..3184960 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+0.03 2012-11-07
+
+    * update Module::Install*
+    * doc updates
+
 0.02 2011-11-22
 
     * set 10 years expiration date on squished content (CSS and JS)
diff --git a/META.yml b/META.yml
index ec4154e..261e4d7 100644
--- a/META.yml
+++ b/META.yml
@@ -27,4 +27,4 @@ requires:
   perl: 5.8.3
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.02
+version: 0.03
diff --git a/lib/RT/Extension/Nginx.pm b/lib/RT/Extension/Nginx.pm
index 540e548..1d0a272 100644
--- a/lib/RT/Extension/Nginx.pm
+++ b/lib/RT/Extension/Nginx.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package RT::Extension::Nginx;
 
-our $VERSION = '0.02';
+our $VERSION = '0.03';
 
 use File::Spec;
 use File::Path qw(make_path);

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