Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge retidied

  • Loading branch information...
commit 5e5c49ddd5d024c8efeab9a4d866ebb056e216af 2 parents 6aa0fa1 + 31ad273
Jonathan Swartz authored
1  .perltidyrc
... ...
@@ -1 +0,0 @@
1  
--noll -l=100
2  MANIFEST.SKIP
@@ -22,9 +22,11 @@
22 22
 ^lib/Pod
23 23
 ^localcpan
24 24
 ^misc
  25
+^perlcritic
25 26
 ^profile
26 27
 ^release
27 28
 ^t/make
  29
+^tidyall.ini
28 30
 ^tmp
29 31
 ^weaver.ini
30 32
 ^wiki
18  lib/Mason/Compilation.pm
@@ -735,14 +735,18 @@ method _output_cmeta () {
735 735
         class        => 'CLASS',
736 736
         interp       => '$interp',
737 737
     );
738  
-    return join( "\n",
  738
+    return join(
  739
+        "\n",
739 740
         "method _set_class_cmeta (\$interp) {",
740 741
         "\$_class_cmeta = \$interp->component_class_meta_class->new(",
741  
-        ( map { sprintf( "'%s' => %s,", $_, $cmeta_info{$_} ) } sort( keys(%cmeta_info) ) ),
742  
-        ');',
743  
-        '}',
  742
+        (
  743
+            map { sprintf( "'%s' => %s,", $_, $cmeta_info{$_} ) }
  744
+            sort( keys(%cmeta_info) )
  745
+        ),
  746
+        ');', '}',
744 747
         'sub _unset_class_cmeta { undef $_class_cmeta }',
745  
-        'sub _class_cmeta { $_class_cmeta }' );
  748
+        'sub _class_cmeta { $_class_cmeta }'
  749
+    );
746 750
 }
747 751
 
748 752
 method _output_compiled_component () {
@@ -825,8 +829,8 @@ method _output_methods () {
825 829
 
826 830
     # Sort methods so that modifiers come after
827 831
     #
828  
-    my @sorted_methods_keys = sort { ( index( $a, ' ' ) <=> index( $b, ' ' ) ) || $a cmp $b }
829  
-      keys( %{ $self->{methods} } );
  832
+    my @sorted_methods_keys =
  833
+      sort { ( index( $a, ' ' ) <=> index( $b, ' ' ) ) || $a cmp $b } keys( %{ $self->{methods} } );
830 834
     return
831 835
       join( "\n", map { $self->_output_method( $self->{methods}->{$_} ) } @sorted_methods_keys );
832 836
 }
2  lib/Mason/Request.pm
@@ -83,7 +83,7 @@ method capture ($code) {
83 83
     my $output;
84 84
     {
85 85
         $self->_push_buffer;
86  
-        scope_guard { $output = ${ $self->_current_buffer }; $self->_pop_buffer };
  86
+        scope_guard { $output = ${ $self->_current_buffer }; $self->_pop_buffer; };
87 87
         $code->();
88 88
     }
89 89
     return $output;
2  lib/Mason/Test/Class.pm
@@ -22,7 +22,7 @@ sub temp_root { $_[0]->{temp_root} }
22 22
 
23 23
 # RW class accessors
24 24
 my $default_plugins = [];
25  
-sub default_plugins { $default_plugins = $_[1] if defined( $_[1] ); $default_plugins }
  25
+sub default_plugins { $default_plugins = $_[1] if defined( $_[1] ); $default_plugins; }
26 26
 
27 27
 my $gen_path_count = 0;
28 28
 my $parse_count    = 0;
3  lib/Mason/Test/Overrides/Component/StrictMoose.pm
@@ -4,6 +4,9 @@ use MooseX::StrictConstructor ();
4 4
 use strict;
5 5
 use warnings;
6 6
 use base qw(Mason::Component::Moose);
  7
+use strict;
  8
+use warnings;
  9
+
7 10
 Moose::Exporter->setup_import_methods();
8 11
 
9 12
 sub init_meta {
1  lib/Pod/Weaver/Section/SeeAlsoMason.pm
@@ -29,5 +29,4 @@ sub weave_section {
29 29
 
30 30
 __PACKAGE__->meta->make_immutable();
31 31
 
32  
-no Moose;
33 32
 1;
8  perlcriticrc
... ...
@@ -0,0 +1,8 @@
  1
+only = 1
  2
+severity = 1
  3
+verbose = %m at %f line %l [%p]\n
  4
+
  5
+[Moose::RequireMakeImmutable]
  6
+[TestingAndDebugging::RequireUseStrict]
  7
+equivalent_modules = Test::Class::Most Mason::Moose Mason::PluginRole
  8
+[Variables::ProhibitConditionalDeclarations]
5  t/mason-app.t
@@ -9,7 +9,12 @@ my $tempdir = tempdir( 'mason-app-XXXX', TMPDIR => 1, CLEANUP => 1 );
9 9
 my $comp_file = "$tempdir/hello.mc";
10 10
 write_file( $comp_file, "%% has 'd';\nd * 2 = <% \$.d * 2 %>" );
11 11
 
  12
+<<<<<<< HEAD
12 13
 # Ugly string escaping for Windows
  14
+=======
  15
+# This string escaping may look ugly, but it is only way to make it work under
  16
+# Windows
  17
+>>>>>>> 31ad27340fa96c27b0ec358f31990791dd599b0c
13 18
 my $output = `$^X bin/mason.pl $comp_file --data-dir $tempdir/data --args "{\\"d\\":\\"4\\"}"`;
14 19
 is( $output, "d * 2 = 8\n", 'correct output' );
15 20
 ok( -f "$tempdir/data/obj/hello.mc.mobj", "object file exists" );
7  tidyall.ini
... ...
@@ -1,12 +1,15 @@
1 1
 tidyall_class = JS::Code::TidyAll
2 2
 
3 3
 [PerlTidy]
4  
-argv = -noll
  4
+argv = -noll -l=100
5 5
 select = {bin,lib,t}/**/*.{pl,pm,t}
  6
+modes = editor
6 7
 
7 8
 [PodTidy]
8 9
 select = {bin,lib}/**/*.{pl,pm,pod}
  10
+modes = editor
9 11
 
10 12
 [PerlCritic]
11 13
 select = lib/**/*.pm
12  
-argv = --profile $ROOT/.perlcriticrc
  14
+argv = --profile $ROOT/perlcriticrc
  15
+

0 notes on commit 5e5c49d

Please sign in to comment.
Something went wrong with that request. Please try again.