[Bps-public-commit] Shipwright branch, master, updated. 0a0238c6810f7507a67a07d7119d758da6505436

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  0a0238c6810f7507a67a07d7119d758da6505436 (commit)
      from  21a3489753cf385486f608ace7384b4930f3747d (commit)

Summary of changes:
 META.yml               |    2 --
 Makefile.PL            |    9 ---------
 lib/Shipwright/Util.pm |   31 ++++++-------------------------
 t/05.util.t            |    2 +-
 4 files changed, 7 insertions(+), 37 deletions(-)

- Log -----------------------------------------------------------------
commit 0a0238c6810f7507a67a07d7119d758da6505436
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Sep 11 16:37:29 2009 +0800

    remove YAML and YAML::Syck deps: YAML::Tiny is enough for us

diff --git a/META.yml b/META.yml
index 6546056..f22ecb7 100644
--- a/META.yml
+++ b/META.yml
@@ -37,7 +37,6 @@ requires:
   File::Slurp: 0
   File::Spec: 0
   File::Temp: 0
-  Hash::Merge: 0
   IO::Uncompress::Bunzip2: 0
   IO::Uncompress::RawInflate: 2.012
   IPC::Run3: 0
@@ -47,7 +46,6 @@ requires:
   Module::CoreList: 0
   Module::Info: 0
   UNIVERSAL::require: 0
-  YAML::Syck: 0.71
   YAML::Tiny: 0
   perl: 5.8.8
   version: 0
diff --git a/Makefile.PL b/Makefile.PL
index ed8dac3..1c589f5 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -35,15 +35,6 @@ requires 'Archive::Extract' => 0;
 requires 'File::Compare' => 0;
 requires 'File::Path' => 2.07;
 
-
-if ( can_cc() ) {
-    requires( 'YAML::Syck' => 0.71 );
-}
-else {
-    requires( 'YAML' => 0.35 ) unless can_use( 'YAML::Syck' => 0.71 );
-}
-
-
 no_index( directory => 't' );
 no_index( directory => 'xt' );
 
diff --git a/lib/Shipwright/Util.pm b/lib/Shipwright/Util.pm
index e9247c2..0f24e10 100644
--- a/lib/Shipwright/Util.pm
+++ b/lib/Shipwright/Util.pm
@@ -8,41 +8,22 @@ use File::Spec::Functions qw/catfile catdir splitpath splitdir tmpdir rel2abs/;
 use Cwd qw/abs_path/;
 
 use Shipwright;    # we need this to find where Shipwright.pm lives
+use YAML::Tiny;
 
 our ( $SHIPWRIGHT_ROOT, $SHARE_ROOT );
 
 BEGIN {
-    local $@;
-    eval { require YAML::Syck; };
-    if ($@) {
-        require YAML;
-        *Load     = *YAML::Load;
-        *Dump     = *YAML::Dump;
-        *LoadFile = *YAML::LoadFile;
-        *DumpFile = *YAML::DumpFile;
-    }
-    else {
-        *Load     = *YAML::Syck::Load;
-        *Dump     = *YAML::Syck::Dump;
-        *LoadFile = *YAML::Syck::LoadFile;
-        *DumpFile = *YAML::Syck::DumpFile;
-    }
+    *Load     = *YAML::Tiny::Load;
+    *Dump     = *YAML::Tiny::Dump;
+    *LoadFile = *YAML::Tiny::LoadFile;
+    *DumpFile = *YAML::Tiny::DumpFile;
 }
 
-=head2 Load
+=head2 Load, LoadFile, Dump, DumpFile
 to make pod-coverage.t happy.
 Load, LoadFile, Dump and DumpFile are just dropped in from YAML or YAML::Syck
 =cut
 
-=head2 LoadFile
-=cut
-
-=head2 Dump
-=cut
-
-=head2 DumpFile
-=cut
-
 =head2 run
 
 a wrapper of run3 sub in IPC::Run3.
diff --git a/t/05.util.t b/t/05.util.t
index 3506eda..45d5221 100644
--- a/t/05.util.t
+++ b/t/05.util.t
@@ -52,7 +52,7 @@ like( $out, qr/ok/, "normal code run" );
 
 my $hashref = { foo => 'bar' };
 my $string = <<EOF;
---- 
+---
 foo: bar
 EOF
 

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