[libcode-tidyall-perl] 284/374: Adjust MasonTidy plugin for new API

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libcode-tidyall-perl.

commit 6434648a2ffe02fc17bb65ab627820eeaad9a58f
Author: Jonathan Swartz <swartz at pobox.com>
Date:   Sun Sep 30 04:31:59 2012 -0700

    Adjust MasonTidy plugin for new API
---
 lib/Code/TidyAll/Plugin/MasonTidy.pm   |   12 ++++--------
 lib/Code/TidyAll/t/Plugin/MasonTidy.pm |   13 +++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/Code/TidyAll/Plugin/MasonTidy.pm b/lib/Code/TidyAll/Plugin/MasonTidy.pm
index f9724b9..e7c4daf 100644
--- a/lib/Code/TidyAll/Plugin/MasonTidy.pm
+++ b/lib/Code/TidyAll/Plugin/MasonTidy.pm
@@ -1,6 +1,6 @@
 package Code::TidyAll::Plugin::MasonTidy;
-use Capture::Tiny qw(capture_merged);
 use Mason::Tidy;
+use Mason::Tidy::App;
 use Moo;
 use Text::ParseWords qw(shellwords);
 extends 'Code::TidyAll::Plugin';
@@ -10,13 +10,9 @@ sub _build_cmd { 'masontidy' }
 sub transform_source {
     my ( $self, $source ) = @_;
 
-    my %params;
-    my $argv_list = [ shellwords( $self->argv ) ];
-    my $opts_good;
-    my $output = capture_merged { $opts_good = Mason::Tidy->get_options( $argv_list, \%params ) };
-    die $output if !$opts_good;
-    die sprintf( "unrecognized arguments '%s'", join( " ", @$argv_list ) ) if @$argv_list;
-    my $mt   = Mason::Tidy->new(%params);
+    local @ARGV = shellwords( $self->argv );
+    local $ENV{MASONTIDY_OPT};
+    my $mt   = Mason::Tidy::App->run($source);
     my $dest = $mt->tidy($source);
     return $dest;
 }
diff --git a/lib/Code/TidyAll/t/Plugin/MasonTidy.pm b/lib/Code/TidyAll/t/Plugin/MasonTidy.pm
index 75f9b7f..df62bf6 100644
--- a/lib/Code/TidyAll/t/Plugin/MasonTidy.pm
+++ b/lib/Code/TidyAll/t/Plugin/MasonTidy.pm
@@ -9,21 +9,22 @@ sub test_main : Tests {
     $source = '%if($foo) {\n%bar(1,2);\n%}';
     $self->tidyall(
         source      => $source,
-        expect_tidy => '% if ($foo) {\n%     bar( 1, 2 );\n% }'
+        conf        => { argv => '-m 1' },
+        expect_tidy => '% if ($foo) {\n%     bar( 1, 2 );\n% }\n'
     );
     $self->tidyall(
         source      => $source,
-        conf        => { argv => '--perltidy-argv="-pt=2 -i=3"' },
-        expect_tidy => '% if ($foo) {\n%    bar(1, 2);\n% }'
+        conf        => { argv => '-m 1 --perltidy-argv="-pt=2 -i=3"' },
+        expect_tidy => '% if ($foo) {\n%    bar(1, 2);\n% }\n'
     );
     $self->tidyall(
         source      => $source,
-        conf        => { argv => '--perltidy-line-argv=" "' },
-        expect_tidy => '% if ($foo) {\n%     bar( 1, 2 );\n% }'
+        conf        => { argv => '-m 2 --perltidy-line-argv=" "' },
+        expect_tidy => '% if ($foo) {\n%     bar( 1, 2 );\n% }\n'
     );
     $self->tidyall(
         source       => $source,
-        conf         => { argv => '--badoption' },
+        conf         => { argv => '-m 1 --badoption' },
         expect_error => qr/Unknown option: badoption/
     );
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcode-tidyall-perl.git