Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge retidied

  • Loading branch information...
commit 5e5c49ddd5d024c8efeab9a4d866ebb056e216af 2 parents 6aa0fa1 + 31ad273
Jonathan Swartz authored
1  .perltidyrc
View
@@ -1 +0,0 @@
--noll -l=100
2  MANIFEST.SKIP
View
@@ -22,9 +22,11 @@
^lib/Pod
^localcpan
^misc
+^perlcritic
^profile
^release
^t/make
+^tidyall.ini
^tmp
^weaver.ini
^wiki
18 lib/Mason/Compilation.pm
View
@@ -735,14 +735,18 @@ method _output_cmeta () {
class => 'CLASS',
interp => '$interp',
);
- return join( "\n",
+ return join(
+ "\n",
"method _set_class_cmeta (\$interp) {",
"\$_class_cmeta = \$interp->component_class_meta_class->new(",
- ( map { sprintf( "'%s' => %s,", $_, $cmeta_info{$_} ) } sort( keys(%cmeta_info) ) ),
- ');',
- '}',
+ (
+ map { sprintf( "'%s' => %s,", $_, $cmeta_info{$_} ) }
+ sort( keys(%cmeta_info) )
+ ),
+ ');', '}',
'sub _unset_class_cmeta { undef $_class_cmeta }',
- 'sub _class_cmeta { $_class_cmeta }' );
+ 'sub _class_cmeta { $_class_cmeta }'
+ );
}
method _output_compiled_component () {
@@ -825,8 +829,8 @@ method _output_methods () {
# Sort methods so that modifiers come after
#
- my @sorted_methods_keys = sort { ( index( $a, ' ' ) <=> index( $b, ' ' ) ) || $a cmp $b }
- keys( %{ $self->{methods} } );
+ my @sorted_methods_keys =
+ sort { ( index( $a, ' ' ) <=> index( $b, ' ' ) ) || $a cmp $b } keys( %{ $self->{methods} } );
return
join( "\n", map { $self->_output_method( $self->{methods}->{$_} ) } @sorted_methods_keys );
}
2  lib/Mason/Request.pm
View
@@ -83,7 +83,7 @@ method capture ($code) {
my $output;
{
$self->_push_buffer;
- scope_guard { $output = ${ $self->_current_buffer }; $self->_pop_buffer };
+ scope_guard { $output = ${ $self->_current_buffer }; $self->_pop_buffer; };
$code->();
}
return $output;
2  lib/Mason/Test/Class.pm
View
@@ -22,7 +22,7 @@ sub temp_root { $_[0]->{temp_root} }
# RW class accessors
my $default_plugins = [];
-sub default_plugins { $default_plugins = $_[1] if defined( $_[1] ); $default_plugins }
+sub default_plugins { $default_plugins = $_[1] if defined( $_[1] ); $default_plugins; }
my $gen_path_count = 0;
my $parse_count = 0;
3  lib/Mason/Test/Overrides/Component/StrictMoose.pm
View
@@ -4,6 +4,9 @@ use MooseX::StrictConstructor ();
use strict;
use warnings;
use base qw(Mason::Component::Moose);
+use strict;
+use warnings;
+
Moose::Exporter->setup_import_methods();
sub init_meta {
1  lib/Pod/Weaver/Section/SeeAlsoMason.pm
View
@@ -29,5 +29,4 @@ sub weave_section {
__PACKAGE__->meta->make_immutable();
-no Moose;
1;
8 perlcriticrc
View
@@ -0,0 +1,8 @@
+only = 1
+severity = 1
+verbose = %m at %f line %l [%p]\n
+
+[Moose::RequireMakeImmutable]
+[TestingAndDebugging::RequireUseStrict]
+equivalent_modules = Test::Class::Most Mason::Moose Mason::PluginRole
+[Variables::ProhibitConditionalDeclarations]
5 t/mason-app.t
View
@@ -9,7 +9,12 @@ my $tempdir = tempdir( 'mason-app-XXXX', TMPDIR => 1, CLEANUP => 1 );
my $comp_file = "$tempdir/hello.mc";
write_file( $comp_file, "%% has 'd';\nd * 2 = <% \$.d * 2 %>" );
+<<<<<<< HEAD
# Ugly string escaping for Windows
+=======
+# This string escaping may look ugly, but it is only way to make it work under
+# Windows
+>>>>>>> 31ad27340fa96c27b0ec358f31990791dd599b0c
my $output = `$^X bin/mason.pl $comp_file --data-dir $tempdir/data --args "{\\"d\\":\\"4\\"}"`;
is( $output, "d * 2 = 8\n", 'correct output' );
ok( -f "$tempdir/data/obj/hello.mc.mobj", "object file exists" );
7 tidyall.ini
View
@@ -1,12 +1,15 @@
tidyall_class = JS::Code::TidyAll
[PerlTidy]
-argv = -noll
+argv = -noll -l=100
select = {bin,lib,t}/**/*.{pl,pm,t}
+modes = editor
[PodTidy]
select = {bin,lib}/**/*.{pl,pm,pod}
+modes = editor
[PerlCritic]
select = lib/**/*.pm
-argv = --profile $ROOT/.perlcriticrc
+argv = --profile $ROOT/perlcriticrc
+
Please sign in to comment.
Something went wrong with that request. Please try again.