135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

depend on Dancer version with fixed YAML::XS support

Browse Source
This commit is contained in:
Oliver Gorwits
2014-10-19 13:33:50 +01:00
parent d2dbaf416b
commit 8d51e69563
12 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/META.yml
View File

@@ -10,7 +10,7 @@ configure_requires:
ExtUtils::MakeMaker: 6.59 ExtUtils::MakeMaker: 6.59
distribution_type: module distribution_type: module
dynamic_config: 1 dynamic_config: 1
generated_by: 'Module::Install version 1.12' generated_by: 'Module::Install version 1.06'
license: bsd license: bsd
meta-spec: meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -38,7 +38,7 @@ requires:
DBIx::Class: 0.0827 DBIx::Class: 0.0827
DBIx::Class::Helpers: 2.018004 DBIx::Class::Helpers: 2.018004
Daemon::Control: 0.001 Daemon::Control: 0.001
Dancer: 1.3112 Dancer: 1.3131_1
Dancer::Plugin::Auth::Extensible: 0.3 Dancer::Plugin::Auth::Extensible: 0.3
Dancer::Plugin::DBIC: 0.2001 Dancer::Plugin::DBIC: 0.2001
Dancer::Plugin::Passphrase: 2.0.1 Dancer::Plugin::Passphrase: 2.0.1
@@ -90,4 +90,4 @@ resources:
homepage: http://netdisco.org/ homepage: http://netdisco.org/
license: http://opensource.org/licenses/bsd-license.php license: http://opensource.org/licenses/bsd-license.php
repository: git://git.code.sf.net/p/netdisco/netdisco-ng repository: git://git.code.sf.net/p/netdisco/netdisco-ng
version: '2.029012' version: 2.029012

2
Netdisco/Makefile.PL
View File

@@ -19,7 +19,7 @@ requires 'DBD::Pg' => 0;
requires 'DBIx::Class' => 0.08270; requires 'DBIx::Class' => 0.08270;
requires 'DBIx::Class::Helpers' => 2.018004; requires 'DBIx::Class::Helpers' => 2.018004;
requires 'Daemon::Control' => 0.001000; requires 'Daemon::Control' => 0.001000;
requires 'Dancer' => 1.3112; requires 'Dancer' => '1.3131_1';
requires 'Dancer::Plugin::DBIC' => 0.2001; requires 'Dancer::Plugin::DBIC' => 0.2001;
requires 'Dancer::Plugin::Auth::Extensible' => 0.30; requires 'Dancer::Plugin::Auth::Extensible' => 0.30;
requires 'Dancer::Plugin::Passphrase' => '2.0.1'; requires 'Dancer::Plugin::Passphrase' => '2.0.1';

18
Netdisco/inc/Module/Install.pm
View File

@@ -17,7 +17,7 @@ package Module::Install;
# 3. The ./inc/ version of Module::Install loads # 3. The ./inc/ version of Module::Install loads
# } # }
use 5.006; use 5.005;
use strict 'vars'; use strict 'vars';
use Cwd (); use Cwd ();
use File::Find (); use File::Find ();
@@ -31,7 +31,7 @@ BEGIN {
# This is not enforced yet, but will be some time in the next few # This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom # releases once we can make sure it won't clash with custom
# Module::Install extensions. # Module::Install extensions.
$VERSION = '1.12'; $VERSION = '1.06';
# Storage for the pseudo-singleton # Storage for the pseudo-singleton
$MAIN = undef; $MAIN = undef;
@@ -156,10 +156,10 @@ END_DIE
sub autoload { sub autoload {
my $self = shift; my $self = shift;
my $who = $self->_caller; my $who = $self->_caller;
my $cwd = Cwd::getcwd(); my $cwd = Cwd::cwd();
my $sym = "${who}::AUTOLOAD"; my $sym = "${who}::AUTOLOAD";
$sym->{$cwd} = sub { $sym->{$cwd} = sub {
my $pwd = Cwd::getcwd(); my $pwd = Cwd::cwd();
if ( my $code = $sym->{$pwd} ) { if ( my $code = $sym->{$pwd} ) {
# Delegate back to parent dirs # Delegate back to parent dirs
goto &$code unless $cwd eq $pwd; goto &$code unless $cwd eq $pwd;
@@ -239,7 +239,7 @@ sub new {
# ignore the prefix on extension modules built from top level. # ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin); my $base_path = Cwd::abs_path($FindBin::Bin);
unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) { unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
delete $args{prefix}; delete $args{prefix};
} }
return $args{_self} if $args{_self}; return $args{_self} if $args{_self};
@@ -338,7 +338,7 @@ sub find_extensions {
if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
my $content = Module::Install::_read($subpath . '.pm'); my $content = Module::Install::_read($subpath . '.pm');
my $in_pod = 0; my $in_pod = 0;
foreach ( split /\n/, $content ) { foreach ( split //, $content ) {
$in_pod = 1 if /^=\w/; $in_pod = 1 if /^=\w/;
$in_pod = 0 if /^=cut/; $in_pod = 0 if /^=cut/;
next if ($in_pod || /^=cut/); # skip pod text next if ($in_pod || /^=cut/); # skip pod text
@@ -434,7 +434,7 @@ END_OLD
# _version is for processing module versions (eg, 1.03_05) not # _version is for processing module versions (eg, 1.03_05) not
# Perl versions (eg, 5.8.1). # Perl versions (eg, 5.8.1).
sub _version { sub _version ($) {
my $s = shift || 0; my $s = shift || 0;
my $d =()= $s =~ /(\.)/g; my $d =()= $s =~ /(\.)/g;
if ( $d >= 2 ) { if ( $d >= 2 ) {
@@ -450,12 +450,12 @@ sub _version {
return $l + 0; return $l + 0;
} }
sub _cmp { sub _cmp ($$) {
_version($_[1]) <=> _version($_[2]); _version($_[1]) <=> _version($_[2]);
} }
# Cloned from Params::Util::_CLASS # Cloned from Params::Util::_CLASS
sub _CLASS { sub _CLASS ($) {
( (
defined $_[0] defined $_[0]
and and

2
Netdisco/inc/Module/Install/Base.pm
View File

@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars'; use strict 'vars';
use vars qw{$VERSION}; use vars qw{$VERSION};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
} }
# Suspend handler for "redefined" warnings # Suspend handler for "redefined" warnings

2
Netdisco/inc/Module/Install/Can.pm
View File

@@ -8,7 +8,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/Fetch.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

4
Netdisco/inc/Module/Install/Makefile.pm
View File

@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }
@@ -133,7 +133,7 @@ sub makemaker_args {
return $args; return $args;
} }
# For mm args that take multiple space-separated args, # For mm args that take multiple space-seperated args,
# append an argument to the current list. # append an argument to the current list.
sub makemaker_append { sub makemaker_append {
my $self = shift; my $self = shift;

6
Netdisco/inc/Module/Install/Metadata.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }
@@ -347,7 +347,7 @@ sub name_from {
^ \s* ^ \s*
package \s* package \s*
([\w:]+) ([\w:]+)
[\s|;]* \s* ;
/ixms /ixms
) { ) {
my ($name, $module_name) = ($1, $1); my ($name, $module_name) = ($1, $1);
@@ -705,7 +705,7 @@ sub _write_mymeta_data {
my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
my $meta = $yaml[0]; my $meta = $yaml[0];
# Overwrite the non-configure dependency hashes # Overwrite the non-configure dependency hashs
delete $meta->{requires}; delete $meta->{requires};
delete $meta->{build_requires}; delete $meta->{build_requires};
delete $meta->{recommends}; delete $meta->{recommends};

2
Netdisco/inc/Module/Install/Scripts.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/Share.pm
View File

@@ -8,7 +8,7 @@ use ExtUtils::Manifest ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/Win32.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
@ISA = 'Module::Install::Base'; @ISA = 'Module::Install::Base';
$ISCORE = 1; $ISCORE = 1;
} }

2
Netdisco/inc/Module/Install/WriteAll.pm
View File

@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE}; use vars qw{$VERSION @ISA $ISCORE};
BEGIN { BEGIN {
$VERSION = '1.12'; $VERSION = '1.06';
@ISA = qw{Module::Install::Base}; @ISA = qw{Module::Install::Base};
$ISCORE = 1; $ISCORE = 1;
} }