fixed lite_app and plugin generators

mojolicious · Aug 27, 2011 · 5756496 · 5756496
1 parent 1facccc
commit 5756496
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 This file documents the revision history for Perl extension Mojolicious.
 
 1.94    2011-08-27 00:00:00
+        - Fixed lite_app and plugin generators.
         - Fixed typos.
 
 1.93    2011-08-27 00:00:00

diff --git a/lib/Mojolicious/Command/generate/lite_app.pm b/lib/Mojolicious/Command/generate/lite_app.pm
@@ -13,9 +13,6 @@ EOF
 sub run {
   my ($self, $name) = @_;
   $name ||= 'myapp.pl';
-  $self->renderer->line_start('%%');
-  $self->renderer->tag_start('<%%');
-  $self->renderer->tag_end('%%>');
   $self->render_to_rel_file('liteapp', $name);
   $self->chmod_file($name, 0744);
 }
@@ -24,7 +21,7 @@ sub run {
 __DATA__
 
 @@ liteapp
-%% my $class = shift;
+% my $class = shift;
 #!/usr/bin/env perl
 use Mojolicious::Lite;
 
@@ -37,17 +34,17 @@ get '/welcome' => sub {
 };
 
 app->start;
-<%%%%>__DATA__
+<% %>__DATA__
 
-<%%%%>@@ index.html.ep
-% layout 'default';
-% title 'Welcome';
+<% %>@@ index.html.ep
+%% layout 'default';
+%% title 'Welcome';
 Welcome to Mojolicious!
 
-<%%%%>@@ layouts/default.html.ep
+<% %>@@ layouts/default.html.ep
 <!doctype html><html>
-  <head><title><%= title %></title></head>
-  <body><%= content %></body>
+  <head><title><%%= title %></title></head>
+  <body><%%= content %></body>
 </html>
 
 __END__

diff --git a/lib/Mojolicious/Command/generate/makefile.pm b/lib/Mojolicious/Command/generate/makefile.pm
@@ -36,7 +36,7 @@ WriteMakefile(
   VERSION_FROM => 'lib/<%= $path %>',
   AUTHOR       => 'A Good Programmer <nospam@cpan.org>',
   EXE_FILES    => ['script/<%= $name %>'],
-  PREREQ_PM    => {'Mojolicious' => '1.80'},
+  PREREQ_PM    => {'Mojolicious' => '1.90'},
   test         => {TESTS => 't/*.t'}
 );
 

diff --git a/lib/Mojolicious/Command/generate/plugin.pm b/lib/Mojolicious/Command/generate/plugin.pm
@@ -48,40 +48,40 @@ sub register {
 }
 
 1;
-<%%>__END__
+<% %>__END__
 
-<%%>=head1 NAME
+<% %>=head1 NAME
 
 <%= $class %> - Mojolicious Plugin
 
-<%%>=head1 SYNOPSIS
+<% %>=head1 SYNOPSIS
 
   # Mojolicious
   $self->plugin('<%= $name %>');
 
   # Mojolicious::Lite
   plugin '<%= $name %>';
 
-<%%>=head1 DESCRIPTION
+<% %>=head1 DESCRIPTION
 
 L<<%= $class %>> is a L<Mojolicious> plugin.
 
-<%%>=head1 METHODS
+<% %>=head1 METHODS
 
 L<<%= $class %>> inherits all methods from
 L<Mojolicious::Plugin> and implements the following new ones.
 
-<%%>=head2 C<register>
+<% %>=head2 C<register>
 
   $plugin->register;
 
 Register plugin in L<Mojolicious> application.
 
-<%%>=head1 SEE ALSO
+<% %>=head1 SEE ALSO
 
 L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>.
 
-<%%>=cut
+<% %>=cut
 
 @@ test
 % my $name = shift;
@@ -116,7 +116,7 @@ WriteMakefile(
   NAME         => '<%= $class %>',
   VERSION_FROM => 'lib/<%= $path %>',
   AUTHOR       => 'A Good Programmer <nospam@cpan.org>',
-  PREREQ_PM    => {'Mojolicious' => '1.80'},
+  PREREQ_PM    => {'Mojolicious' => '1.90'},
   test         => {TESTS => 't/*.t'}
 );