Remove Config::Any from the core dep set

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Optional / Dependencies.pm

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index d7996b8..946cb7a 100644 (file)
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -47,9 +47,9 @@ my $dbic_reqs = {
   },
 
   # a common placeholder for engines with IC::DT support based off DT::F::S
-  _icdt_strptime_based => {
+  _ic_dt_strptime_based => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::Strptime' => '1.2',
         },
@@ -98,8 +98,18 @@ my $dbic_reqs = {
     },
   },
 
+  config_file_reader => {
+    pod => {
+      title => 'Generic config reader',
+      desc => 'Modules required for generic config file parsing, currently Config::Any (rarely used at runtime)',
+    },
+    req => {
+      'Config::Any' => '0.20',
+    },
+  },
+
   admin => {
-    include => '_json_any',
+    include => [qw( _json_any config_file_reader )],
     req => {
       %$moose_basic,
       'MooseX::Types::Path::Class' => '0.05',
@@ -133,9 +143,10 @@ my $dbic_reqs = {
     },
   },
 
-  icdt => {
+  ic_dt => {
     req => {
       'DateTime' => '0.55',
+      'DateTime::TimeZone::OlsonDB' => 0,
     },
     pod => {
       title => 'InflateColumn::DateTime support',
@@ -236,7 +247,7 @@ my $dbic_reqs = {
       desc => 'Modules required to connect to SQLite',
     },
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::SQLite' => '0',
         },
@@ -246,9 +257,9 @@ my $dbic_reqs = {
 
   # centralize the specification, as we have ICDT tests which can
   # test the full behavior of RDBMS-specific ICDT on top of bare SQLite
-  _icdt_pg_base => {
+  _ic_dt_pg_base => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::Pg' => '0.16004',
         },
@@ -256,12 +267,12 @@ my $dbic_reqs = {
     },
   },
 
-  icdt_pg => {
-    include => [qw( icdt _icdt_pg_base )],
+  ic_dt_pg => {
+    include => [qw( ic_dt _ic_dt_pg_base )],
   },
 
   rdbms_pg => {
-    include => '_icdt_pg_base',
+    include => '_ic_dt_pg_base',
     req => {
       # when changing this list make sure to adjust xt/optional_deps.t
       'DBD::Pg' => 0,
@@ -273,7 +284,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_mssql_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_mssql_odbc => {
@@ -304,7 +315,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_msaccess_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_msaccess_odbc => {
@@ -325,9 +336,9 @@ my $dbic_reqs = {
 
   # centralize the specification, as we have ICDT tests which can
   # test the full behavior of RDBMS-specific ICDT on top of bare SQLite
-  _icdt_mysql_base => {
+  _ic_dt_mysql_base => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::MySQL' => '0',
         },
@@ -335,12 +346,12 @@ my $dbic_reqs = {
     },
   },
 
-  icdt_mysql => {
-    include => [qw( icdt _icdt_mysql_base )],
+  ic_dt_mysql => {
+    include => [qw( ic_dt _ic_dt_mysql_base )],
   },
 
   rdbms_mysql => {
-    include => '_icdt_mysql_base',
+    include => '_ic_dt_mysql_base',
     req => {
       'DBD::mysql' => 0,
     },
@@ -360,7 +371,7 @@ my $dbic_reqs = {
       desc => 'Modules required to connect to Oracle',
     },
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::Oracle' => '0',
         },
@@ -369,7 +380,7 @@ my $dbic_reqs = {
   },
 
   rdbms_ase => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
     req => {
       'DBD::Sybase' => 0,
     },
@@ -381,7 +392,7 @@ my $dbic_reqs = {
 
   _rdbms_db2_common => {
     augment => {
-      icdt => {
+      ic_dt => {
         req => {
           'DateTime::Format::DB2' => '0',
         },
@@ -409,7 +420,7 @@ my $dbic_reqs = {
   },
 
   rdbms_informix => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
     req => {
       'DBD::Informix' => 0,
     },
@@ -420,7 +431,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_sqlanywhere_common => {
-    inclide => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_sqlanywhere => {
@@ -443,7 +454,7 @@ my $dbic_reqs = {
   },
 
   _rdbms_firebird_common => {
-    include => '_icdt_strptime_based',
+    include => '_ic_dt_strptime_based',
   },
 
   rdbms_firebird => {
@@ -671,9 +682,19 @@ my $dbic_reqs = {
     # we need to run the dbicadmin so we can self-generate its POD
     # also we do not want surprises in case JSON::XS is in the path
     # so make sure we get an always-working JSON::Any
-    include => [qw( admin_script _json_xs_compatible_json_any )],
+    include => [qw(
+      admin_script
+      _json_xs_compatible_json_any
+      id_shortener
+      deploy
+      test_pod
+      test_podcoverage
+      test_whitespace
+      test_strictures
+    )],
     req => {
       'ExtUtils::MakeMaker' => '6.64',
+      'Module::Install'     => '1.06',
       'Pod::Inherit'        => '0.91',
     },
   },
@@ -867,7 +888,7 @@ sub __envvar_group_desc {
   join '/', @res;
 }
 
-my $groupname_re = qr/ [A-Z_a-z][0-9A-Z_a-z]* /x;
+my $groupname_re = qr/ [a-z_] [0-9_a-z]* /x;
 my $modname_re = qr/ [A-Z_a-z] [0-9A-Z_a-z]* (?:::[0-9A-Z_a-z]+)* /x;
 my $modver_re = qr/ [0-9]+ (?: \. [0-9]+ )? /x;
 
@@ -1227,7 +1248,7 @@ Somewhere in your build-file (e.g. L<ExtUtils::MakeMaker>'s F<Makefile.PL>):
 
   my %DBIC_DEPLOY_AND_ORACLE_DEPS = %{ eval {
     require $class;
-    $class->req_list_for([qw( deploy rdbms_oracle icdt )]);
+    $class->req_list_for([qw( deploy rdbms_oracle ic_dt )]);
   } || {} };
 
   \$EUMM_ARGS{PREREQ_PM} = {