From 30324cc116637f24c9ff92de8e5dc0e04e09e232 Mon Sep 17 00:00:00 2001 From: milescrawford Date: Wed, 29 Jul 2015 13:51:16 -0700 Subject: Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..c4938b5 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# cpan-rest-client +REST::Client module for CPAN. -- cgit v1.2.3 From 09cb6c48b488cbbc53deff3501a96b104152f358 Mon Sep 17 00:00:00 2001 From: Miles Crawford Date: Wed, 29 Jul 2015 13:52:18 -0700 Subject: update readme for test commit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c4938b5..d08453d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ -# cpan-rest-client +# REST::Client REST::Client module for CPAN. + +See http://search.cpan.org/~mcrawfor/REST-Client-272/lib/REST/Client.pm -- cgit v1.2.3 From 80abdf03e30c77b6282cecb9fc0e94216113f282 Mon Sep 17 00:00:00 2001 From: Miles Crawford Date: Wed, 29 Jul 2015 13:54:41 -0700 Subject: Import to github --- CHANGES | 66 +++++ META.yml | 28 ++ Makefile.PL | 11 + inc/Module/Install.pm | 445 ++++++++++++++++++++++++++++ inc/Module/Install/Base.pm | 78 +++++ inc/Module/Install/Can.pm | 81 ++++++ inc/Module/Install/Fetch.pm | 93 ++++++ inc/Module/Install/Makefile.pm | 300 +++++++++++++++++++ inc/Module/Install/Metadata.pm | 647 +++++++++++++++++++++++++++++++++++++++++ inc/Module/Install/Win32.pm | 64 ++++ inc/Module/Install/WriteAll.pm | 60 ++++ lib/REST/Client.pm | 548 ++++++++++++++++++++++++++++++++++ t/basic.t | 163 +++++++++++ 13 files changed, 2584 insertions(+) create mode 100644 CHANGES create mode 100644 META.yml create mode 100644 Makefile.PL create mode 100644 inc/Module/Install.pm create mode 100644 inc/Module/Install/Base.pm create mode 100644 inc/Module/Install/Can.pm create mode 100644 inc/Module/Install/Fetch.pm create mode 100644 inc/Module/Install/Makefile.pm create mode 100644 inc/Module/Install/Metadata.pm create mode 100644 inc/Module/Install/Win32.pm create mode 100644 inc/Module/Install/WriteAll.pm create mode 100644 lib/REST/Client.pm create mode 100644 t/basic.t diff --git a/CHANGES b/CHANGES new file mode 100644 index 0000000..3d35d0c --- /dev/null +++ b/CHANGES @@ -0,0 +1,66 @@ +272 +* Fix bug that didn't allow false PUT content. Thanks Thomas Hörndlein! + +271 +* Move to LWP 6.x style SSL setup. Thanks Martin Drasar and Joel Crosswhite, + for reports and testing. + +249 +* Remove Makefile from distribution. + +245 +* Fix test dependencies. + +243 +* Gave up on counting tests correctly, use done_testing(). + +240 +* Fix embarassing test-count mismatch. Thanks Wes Young. + +236 +* Added PATCH support by applying Scott Call's PATCH patch. Thanks! + +217 +* Disabled use of http::server::simple on windows, suggested by + Adam Kennedy, thanks. + +171 +* Improved POD with better organization and a fix suggested by + Joshua Barratt (Thanks!) +* Added support for PKCS12 certificates in the config API, + suggested by Sabst (Thanks!) + +164 +* Added a responseHeaders() method +* Added sanity tests of responseHeaders() and responseHeader() + +150 +* Made the tests smarter about skipping when required libs not present. + +134 +* Added a method for accessing the LWP::UserAgent. +* Added user agent config. +* Cached user agent for all requests. +* Improved pod. +* Basic tests. + +118 +* Changed default behavior to not follow redirects. +* Added an option to re-enable original auto-following behavior. + +95 +*Fixed http://rt.cpan.org/Public/Bug/Display.html?id=43819 - thanks Russ. + +88 +* Added html content-type detection to responseXPath to avoid xmlns issues when parsing html/xhtml. + +62 +* Switched to parse_string in the XPath convienince function. parse_html_string was causing + trouble with plain XML. + +57 +*added changes +*unmade a CPAN mistake + +56 +*initial release diff --git a/META.yml b/META.yml new file mode 100644 index 0000000..bda6a65 --- /dev/null +++ b/META.yml @@ -0,0 +1,28 @@ +--- +abstract: 'A simple client for interacting with RESTful http/https resources' +author: + - 'Miles Crawford, ' +build_requires: + ExtUtils::MakeMaker: 6.42 + Test::More: 0.8 +configure_requires: + ExtUtils::MakeMaker: 6.42 +distribution_type: module +generated_by: 'Module::Install version 0.92' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: REST-Client +no_index: + directory: + - inc + - t +requires: + Crypt::SSLeay: 0 + LWP::UserAgent: 0 + URI: 0 + perl: 5.8.0 +resources: + license: http://dev.perl.org/licenses/ +version: 272 diff --git a/Makefile.PL b/Makefile.PL new file mode 100644 index 0000000..182cc29 --- /dev/null +++ b/Makefile.PL @@ -0,0 +1,11 @@ +use inc::Module::Install; + +name 'REST-Client'; +all_from 'lib/REST/Client.pm'; + +requires 'URI' => 0; +requires 'LWP::UserAgent' => 0; +requires 'Crypt::SSLeay' => 0; +test_requires 'Test::More' => '0.8'; + +WriteAll(); diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm new file mode 100644 index 0000000..aceb4de --- /dev/null +++ b/inc/Module/Install.pm @@ -0,0 +1,445 @@ +#line 1 +package Module::Install; + +# For any maintainers: +# The load order for Module::Install is a bit magic. +# It goes something like this... +# +# IF ( host has Module::Install installed, creating author mode ) { +# 1. Makefile.PL calls "use inc::Module::Install" +# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install +# 3. The installed version of inc::Module::Install loads +# 4. inc::Module::Install calls "require Module::Install" +# 5. The ./inc/ version of Module::Install loads +# } ELSE { +# 1. Makefile.PL calls "use inc::Module::Install" +# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install +# 3. The ./inc/ version of Module::Install loads +# } + +use 5.005; +use strict 'vars'; + +use vars qw{$VERSION $MAIN}; +BEGIN { + # All Module::Install core packages now require synchronised versions. + # This will be used to ensure we don't accidentally load old or + # different versions of modules. + # 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 + # Module::Install extensions. + $VERSION = '0.92'; + + # Storage for the pseudo-singleton + $MAIN = undef; + + *inc::Module::Install::VERSION = *VERSION; + @inc::Module::Install::ISA = __PACKAGE__; + +} + + + + + +# Whether or not inc::Module::Install is actually loaded, the +# $INC{inc/Module/Install.pm} is what will still get set as long as +# the caller loaded module this in the documented manner. +# If not set, the caller may NOT have loaded the bundled version, and thus +# they may not have a MI version that works with the Makefile.PL. This would +# result in false errors or unexpected behaviour. And we don't want that. +my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; +unless ( $INC{$file} ) { die <<"END_DIE" } + +Please invoke ${\__PACKAGE__} with: + + use inc::${\__PACKAGE__}; + +not: + + use ${\__PACKAGE__}; + +END_DIE + + + + + +# If the script that is loading Module::Install is from the future, +# then make will detect this and cause it to re-run over and over +# again. This is bad. Rather than taking action to touch it (which +# is unreliable on some platforms and requires write permissions) +# for now we should catch this and refuse to run. +if ( -f $0 ) { + my $s = (stat($0))[9]; + + # If the modification time is only slightly in the future, + # sleep briefly to remove the problem. + my $a = $s - time; + if ( $a > 0 and $a < 5 ) { sleep 5 } + + # Too far in the future, throw an error. + my $t = time; + if ( $s > $t ) { die <<"END_DIE" } + +Your installer $0 has a modification time in the future ($s > $t). + +This is known to create infinite loops in make. + +Please correct this, then run $0 again. + +END_DIE +} + + + + + +# Build.PL was formerly supported, but no longer is due to excessive +# difficulty in implementing every single feature twice. +if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } + +Module::Install no longer supports Build.PL. + +It was impossible to maintain duel backends, and has been deprecated. + +Please remove all Build.PL files and only use the Makefile.PL installer. + +END_DIE + + + + + +# To save some more typing in Module::Install installers, every... +# use inc::Module::Install +# ...also acts as an implicit use strict. +$^H |= strict::bits(qw(refs subs vars)); + + + + + +use Cwd (); +use File::Find (); +use File::Path (); +use FindBin; + +sub autoload { + my $self = shift; + my $who = $self->_caller; + my $cwd = Cwd::cwd(); + my $sym = "${who}::AUTOLOAD"; + $sym->{$cwd} = sub { + my $pwd = Cwd::cwd(); + if ( my $code = $sym->{$pwd} ) { + # Delegate back to parent dirs + goto &$code unless $cwd eq $pwd; + } + $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; + my $method = $1; + if ( uc($method) eq $method ) { + # Do nothing + return; + } elsif ( $method =~ /^_/ and $self->can($method) ) { + # Dispatch to the root M:I class + return $self->$method(@_); + } + + # Dispatch to the appropriate plugin + unshift @_, ( $self, $1 ); + goto &{$self->can('call')}; + }; +} + +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; + + unless ( -f $self->{file} ) { + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } + + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; + + # Unregister loader and worker packages so subdirs can use them again + delete $INC{"$self->{file}"}; + delete $INC{"$self->{path}.pm"}; + + # Save to the singleton + $MAIN = $self; + + return 1; +} + +sub preload { + my $self = shift; + unless ( $self->{extensions} ) { + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ); + } + + my @exts = @{$self->{extensions}}; + unless ( @exts ) { + @exts = $self->{admin}->load_all_extensions; + } + + my %seen; + foreach my $obj ( @exts ) { + while (my ($method, $glob) = each %{ref($obj) . '::'}) { + next unless $obj->can($method); + next if $method =~ /^_/; + next if $method eq uc($method); + $seen{$method}++; + } + } + + my $who = $self->_caller; + foreach my $name ( sort keys %seen ) { + *{"${who}::$name"} = sub { + ${"${who}::AUTOLOAD"} = "${who}::$name"; + goto &{"${who}::AUTOLOAD"}; + }; + } +} + +sub new { + my ($class, %args) = @_; + + # ignore the prefix on extension modules built from top level. + my $base_path = Cwd::abs_path($FindBin::Bin); + unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { + delete $args{prefix}; + } + + return $args{_self} if $args{_self}; + + $args{dispatch} ||= 'Admin'; + $args{prefix} ||= 'inc'; + $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); + $args{bundle} ||= 'inc/BUNDLES'; + $args{base} ||= $base_path; + $class =~ s/^\Q$args{prefix}\E:://; + $args{name} ||= $class; + $args{version} ||= $class->VERSION; + unless ( $args{path} ) { + $args{path} = $args{name}; + $args{path} =~ s!::!/!g; + } + $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; + $args{wrote} = 0; + + bless( \%args, $class ); +} + +sub call { + my ($self, $method) = @_; + my $obj = $self->load($method) or return; + splice(@_, 0, 2, $obj); + goto &{$obj->can($method)}; +} + +sub load { + my ($self, $method) = @_; + + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ) unless $self->{extensions}; + + foreach my $obj (@{$self->{extensions}}) { + return $obj if $obj->can($method); + } + + my $admin = $self->{admin} or die <<"END_DIE"; +The '$method' method does not exist in the '$self->{prefix}' path! +Please remove the '$self->{prefix}' directory and run $0 again to load it. +END_DIE + + my $obj = $admin->load($method, 1); + push @{$self->{extensions}}, $obj; + + $obj; +} + +sub load_extensions { + my ($self, $path, $top) = @_; + + unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { + unshift @INC, $self->{prefix}; + } + + foreach my $rv ( $self->find_extensions($path) ) { + my ($file, $pkg) = @{$rv}; + next if $self->{pathnames}{$pkg}; + + local $@; + my $new = eval { require $file; $pkg->can('new') }; + unless ( $new ) { + warn $@ if $@; + next; + } + $self->{pathnames}{$pkg} = delete $INC{$file}; + push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); + } + + $self->{extensions} ||= []; +} + +sub find_extensions { + my ($self, $path) = @_; + + my @found; + File::Find::find( sub { + my $file = $File::Find::name; + return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; + my $subpath = $1; + return if lc($subpath) eq lc($self->{dispatch}); + + $file = "$self->{path}/$subpath.pm"; + my $pkg = "$self->{name}::$subpath"; + $pkg =~ s!/!::!g; + + # If we have a mixed-case package name, assume case has been preserved + # correctly. Otherwise, root through the file to locate the case-preserved + # version of the package name. + if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { + my $content = Module::Install::_read($subpath . '.pm'); + my $in_pod = 0; + foreach ( split //, $content ) { + $in_pod = 1 if /^=\w/; + $in_pod = 0 if /^=cut/; + next if ($in_pod || /^=cut/); # skip pod text + next if /^\s*#/; # and comments + if ( m/^\s*package\s+($pkg)\s*;/i ) { + $pkg = $1; + last; + } + } + } + + push @found, [ $file, $pkg ]; + }, $path ) if -d $path; + + @found; +} + + + + + +##################################################################### +# Common Utility Functions + +sub _caller { + my $depth = 0; + my $call = caller($depth); + while ( $call eq __PACKAGE__ ) { + $depth++; + $call = caller($depth); + } + return $call; +} + +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; +sub _read { + local *FH; + open( FH, '<', $_[0] ) or die "open($_[0]): $!"; + my $string = do { local $/; }; + close FH or die "close($_[0]): $!"; + return $string; +} +END_NEW +sub _read { + local *FH; + open( FH, "< $_[0]" ) or die "open($_[0]): $!"; + my $string = do { local $/; }; + close FH or die "close($_[0]): $!"; + return $string; +} +END_OLD + +sub _readperl { + my $string = Module::Install::_read($_[0]); + $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; + $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; + $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; + return $string; +} + +sub _readpod { + my $string = Module::Install::_read($_[0]); + $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; + return $string if $_[0] =~ /\.pod\z/; + $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; + $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; + $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; + $string =~ s/^\n+//s; + return $string; +} + +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; +sub _write { + local *FH; + open( FH, '>', $_[0] ) or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; + } + close FH or die "close($_[0]): $!"; +} +END_NEW +sub _write { + local *FH; + open( FH, "> $_[0]" ) or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; + } + close FH or die "close($_[0]): $!"; +} +END_OLD + +# _version is for processing module versions (eg, 1.03_05) not +# Perl versions (eg, 5.8.1). +sub _version ($) { + my $s = shift || 0; + my $d =()= $s =~ /(\.)/g; + if ( $d >= 2 ) { + # Normalise multipart versions + $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; + } + $s =~ s/^(\d+)\.?//; + my $l = $1 || 0; + my @v = map { + $_ . '0' x (3 - length $_) + } $s =~ /(\d{1,3})\D?/g; + $l = $l . '.' . join '', @v if @v; + return $l + 0; +} + +sub _cmp ($$) { + _version($_[0]) <=> _version($_[1]); +} + +# Cloned from Params::Util::_CLASS +sub _CLASS ($) { + ( + defined $_[0] + and + ! ref $_[0] + and + $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s + ) ? $_[0] : undef; +} + +1; + +# Copyright 2008 - 2010 Adam Kennedy. diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm new file mode 100644 index 0000000..618bf57 --- /dev/null +++ b/inc/Module/Install/Base.pm @@ -0,0 +1,78 @@ +#line 1 +package Module::Install::Base; + +use strict 'vars'; +use vars qw{$VERSION}; +BEGIN { + $VERSION = '0.92'; +} + +# Suspend handler for "redefined" warnings +BEGIN { + my $w = $SIG{__WARN__}; + $SIG{__WARN__} = sub { $w }; +} + +#line 42 + +sub new { + my $class = shift; + unless ( defined &{"${class}::call"} ) { + *{"${class}::call"} = sub { shift->_top->call(@_) }; + } + unless ( defined &{"${class}::load"} ) { + *{"${class}::load"} = sub { shift->_top->load(@_) }; + } + bless { @_ }, $class; +} + +#line 61 + +sub AUTOLOAD { + local $@; + my $func = eval { shift->_top->autoload } or return; + goto &$func; +} + +#line 75 + +sub _top { + $_[0]->{_top}; +} + +#line 90 + +sub admin { + $_[0]->_top->{admin} + or + Module::Install::Base::FakeAdmin->new; +} + +#line 106 + +sub is_admin { + $_[0]->admin->VERSION; +} + +sub DESTROY {} + +package Module::Install::Base::FakeAdmin; + +my $fake; + +sub new { + $fake ||= bless(\@_, $_[0]); +} + +sub AUTOLOAD {} + +sub DESTROY {} + +# Restore warning handler +BEGIN { + $SIG{__WARN__} = $SIG{__WARN__}->(); +} + +1; + +#line 154 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm new file mode 100644 index 0000000..75b8a27 --- /dev/null +++ b/inc/Module/Install/Can.pm @@ -0,0 +1,81 @@ +#line 1 +package Module::Install::Can; + +use strict; +use Config (); +use File::Spec (); +use ExtUtils::MakeMaker (); +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '0.92'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +# check if we can load some module +### Upgrade this to not have to load the module if possible +sub can_use { + my ($self, $mod, $ver) = @_; + $mod =~ s{::|\\}{/}g; + $mod .= '.pm' unless $mod =~ /\.pm$/i; + + my $pkg = $mod; + $pkg =~ s{/}{::}g; + $pkg =~ s{\.pm$}{}i; + + local $@; + eval { require $mod; $pkg->VERSION($ver || 0); 1 }; +} + +# check if we can run some command +sub can_run { + my ($self, $cmd) = @_; + + my $_cmd = $cmd; + return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); + + for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { + next if $dir eq ''; + my $abs = File::Spec->catfile($dir, $_[1]); + return $abs if (-x $abs or $abs = MM->maybe_command($abs)); + } + + return; +} + +# can we locate a (the) C compiler +sub can_cc { + my $self = shift; + my @chunks = split(/ /, $Config::Config{cc}) or return; + + # $Config{cc} may contain args; try to find out the program part + while (@chunks) { + return $self->can_run("@chunks") || (pop(@chunks), next); + } + + return; +} + +# Fix Cygwin bug on maybe_command(); +if ( $^O eq 'cygwin' ) { + require ExtUtils::MM_Cygwin; + require ExtUtils::MM_Win32; + if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { + *ExtUtils::MM_Cygwin::maybe_command = sub { + my ($self, $file) = @_; + if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { + ExtUtils::MM_Win32->maybe_command($file); + } else { + ExtUtils::MM_Unix->maybe_command($file); + } + } + } +} + +1; + +__END__ + +#line 156 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm new file mode 100644 index 0000000..e3d6800 --- /dev/null +++ b/inc/Module/Install/Fetch.pm @@ -0,0 +1,93 @@ +#line 1 +package Module::Install::Fetch; + +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '0.92'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +sub get_file { + my ($self, %args) = @_; + my ($scheme, $host, $path, $file) = + $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; + + if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { + $args{url} = $args{ftp_url} + or (warn("LWP support unavailable!\n"), return); + ($scheme, $host, $path, $file) = + $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; + } + + $|++; + print "Fetching '$file' from $host... "; + + unless (eval { require Socket; Socket::inet_aton($host) }) { + warn "'$host' resolve failed!\n"; + return; + } + + return unless $scheme eq 'ftp' or $scheme eq 'http'; + + require Cwd; + my $dir = Cwd::getcwd(); + chdir $args{local_dir} or return if exists $args{local_dir}; + + if (eval { require LWP::Simple; 1 }) { + LWP::Simple::mirror($args{url}, $file); + } + elsif (eval { require Net::FTP; 1 }) { eval { + # use Net::FTP to get past firewall + my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); + $ftp->login("anonymous", 'anonymous@example.com'); + $ftp->cwd($path); + $ftp->binary; + $ftp->get($file) or (warn("$!\n"), return); + $ftp->quit; + } } + elsif (my $ftp = $self->can_run('ftp')) { eval { + # no Net::FTP, fallback to ftp.exe + require FileHandle; + my $fh = FileHandle->new; + + local $SIG{CHLD} = 'IGNORE'; + unless ($fh->open("|$ftp -n")) { + warn "Couldn't open ftp: $!\n"; + chdir $dir; return; + } + + my @dialog = split(/\n/, <<"END_FTP"); +open $host +user anonymous anonymous\@example.com +cd $path +binary +get $file $file +quit +END_FTP + foreach (@dialog) { $fh->print("$_\n") } + $fh->close; + } } + else { + warn "No working 'ftp' program available!\n"; + chdir $dir; return; + } + + unless (-f $file) { + warn "Fetching failed: $@\n"; + chdir $dir; return; + } + + return if exists $args{size} and -s $file != $args{size}; + system($args{run}) if exists $args{run}; + unlink($file) if $args{remove}; + + print(((!exists $args{check_for} or -e $args{check_for}) + ? "done!" : "failed! ($!)"), "\n"); + chdir $dir; return !$?; +} + +1; diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm new file mode 100644 index 0000000..acf10ef --- /dev/null +++ b/inc/Module/Install/Makefile.pm @@ -0,0 +1,300 @@ +#line 1 +package Module::Install::Makefile; + +use strict 'vars'; +use ExtUtils::MakeMaker (); +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '0.92'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +sub Makefile { $_[0] } + +my %seen = (); + +sub prompt { + shift; + + # Infinite loop protection + my @c = caller(); + if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { + die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; + } + + # In automated testing, always use defaults + if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { + local $ENV{PERL_MM_USE_DEFAULT} = 1; + goto &ExtUtils::MakeMaker::prompt; + } else { + goto &ExtUtils::MakeMaker::prompt; + } +} + +# Store a cleaned up version of the MakeMaker version, +# since we need to behave differently in a variety of +# ways based on the MM version. +my $makemaker = eval $ExtUtils::MakeMaker::VERSION; + +# If we are passed a param, do a "newer than" comparison. +# Otherwise, just return the MakeMaker version. +sub makemaker { + ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 +} + +sub makemaker_args { + my $self = shift; + my $args = ( $self->{makemaker_args} ||= {} ); + %$args = ( %$args, @_ ); + return $args; +} + +# For mm args that take multiple space-seperated args, +# append an argument to the current list. +sub makemaker_append { + my $self = shift; + my $name = shift; + my $args = $self->makemaker_args; + $args->{name} = defined $args->{$name} + ? join( ' ', $args->{name}, @_ ) + : join( ' ', @_ ); +} + +sub build_subdirs { + my $self = shift; + my $subdirs = $self->makemaker_args->{DIR} ||= []; + for my $subdir (@_) { + push @$subdirs, $subdir; + } +} + +sub clean_files { + my $self = shift; + my $clean = $self->makemaker_args->{clean} ||= {}; + %$clean = ( + %$clean, + FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), + ); +} + +sub realclean_files { + my $self = shift; + my $realclean = $self->makemaker_args->{realclean} ||= {}; + %$realclean = ( + %$realclean, + FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), + ); +} + +sub libs { + my $self = shift; + my $libs = ref $_[0] ? shift : [ shift ]; + $self->makemaker_args( LIBS => $libs ); +} + +sub inc { + my $self = shift; + $self->makemaker_args( INC => shift ); +} + +my %test_dir = (); + +sub _wanted_t { + /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1; +} + +sub tests_recursive { + my $self = shift; + if ( $self->tests ) { + die "tests_recursive will not work if tests are already defined"; + } + my $dir = shift || 't'; + unless ( -d $dir ) { + die "tests_recursive dir '$dir' does not exist"; + } + %test_dir = (); + require File::Find; + File::Find::find( \&_wanted_t, $dir ); + $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir ); +} + +sub write { + my $self = shift; + die "&Makefile->write() takes no arguments\n" if @_; + + # Check the current Perl version + my $perl_version = $self->perl_version; + if ( $perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + } + + # Make sure we have a new enough MakeMaker + require ExtUtils::MakeMaker; + + if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { + # MakeMaker can complain about module versions that include + # an underscore, even though its own version may contain one! + # Hence the funny regexp to get rid of it. See RT #35800 + # for details. + my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/; + $self->build_requires( 'ExtUtils::MakeMaker' => $v ); + $self->configure_requires( 'ExtUtils::MakeMaker' => $v ); + } else { + # Allow legacy-compatibility with 5.005 by depending on the + # most recent EU:MM that supported 5.005. + $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 ); + } + + # Generate the MakeMaker params + my $args = $self->makemaker_args; + $args->{DISTNAME} = $self->name; + $args->{NAME} = $self->module_name || $self->name; + $args->{VERSION} = $self->version; + $args->{NAME} =~ s/-/::/g; + if ( $self->tests ) { + $args->{test} = { TESTS => $self->tests }; + } + if ( $] >= 5.005 ) { + $args->{ABSTRACT} = $self->abstract; + $args->{AUTHOR} = $self->author; + } + if ( $self->makemaker(6.10) ) { + $args->{NO_META} = 1; + } + if ( $self->makemaker(6.17) and $self->sign ) { + $args->{SIGN} = 1; + } + unless ( $self->is_admin ) { + delete $args->{SIGN}; + } + + my $prereq = ($args->{PREREQ_PM} ||= {}); + %$prereq = ( %$prereq, + map { @$_ } # flatten [module => version] + map { @$_ } + grep $_, + ($self->requires) + ); + + # Remove any reference to perl, PREREQ_PM doesn't support it + delete $args->{PREREQ_PM}->{perl}; + + # Merge both kinds of requires into BUILD_REQUIRES + my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); + %$build_prereq = ( %$build_prereq, + map { @$_ } # flatten [module => version] + map { @$_ } + grep $_, + ($self->configure_requires, $self->build_requires) + ); + + # Remove any reference to perl, BUILD_REQUIRES doesn't support it + delete $args->{BUILD_REQUIRES}->{perl}; + + # Delete bundled dists from prereq_pm + my $subdirs = ($args->{DIR} ||= []); + if ($self->bundles) { + foreach my $bundle (@{ $self->bundles }) { + my ($file, $dir) = @$bundle; + push @$subdirs, $dir if -d $dir; + delete $build_prereq->{$file}; #Delete from build prereqs only + } + } + + unless ( $self->makemaker('6.55_03') ) { + %$prereq = (%$prereq,%$build_prereq); + delete $args->{BUILD_REQUIRES}; + } + + if ( my $perl_version = $self->perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + + if ( $self->makemaker(6.48) ) { + $args->{MIN_PERL_VERSION} = $perl_version; + } + } + + $args->{INSTALLDIRS} = $self->installdirs; + + my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; + + my $user_preop = delete $args{dist}->{PREOP}; + if (my $preop = $self->admin->preop($user_preop)) { + foreach my $key ( keys %$preop ) { + $args{dist}->{$key} = $preop->{$key}; + } + } + + my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); + $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); +} + +sub fix_up_makefile { + my $self = shift; + my $makefile_name = shift; + my $top_class = ref($self->_top) || ''; + my $top_version = $self->_top->VERSION || ''; + + my $preamble = $self->preamble + ? "# Preamble by $top_class $top_version\n" + . $self->preamble + : ''; + my $postamble = "# Postamble by $top_class $top_version\n" + . ($self->postamble || ''); + + local *MAKEFILE; + open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + my $makefile = do { local $/; }; + close MAKEFILE or die $!; + + $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; + $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; + $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; + $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; + $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; + + # Module::Install will never be used to build the Core Perl + # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks + # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist + $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; + #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; + + # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. + $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; + + # XXX - This is currently unused; not sure if it breaks other MM-users + # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; + + open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + print MAKEFILE "$preamble$makefile$postamble" or die $!; + close MAKEFILE or die $!; + + 1; +} + +sub preamble { + my ($self, $text) = @_; + $self->{preamble} = $text . $self->{preamble} if defined $text; + $self->{preamble}; +} + +sub postamble { + my ($self, $text) = @_; + $self->{postamble} ||= $self->admin->postamble; + $self->{postamble} .= $text if defined $text; + $self->{postamble} +} + +1; + +__END__ + +#line 426 diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm new file mode 100644 index 0000000..b00e6b1 --- /dev/null +++ b/inc/Module/Install/Metadata.pm @@ -0,0 +1,647 @@ +#line 1 +package Module::Install::Metadata; + +use strict 'vars'; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '0.92'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +my @boolean_keys = qw{ + sign +}; + +my @scalar_keys = qw{ + name + module_name + abstract + author + version + distribution_type + tests + installdirs +}; + +my @tuple_keys = qw{ + configure_requires + build_requires + requires + recommends + bundles + resources +}; + +my @resource_keys = qw{ + homepage + bugtracker + repository +}; + +my @array_keys = qw{ + keywords +}; + +sub Meta { shift } +sub Meta_BooleanKeys { @boolean_keys } +sub Meta_ScalarKeys { @scalar_keys } +sub Meta_TupleKeys { @tuple_keys } +sub Meta_ResourceKeys { @resource_keys } +sub Meta_ArrayKeys { @array_keys } + +foreach my $key ( @boolean_keys ) { + *$key = sub { + my $self = shift; + if ( defined wantarray and not @_ ) { + return $self->{values}->{$key}; + } + $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); + return $self; + }; +} + +foreach my $key ( @scalar_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} if defined wantarray and !@_; + $self->{values}->{$key} = shift; + return $self; + }; +} + +foreach my $key ( @array_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} if defined wantarray and !@_; + $self->{values}->{$key} ||= []; + push @{$self->{values}->{$key}}, @_; + return $self; + }; +} + +foreach my $key ( @resource_keys ) { + *$key = sub { + my $self = shift; + unless ( @_ ) { + return () unless $self->{values}->{resources}; + return map { $_->[1] } + grep { $_->[0] eq $key } + @{ $self->{values}->{resources} }; + } + return $self->{values}->{resources}->{$key} unless @_; + my $uri = shift or die( + "Did not provide a value to $key()" + ); + $self->resources( $key => $uri ); + return 1; + }; +} + +foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} unless @_; + my @added; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @added, [ $module, $version ]; + } + push @{ $self->{values}->{$key} }, @added; + return map {@$_} @added; + }; +} + +# Resource handling +my %lc_resource = map { $_ => 1 } qw{ + homepage + license + bugtracker + repository +}; + +sub resources { + my $self = shift; + while ( @_ ) { + my $name = shift or last; + my $value = shift or next; + if ( $name eq lc $name and ! $lc_resource{$name} ) { + die("Unsupported reserved lowercase resource '$name'"); + } + $self->{values}->{resources} ||= []; + push @{ $self->{values}->{resources} }, [ $name, $value ]; + } + $self->{values}->{resources}; +} + +# Aliases for build_requires that will have alternative +# meanings in some future version of META.yml. +sub test_requires { shift->build_requires(@_) } +sub install_requires { shift->build_requires(@_) } + +# Aliases for installdirs options +sub install_as_core { $_[0]->installdirs('perl') } +sub install_as_cpan { $_[0]->installdirs('site') } +sub install_as_site { $_[0]->installdirs('site') } +sub install_as_vendor { $_[0]->installdirs('vendor') } + +sub dynamic_config { + my $self = shift; + unless ( @_ ) { + warn "You MUST provide an explicit true/false value to dynamic_config\n"; + return $self; + } + $self->{values}->{dynamic_config} = $_[0] ? 1 : 0; + return 1; +} + +sub perl_version { + my $self = shift; + return $self->{values}->{perl_version} unless @_; + my $version = shift or die( + "Did not provide a value to perl_version()" + ); + + # Normalize the version + $version = $self->_perl_version($version); + + # We don't support the reall old versions + unless ( $version >= 5.005 ) { + die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; + } + + $self->{values}->{perl_version} = $version; +} + +#Stolen from M::B +my %license_urls = ( + perl => 'http://dev.perl.org/licenses/', + apache => 'http://apache.org/licenses/LICENSE-2.0', + artistic => 'http://opensource.org/licenses/artistic-license.php', + artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', + lgpl => 'http://opensource.org/licenses/lgpl-license.php', + lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', + lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', + bsd => 'http://opensource.org/licenses/bsd-license.php', + gpl => 'http://opensource.org/licenses/gpl-license.php', + gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', + gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', + mit => 'http://opensource.org/licenses/mit-license.php', + mozilla => 'http://opensource.org/licenses/mozilla1.1.php', + open_source => undef, + unrestricted => undef, + restrictive => undef, + unknown => undef, +); + +sub license { + my $self = shift; + return $self->{values}->{license} unless @_; + my $license = shift or die( + 'Did not provide a value to license()' + ); + $self->{values}->{license} = $license; + + # Automatically fill in license URLs + if ( $license_urls{$license} ) { + $self->resources( license => $license_urls{$license} ); + } + + return 1; +} + +sub all_from { + my ( $self, $file ) = @_; + + unless ( defined($file) ) { + my $name = $self->name or die( + "all_from called with no args without setting name() first" + ); + $file = join('/', 'lib', split(/-/, $name)) . '.pm'; + $file =~ s{.*/}{} unless -e $file; + unless ( -e $file ) { + die("all_from cannot find $file from $name"); + } + } + unless ( -f $file ) { + die("The path '$file' does not exist, or is not a file"); + } + + $self->{values}{all_from} = $file; + + # Some methods pull from POD instead of code. + # If there is a matching .pod, use that instead + my $pod = $file; + $pod =~ s/\.pm$/.pod/i; + $pod = $file unless -e $pod; + + # Pull the different values + $self->name_from($file) unless $self->name; + $self->version_from($file) unless $self->version; + $self->perl_version_from($file) unless $self->perl_version; + $self->author_from($pod) unless $self->author; + $self->license_from($pod) unless $self->license; + $self->abstract_from($pod) unless $self->abstract; + + return 1; +} + +sub provides { + my $self = shift; + my $provides = ( $self->{values}->{provides} ||= {} ); + %$provides = (%$provides, @_) if @_; + return $provides; +} + +sub auto_provides { + my $self = shift; + return $self unless $self->is_admin; + unless (-e 'MANIFEST') { + warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; + return $self; + } + # Avoid spurious warnings as we are not checking manifest here. + local $SIG{__WARN__} = sub {1}; + require ExtUtils::Manifest; + local *ExtUtils::Manifest::manicheck = sub { return }; + + require Module::Build; + my $build = Module::Build->new( + dist_name => $self->name, + dist_version => $self->version, + license => $self->license, + ); + $self->provides( %{ $build->find_dist_packages || {} } ); +} + +sub feature { + my $self = shift; + my $name = shift; + my $features = ( $self->{values}->{features} ||= [] ); + my $mods; + + if ( @_ == 1 and ref( $_[0] ) ) { + # The user used ->feature like ->features by passing in the second + # argument as a reference. Accomodate for that. + $mods = $_[0]; + } else { + $mods = \@_; + } + + my $count = 0; + push @$features, ( + $name => [ + map { + ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ + } @$mods + ] + ); + + return @$features; +} + +sub features { + my $self = shift; + while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { + $self->feature( $name, @$mods ); + } + return $self->{values}->{features} + ? @{ $self->{values}->{features} } + : (); +} + +sub no_index { + my $self = shift; + my $type = shift; + push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; + return $self->{values}->{no_index}; +} + +sub read { + my $self = shift; + $self->include_deps( 'YAML::Tiny', 0 ); + + require YAML::Tiny; + my $data = YAML::Tiny::LoadFile('META.yml'); + + # Call methods explicitly in case user has already set some values. + while ( my ( $key, $value ) = each %$data ) { + next unless $self->can($key); + if ( ref $value eq 'HASH' ) { + while ( my ( $module, $version ) = each %$value ) { + $self->can($key)->($self, $module => $version ); + } + } else { + $self->can($key)->($self, $value); + } + } + return $self; +} + +sub write { + my $self = shift; + return $self unless $self->is_admin; + $self->admin->write_meta; + return $self; +} + +sub version_from { + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->version( ExtUtils::MM_Unix->parse_version($file) ); +} + +sub abstract_from { + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->abstract( + bless( + { DISTNAME => $self->name }, + 'ExtUtils::MM_Unix' + )->parse_abstract($file) + ); +} + +# Add both distribution and module name +sub name_from { + my ($self, $file) = @_; + if ( + Module::Install::_read($file) =~ m/ + ^ \s* + package \s* + ([\w:]+) + \s* ; + /ixms + ) { + my ($name, $module_name) = ($1, $1); + $name =~ s{::}{-}g; + $self->name($name); + unless ( $self->module_name ) { + $self->module_name($module_name); + } + } else { + die("Cannot determine name from $file\n"); + } +} + +sub _extract_perl_version { + if ( + $_[0] =~ m/ + ^\s* + (?:use|require) \s* + v? + ([\d_\.]+) + \s* ; + /ixms + ) { + my $perl_version = $1; + $perl_version =~ s{_}{}g; + return $perl_version; + } else { + return; + } +} + +sub perl_version_from { + my $self = shift; + my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); + if ($perl_version) { + $self->perl_version($perl_version); + } else { + warn "Cannot determine perl version info from $_[0]\n"; + return; + } +} + +sub author_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + if ($content =~ m/ + =head \d \s+ (?:authors?)\b \s* + ([^\n]*) + | + =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* + .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* + ([^\n]*) + /ixms) { + my $author = $1 || $2; + $author =~ s{E}{<}g; + $author =~ s{E}{>}g; + $self->author($author); + } else { + warn "Cannot determine author info from $_[0]\n"; + } +} + +sub _extract_license { + if ( + $_[0] =~ m/ + ( + =head \d \s+ + (?:licen[cs]e|licensing|copyrights?|legal)\b + .*? + ) + (=head\\d.*|=cut.*|) + \z + /ixms ) { + my $license_text = $1; + my @phrases = ( + 'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1, + 'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1, + 'GNU general public license' => 'gpl', 1, + 'GNU public license' => 'gpl', 1, + 'GNU lesser general public license' => 'lgpl', 1, + 'GNU lesser public license' => 'lgpl', 1, + 'GNU library general public license' => 'lgpl', 1, + 'GNU library public license' => 'lgpl', 1, + 'BSD license' => 'bsd', 1, + 'Artistic license' => 'artistic', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'proprietary' => 'proprietary', 0, + ); + while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { + $pattern =~ s#\s+#\\s+#gs; + if ( $license_text =~ /\b$pattern\b/i ) { + return $license; + } + } + } else { + return; + } +} + +sub license_from { + my $self = shift; + if (my $license=_extract_license(Module::Install::_read($_[0]))) { + $self->license($license); + } else { + warn "Cannot determine license info from $_[0]\n"; + return 'unknown'; + } +} + +sub _extract_bugtracker { + my @links = $_[0] =~ m#L<( + \Qhttp://rt.cpan.org/\E[^>]+| + \Qhttp://github.com/\E[\w_]+/[\w_]+/issues| + \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list + )>#gx; + my %links; + @links{@links}=(); + @links=keys %links; + return @links; +} + +sub bugtracker_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + my @links = _extract_bugtracker($content); + unless ( @links ) { + warn "Cannot determine bugtracker info from $_[0]\n"; + return 0; + } + if ( @links > 1 ) { + warn "Found more than one bugtracker link in $_[0]\n"; + return 0; + } + + # Set the bugtracker + bugtracker( $links[0] ); + return 1; +} + +sub requires_from { + my $self = shift; + my $content = Module::Install::_readperl($_[0]); + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + while ( @requires ) { + my $module = shift @requires; + my $version = shift @requires; + $self->requires( $module => $version ); + } +} + +sub test_requires_from { + my $self = shift; + my $content = Module::Install::_readperl($_[0]); + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + while ( @requires ) { + my $module = shift @requires; + my $version = shift @requires; + $self->test_requires( $module => $version ); + } +} + +# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to +# numbers (eg, 5.006001 or 5.008009). +# Also, convert double-part versions (eg, 5.8) +sub _perl_version { + my $v = $_[-1]; + $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; + $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; + $v =~ s/(\.\d\d\d)000$/$1/; + $v =~ s/_.+$//; + if ( ref($v) ) { + # Numify + $v = $v + 0; + } + return $v; +} + + + + + +###################################################################### +# MYMETA Support + +sub WriteMyMeta { + die "WriteMyMeta has been deprecated"; +} + +sub write_mymeta_yaml { + my $self = shift; + + # We need YAML::Tiny to write the MYMETA.yml file + unless ( eval { require YAML::Tiny; 1; } ) { + return 1; + } + + # Generate the data + my $meta = $self->_write_mymeta_data or return 1; + + # Save as the MYMETA.yml file + print "Writing MYMETA.yml\n"; + YAML::Tiny::DumpFile('MYMETA.yml', $meta); +} + +sub write_mymeta_json { + my $self = shift; + + # We need JSON to write the MYMETA.json file + unless ( eval { require JSON; 1; } ) { + return 1; + } + + # Generate the data + my $meta = $self->_write_mymeta_data or return 1; + + # Save as the MYMETA.yml file + print "Writing MYMETA.json\n"; + Module::Install::_write( + 'MYMETA.json', + JSON->new->pretty(1)->canonical->encode($meta), + ); +} + +sub _write_mymeta_data { + my $self = shift; + + # If there's no existing META.yml there is nothing we can do + return undef unless -f 'META.yml'; + + # We need Parse::CPAN::Meta to load the file + unless ( eval { require Parse::CPAN::Meta; 1; } ) { + return undef; + } + + # Merge the perl version into the dependencies + my $val = $self->Meta->{values}; + my $perl = delete $val->{perl_version}; + if ( $perl ) { + $val->{requires} ||= []; + my $requires = $val->{requires}; + + # Canonize to three-dot version after Perl 5.6 + if ( $perl >= 5.006 ) { + $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e + } + unshift @$requires, [ perl => $perl ]; + } + + # Load the advisory META.yml file + my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); + my $meta = $yaml[0]; + + # Overwrite the non-configure dependency hashs + delete $meta->{requires}; + delete $meta->{build_requires}; + delete $meta->{recommends}; + if ( exists $val->{requires} ) { + $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; + } + if ( exists $val->{build_requires} ) { + $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; + } + + return $meta; +} + +1; diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm new file mode 100644 index 0000000..89f16f0 --- /dev/null +++ b/inc/Module/Install/Win32.pm @@ -0,0 +1,64 @@ +#line 1 +package Module::Install::Win32; + +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '0.92'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +# determine if the user needs nmake, and download it if needed +sub check_nmake { + my $self = shift; + $self->load('can_run'); + $self->load('get_file'); + + require Config; + return unless ( + $^O eq 'MSWin32' and + $Config::Config{make} and + $Config::Config{make} =~ /^nmake\b/i and + ! $self->can_run('nmake') + ); + + print "The required 'nmake' executable not found, fetching it...\n"; + + require File::Basename; + my $rv = $self->get_file( + url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', + ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', + local_dir => File::Basename::dirname($^X), + size => 51928, + run => 'Nmake15.exe /o > nul', + check_for => 'Nmake.exe', + remove => 1, + ); + + die <<'END_MESSAGE' unless $rv; + +------------------------------------------------------------------------------- + +Since you are using Microsoft Windows, you will need the 'nmake' utility +before installation. It's available at: + + http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe + or + ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe + +Please download the file manually, save it to a directory in %PATH% (e.g. +C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to +that directory, and run "Nmake15.exe" from there; that will create the +'nmake.exe' file needed by this module. + +You may then resume the installation process described in README. + +------------------------------------------------------------------------------- +END_MESSAGE + +} + +1; diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm new file mode 100644 index 0000000..af3ea05 --- /dev/null +++ b/inc/Module/Install/WriteAll.pm @@ -0,0 +1,60 @@ +#line 1 +package Module::Install::WriteAll; + +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '0.92';; + @ISA = qw{Module::Install::Base}; + $ISCORE = 1; +} + +sub WriteAll { + my $self = shift; + my %args = ( + meta => 1, + sign => 0, + inline => 0, + check_nmake => 1, + @_, + ); + + $self->sign(1) if $args{sign}; + $self->admin->WriteAll(%args) if $self->is_admin; + + $self->check_nmake if $args{check_nmake}; + unless ( $self->makemaker_args->{PL_FILES} ) { + $self->makemaker_args( PL_FILES => {} ); + } + + # Until ExtUtils::MakeMaker support MYMETA.yml, make sure + # we clean it up properly ourself. + $self->realclean_files('MYMETA.yml'); + + if ( $args{inline} ) { + $self->Inline->write; + } else { + $self->Makefile->write; + } + + # The Makefile write process adds a couple of dependencies, + # so write the META.yml files after the Makefile. + if ( $args{meta} ) { + $self->Meta->write; + } + + # Experimental support for MYMETA + if ( $ENV{X_MYMETA} ) { + if ( $ENV{X_MYMETA} eq 'JSON' ) { + $self->Meta->write_mymeta_json; + } else { + $self->Meta->write_mymeta_yaml; + } + } + + return 1; +} + +1; diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm new file mode 100644 index 0000000..34c1437 --- /dev/null +++ b/lib/REST/Client.pm @@ -0,0 +1,548 @@ +package REST::Client; + +=head1 NAME + +REST::Client - A simple client for interacting with RESTful http/https resources + +=head1 SYNOPSIS + + use REST::Client; + + #The basic use case + my $client = REST::Client->new(); + $client->GET('http://example.com/dir/file.xml'); + print $client->responseContent(); + + #A host can be set for convienience + $client->setHost('http://example.com'); + $client->PUT('/dir/file.xml', 'new content'); + if( $client->responseCode() eq '200' ){ + print "Updated\n"; + } + + #custom request headers may be added + $client->addHeader('CustomHeader', 'Value'); + + #response headers may be gathered + print $client->responseHeader('ResponseHeader'); + + #X509 client authentication + $client->setCert('/path/to/ssl.crt'); + $client->setKey('/path/to/ssl.key'); + + #add a CA to verify server certificates + $client->setCa('/path/to/ca.file'); + + #you may set a timeout on requests, in seconds + $client->setTimeout(10); + + #options may be passed as well as set + $client = REST::Client->new({ + host => 'https://example.com', + cert => '/path/to/ssl.crt', + key => '/path/to/ssl.key', + ca => '/path/to/ca.file', + timeout => 10, + }); + $client->GET('/dir/file', {CustomHeader => 'Value'}); + + # Requests can be specificed directly as well + $client->request('GET', '/dir/file', 'request body content', {CustomHeader => 'Value'}); + + # Requests can optionally automatically follow redirects and auth, defaults to + # false + $client->setFollow(1); + + #It is possible to access the L object REST::Client is using to + #make requests, and set advanced options on it, for instance: + $client->getUseragent()->proxy(['http'], 'http://proxy.example.com/'); + +=head1 DESCRIPTION + +REST::Client provides a simple way to interact with HTTP RESTful resources. + +=cut + +=head1 METHODS + +=cut + +use strict; +use warnings; +use 5.008_000; + +use constant TRUE => 1; +use constant FALSE => 0; + +our ($VERSION) = ('$Rev: 272 $' =~ /(\d+)/); + +use URI; +use LWP::UserAgent; +use Carp qw(croak carp); +use Crypt::SSLeay; + +=head2 Construction and setup + +=head3 new ( [%$config] ) + +Construct a new REST::Client. Takes an optional hash or hash reference or +config flags. Each config flag also has get/set accessors of the form +getHost/setHost, getUseragent/setUseragent, etc. These can be called on the +instantiated object to change or check values. + +The config flags are: + +=over 4 + +=item host + +A default host that will be prepended to all requests. Allows you to just +specify the path when making requests. + +The default is undef - you must include the host in your requests. + +=item timeout + +A timeout in seconds for requests made with the client. After the timeout the +client will return a 500. + +The default is 5 minutes. + +=item cert + +The path to a X509 certificate file to be used for client authentication. + +The default is to not use a certificate/key pair. + +=item key + +The path to a X509 key file to be used for client authentication. + +The default is to not use a certificate/key pair. + +=item ca + +The path to a certificate authority file to be used to verify host +certificates. + +The default is to not use a certificates authority. + +=item pkcs12 + +The path to a PKCS12 certificate to be used for client authentication. + +=item pkcs12password + +The password for the PKCS12 certificate specified with 'pkcs12'. + +=item follow + +Boolean that determins whether REST::Client attempts to automatically follow +redirects/authentication. + +The default is false. + +=item useragent + +An L object, ready to make http requests. + +REST::Client will provide a default for you if you do not set this. + +=back + +=cut + +sub new { + my $class = shift; + my $config; + + $class->_buildAccessors(); + + if(ref $_[0] eq 'HASH'){ + $config = shift; + }elsif(scalar @_ && scalar @_ % 2 == 0){ + $config = {@_}; + }else{ + $config = {}; + } + + my $self = bless({}, $class); + $self->{'_config'} = $config; + + $self->_buildUseragent(); + + return $self; +} + +=head3 addHeader ( $header_name, $value ) + +Add a custom header to any requests made by this client. + +=cut + +sub addHeader { + my $self = shift; + my $header = shift; + my $value = shift; + + my $headers = $self->{'_headers'} || {}; + $headers->{$header} = $value; + $self->{'_headers'} = $headers; + return; +} + +=head3 buildQuery ( [...] ) + +A convienience wrapper around URI::query_form for building query strings from a +variety of data structures. See L + +Returns a scalar query string for use in URLs. + +=cut + +sub buildQuery { + my $self = shift; + + my $uri = URI->new(); + $uri->query_form(@_); + return $uri->as_string(); +} + + + +=head2 Request Methods + +Each of these methods makes an HTTP request, sets the internal state of the +object, and returns the object. + +They can be combined with the response methods, such as: + + print $client->GET('/search/?q=foobar')->responseContent(); + +=head3 GET ( $url, [%$headers] ) + +Preform an HTTP GET to the resource specified. Takes an optional hashref of custom request headers. + +=cut + +sub GET { + my $self = shift; + my $url = shift; + my $headers = shift; + return $self->request('GET', $url, undef, $headers); +} + +=head3 PUT ($url, [$body_content, %$headers] ) + +Preform an HTTP PUT to the resource specified. Takes an optional body content and hashref of custom request headers. + +=cut + +sub PUT { + my $self = shift; + return $self->request('PUT', @_); +} + +=head3 PATCH ( $url, [$body_content, %$headers] ) + +Preform an HTTP PATCH to the resource specified. Takes an optional body content and hashref of custom request headers. + +=cut + +sub PATCH { + my $self = shift; + return $self->request('PATCH', @_); +} + +=head3 POST ( $url, [$body_content, %$headers] ) + +Preform an HTTP POST to the resource specified. Takes an optional body content and hashref of custom request headers. + +=cut + +sub POST { + my $self = shift; + return $self->request('POST', @_); +} + +=head3 DELETE ( $url, [%$headers] ) + +Preform an HTTP DELETE to the resource specified. Takes an optional hashref of custom request headers. + +=cut + +sub DELETE { + my $self = shift; + my $url = shift; + my $headers = shift; + return $self->request('DELETE', $url, undef, $headers); +} + +=head3 OPTIONS ( $url, [%$headers] ) + +Preform an HTTP OPTIONS to the resource specified. Takes an optional hashref of custom request headers. + +=cut + +sub OPTIONS { + my $self = shift; + my $url = shift; + my $headers = shift; + return $self->request('OPTIONS', $url, undef, $headers); +} + +=head3 HEAD ( $url, [%$headers] ) + +Preform an HTTP HEAD to the resource specified. Takes an optional hashref of custom request headers. + +=cut + +sub HEAD { + my $self = shift; + my $url = shift; + my $headers = shift; + return $self->request('HEAD', $url, undef, $headers); +} + +=head3 request ( $method, $url, [$body_content, %$headers] ) + +Issue a custom request, providing all possible values. + +=cut + +sub request { + my $self = shift; + my $method = shift; + my $url = shift; + my $content = shift; + my $headers = shift; + + $self->{'_res'} = undef; + $self->_buildUseragent(); + + + #error check + croak "REST::Client exception: First argument to request must be one of GET, PATCH, PUT, POST, DELETE, OPTIONS, HEAD" unless $method =~ /^(get|patch|put|post|delete|options|head)$/i; + croak "REST::Client exception: Must provide a url to $method" unless $url; + croak "REST::Client exception: headers must be presented as a hashref" if $headers && ref $headers ne 'HASH'; + + + $url = $self->_prepareURL($url); + + #to ensure we use our desired SSL lib + my $tmp_socket_ssl_version = $IO::Socket::SSL::VERSION; + $IO::Socket::SSL::VERSION = undef; + + my $ua = $self->getUseragent(); + if(defined $self->getTimeout()){ + $ua->timeout($self->getTimeout); + }else{ + $ua->timeout(300); + } + my $req = HTTP::Request->new( $method => $url ); + + #build headers + if(defined $content && length($content)){ + $req->content($content); + $req->header('Content-Length', length($content)); + }else{ + $req->header('Content-Length', 0); + } + + my $custom_headers = $self->{'_headers'} || {}; + for my $header (keys %$custom_headers){ + $req->header($header, $custom_headers->{$header}); + } + + for my $header (keys %$headers){ + $req->header($header, $headers->{$header}); + } + + + #prime LWP with ssl certfile if we have values + if($self->getCert){ + carp "REST::Client exception: Certs defined but not using https" unless $url =~ /^https/; + croak "REST::Client exception: Cannot read cert and key file" unless -f $self->getCert && -f $self->getKey; + + $ua->ssl_opts(SSL_cert_file => $self->getCert); + $ua->ssl_opts(SSL_key_file => $self->getKey); + if(my $ca = $self->getCa){ + croak "REST::Client exception: Cannot read CA file" unless -f $ca; + $ua->ssl_opts(SSL_ca_file => $ca); + } + } + + #prime LWP with PKCS12 certificate if we have one + if($self->getPkcs12){ + carp "REST::Client exception: PKCS12 cert defined but not using https" unless $url =~ /^https/; + croak "REST::Client exception: Cannot read PKCS12 cert" unless -f $self->getPkcs12; + + $ENV{HTTPS_PKCS12_FILE} = $self->getPkcs12; + if($self->getPkcs12password){ + $ENV{HTTPS_PKCS12_PASSWORD} = $self->getPkcs12password; + } + } + + my $res = $self->getFollow ? $ua->request($req) : $ua->simple_request($req); + $IO::Socket::SSL::VERSION = $tmp_socket_ssl_version; + + $self->{_res} = $res; + + return $self; +} + +=head2 Response Methods + +Use these methods to gather information about the last requset +performed. + +=head3 responseCode () + +Return the HTTP response code of the last request + +=cut + +sub responseCode { + my $self = shift; + return $self->{_res}->code; +} + +=head3 responseContent () + +Return the response body content of the last request + +=cut + +sub responseContent { + my $self = shift; + return $self->{_res}->content; +} + +=head3 responseHeaders() + +Returns a list of HTTP header names from the last response + +=cut + +sub responseHeaders { + my $self = shift; + return $self->{_res}->headers()->header_field_names(); +} + + + +=head3 responseHeader ( $header ) + +Return a HTTP header from the last response + +=cut + +sub responseHeader { + my $self = shift; + my $header = shift; + croak "REST::Client exception: no header provided to responseHeader" unless $header; + return $self->{_res}->header($header); +} + +=head3 responseXpath () + +A convienience wrapper that returns a L xpath context for the body content. Assumes the content is XML. + +=cut + +sub responseXpath { + my $self = shift; + + require XML::LibXML; + + my $xml= XML::LibXML->new(); + $xml->load_ext_dtd(0); + + if($self->responseHeader('Content-type') =~ /html/){ + return XML::LibXML::XPathContext->new($xml->parse_html_string( $self->responseContent() )); + }else{ + return XML::LibXML::XPathContext->new($xml->parse_string( $self->responseContent() )); + } +} + +# Private methods + +sub _prepareURL { + my $self = shift; + my $url = shift; + + my $host = $self->getHost; + if($host){ + $url = '/'.$url unless $url =~ /^\//; + $url = $host . $url; + } + unless($url =~ /^\w+:\/\//){ + $url = ($self->getCert ? 'https://' : 'http://') . $url; + } + + return $url; +} + +sub _buildUseragent { + my $self = shift; + + return if $self->getUseragent(); + + my $ua = LWP::UserAgent->new; + $ua->agent("REST::Client/$VERSION"); + $self->setUseragent($ua); + + return; +} + +sub _buildAccessors { + my $self = shift; + + return if $self->can('setHost'); + + my @attributes = qw(Host Key Cert Ca Timeout Follow Useragent Pkcs12 Pkcs12password); + + for my $attribute (@attributes){ + my $set_method = " + sub { + my \$self = shift; + \$self->{'_config'}{lc('$attribute')} = shift; + return \$self->{'_config'}{lc('$attribute')}; + }"; + + my $get_method = " + sub { + my \$self = shift; + return \$self->{'_config'}{lc('$attribute')}; + }"; + + + { + no strict 'refs'; + *{'REST::Client::set'.$attribute} = eval $set_method ; + *{'REST::Client::get'.$attribute} = eval $get_method ; + } + + } + + return; +} + +1; + + +=head1 TODO + +Caching, content-type negotiation, readable handles for body content. + +=head1 AUTHOR + +Miles Crawford, Emcrawfor@cpan.orgE + +=head1 COPYRIGHT + +Copyright 2008 - 2010 by Miles Crawford + +This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. + +=cut diff --git a/t/basic.t b/t/basic.t new file mode 100644 index 0000000..7877d61 --- /dev/null +++ b/t/basic.t @@ -0,0 +1,163 @@ +use strict; +use warnings; + +unshift @INC, "../lib"; + +use Test::More; + +# Check testing prereqs +my $run_tests = 1; +eval { + die "HTTP::Server::Simple misbehaves on Windows" if $^O =~ /MSWin/; + require HTTP::Server::Simple; +}; +if($@){ + diag("Won't run tests because: $@"); + $run_tests = 0; +} + + +SKIP: { + skip('test prereqs not met') unless $run_tests; + + use_ok('REST::Client'); + + my $port = 7657; + my $pid = REST::Client::TestServer->new($port)->background(); + + eval { + + # Initializing and configuring + my $client = REST::Client->new(); + ok( $client, "Client returned from new()" ); + ok( + ref($client) =~ /REST::Client/, + "Client returned from new() is blessed" + ); + + my $config = { + host => 'https://example.com', + cert => '/path/to/ssl.crt', + key => '/path/to/ssl.key', + ca => '/path/to/ca.file', + timeout => 10, + }; + + $client = REST::Client->new($config); + + is( $client->getHost(), $config->{'host'}, 'host accessor works' ); + is( $client->getCert(), $config->{'cert'}, 'cert accessor works' ); + is( $client->getKey(), $config->{'key'}, 'key accessor works' ); + is( $client->getCa(), $config->{'ca'}, 'ca accessor works' ); + is( $client->getTimeout(), $config->{'timeout'}, + 'timeout accessor works' ); + + $config = { + host => 'http://example.com', + cert => '/path/from/ssl.crt', + key => '/path/from/ssl.key', + ca => '/path/from/ca.file', + timeout => 60, + }; + + is( $client->setHost( $config->{'host'} ), + $config->{'host'}, 'host setter works' ); + is( $client->setCert( $config->{'cert'} ), + $config->{'cert'}, 'cert setter works' ); + is( $client->setKey( $config->{'key'} ), + $config->{'key'}, 'key setter works' ); + is( $client->setCa( $config->{'ca'} ), + $config->{'ca'}, 'ca setter works' ); + is( $client->setTimeout( $config->{'timeout'} ), + $config->{'timeout'}, 'timeout setter works' ); + + is( $client->getHost(), $config->{'host'}, 'host accessor works' ); + is( $client->getCert(), $config->{'cert'}, 'cert accessor works' ); + is( $client->getKey(), $config->{'key'}, 'key accessor works' ); + is( $client->getCa(), $config->{'ca'}, 'ca accessor works' ); + is( $client->getTimeout(), $config->{'timeout'}, + 'timeout accessor works' ); + + # Basic requests + + $client = REST::Client->new( { host => "127.0.0.1:$port", } ); + + is( $client->GET("/"), $client, "Client returns self" ); + is( $client->PUT("/"), $client, "Client returns self" ); + is( $client->POST("/"), $client, "Client returns self" ); + is( $client->PATCH("/"), $client, "Client returns self" ); + is( $client->DELETE("/"), $client, "Client returns self" ); + is( $client->OPTIONS("/"), $client, "Client returns self" ); + is( $client->HEAD("/"), $client, "Client returns self" ); + is( $client->request( 'GET', "/", '', {} ), + $client, "Client returns self" ); + + my $path = "/ok/" . time() . "/"; + is( $client->GET($path)->responseContent(), + $path, "GET content present" ); + is( $client->PUT($path)->responseContent(), + $path, "PUT content present" ); + is( $client->PATCH($path)->responseContent(), + $path, "PATCH content present" ); + is( $client->POST($path)->responseContent(), + $path, "POST content present" ); + is( $client->DELETE($path)->responseContent(), + $path, "DELETE content present" ); + is( $client->OPTIONS($path)->responseContent(), + $path, "OPTIONS content present" ); + is( $client->HEAD($path)->responseContent(), + '', "HEAD content present" ); + is( $client->request( 'GET', $path, '', {} ), + $client, "request() content present" ); + + is( $client->GET($path)->responseCode(), 200, "Success code" ); + $path = "/error/"; + is( $client->GET($path)->responseCode(), 400, "Error code" ); + $path = "/bogus/"; + is( $client->GET($path)->responseCode(), 404, "Not found code" ); + + ok(scalar($client->responseHeaders()), 'Header names available'); + ok( $client->responseHeader('Client-Response-Num'), 'Can pull a header'); + + + }; + + warn "Tests died: $@" if $@; + + kill 15, $pid; + +} + +done_testing(); +exit; + +package REST::Client::TestServer; + +BEGIN{ + eval 'require HTTP::Server::Simple::CGI;'; + our @ISA = qw(HTTP::Server::Simple::CGI); +} + +sub handle_request { + my ( $self, $cgi ) = @_; + + my $path = $cgi->path_info(); + if ( $path =~ /ok/ ) { + print "HTTP/1.0 200 OK\r\n"; + } + elsif ( $path =~ /error/ ) { + print "HTTP/1.0 400 ERROR\r\n"; + } + else { + print "HTTP/1.0 404 NOT FOUND\r\n"; + } + print "\n$path"; +} + +sub valid_http_method { + my $self = shift; + my $method = shift or return 0; + return $method =~ /^(?:GET|PATCH|POST|HEAD|PUT|DELETE|OPTIONS)$/; +} + +1; -- cgit v1.2.3 From f3e60356eca2a548c7a205ef2ad5d2bdbfd53332 Mon Sep 17 00:00:00 2001 From: "Kevin L. Kane" Date: Tue, 4 Aug 2015 08:45:22 -0400 Subject: allowing CA file to be specified seperate from SSL key and cert to allow for host name verification only, thanks to "IMBS David" --- lib/REST/Client.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index 34c1437..963e652 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -366,10 +366,12 @@ sub request { $ua->ssl_opts(SSL_cert_file => $self->getCert); $ua->ssl_opts(SSL_key_file => $self->getKey); - if(my $ca = $self->getCa){ - croak "REST::Client exception: Cannot read CA file" unless -f $ca; - $ua->ssl_opts(SSL_ca_file => $ca); - } + } + + #prime LWP with CA file if we have one + if(my $ca = $self->getCa){ + croak "REST::Client exception: Cannot read CA file" unless -f $ca; + $ua->ssl_opts(SSL_ca_file => $ca); } #prime LWP with PKCS12 certificate if we have one -- cgit v1.2.3 From 290e5c6401d354777b7917e6eff72cfc8b2e6bbb Mon Sep 17 00:00:00 2001 From: "Kevin L. Kane" Date: Tue, 4 Aug 2015 08:52:40 -0400 Subject: removing Crypt::SSLeay dependency --- META.yml | 2 +- Makefile.PL | 2 +- lib/REST/Client.pm | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/META.yml b/META.yml index bda6a65..3e281a4 100644 --- a/META.yml +++ b/META.yml @@ -19,7 +19,7 @@ no_index: - inc - t requires: - Crypt::SSLeay: 0 + LWP::Protocol::https: 0 LWP::UserAgent: 0 URI: 0 perl: 5.8.0 diff --git a/Makefile.PL b/Makefile.PL index 182cc29..93447c2 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -5,7 +5,7 @@ all_from 'lib/REST/Client.pm'; requires 'URI' => 0; requires 'LWP::UserAgent' => 0; -requires 'Crypt::SSLeay' => 0; +requires 'LWP::Protocol::https' => '0'; test_requires 'Test::More' => '0.8'; WriteAll(); diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index 963e652..033bc9e 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -79,7 +79,6 @@ our ($VERSION) = ('$Rev: 272 $' =~ /(\d+)/); use URI; use LWP::UserAgent; use Carp qw(croak carp); -use Crypt::SSLeay; =head2 Construction and setup @@ -329,10 +328,6 @@ sub request { $url = $self->_prepareURL($url); - #to ensure we use our desired SSL lib - my $tmp_socket_ssl_version = $IO::Socket::SSL::VERSION; - $IO::Socket::SSL::VERSION = undef; - my $ua = $self->getUseragent(); if(defined $self->getTimeout()){ $ua->timeout($self->getTimeout); @@ -386,7 +381,6 @@ sub request { } my $res = $self->getFollow ? $ua->request($req) : $ua->simple_request($req); - $IO::Socket::SSL::VERSION = $tmp_socket_ssl_version; $self->{_res} = $res; -- cgit v1.2.3 From 1c605e97c039eaa019bb33db89e3524db67c7012 Mon Sep 17 00:00:00 2001 From: "Kevin L. Kane" Date: Tue, 4 Aug 2015 09:12:40 -0400 Subject: adding ability to specify call backs and file names to provide alternative mechanisms to process data or large responses --- lib/REST/Client.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index 033bc9e..853338f 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -56,6 +56,13 @@ REST::Client - A simple client for interacting with RESTful http/https resources #It is possible to access the L object REST::Client is using to #make requests, and set advanced options on it, for instance: $client->getUseragent()->proxy(['http'], 'http://proxy.example.com/'); + + # request responses can be written directly to a file + $client->setContentFile( "FileName" ); + + # or call back method + $client->setContentFile( \&callback_method ); + # see LWP::UserAgent for how to define callback methods =head1 DESCRIPTION @@ -380,7 +387,9 @@ sub request { } } - my $res = $self->getFollow ? $ua->request($req) : $ua->simple_request($req); + my $res = $self->getFollow ? + $ua->request( $req, $self->getContentFile ) : + $ua->simple_request( $req, $self->getContentFile ); $self->{_res} = $res; @@ -496,7 +505,7 @@ sub _buildAccessors { return if $self->can('setHost'); - my @attributes = qw(Host Key Cert Ca Timeout Follow Useragent Pkcs12 Pkcs12password); + my @attributes = qw(Host Key Cert Ca Timeout Follow Useragent Pkcs12 Pkcs12password ContentFile); for my $attribute (@attributes){ my $set_method = " -- cgit v1.2.3 From 08d534c230a050406f9c08f721e6d30ca5a9d515 Mon Sep 17 00:00:00 2001 From: "Kevin L. Kane" Date: Tue, 4 Aug 2015 09:50:37 -0400 Subject: adding tests for setContentFile behavior --- t/basic.t | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/t/basic.t b/t/basic.t index 7877d61..0f42330 100644 --- a/t/basic.t +++ b/t/basic.t @@ -119,7 +119,31 @@ SKIP: { ok(scalar($client->responseHeaders()), 'Header names available'); ok( $client->responseHeader('Client-Response-Num'), 'Can pull a header'); + my $fn = "content_file_test"; + $client->setContentFile( $fn ); + $path = "/ok/" . time() . "/"; + $client->GET( $path ); + open( my $fh, "<", $fn ); + my $test; + while( my $data = <$fh> ) { + $test .= $data; + } + + is( $test, $path, "GET into ContentFile (filename) works" ); + `rm $fn`; + + $test = ""; + + my $callback = sub { + my ( $data, $resp, $prot ) = @_; + $test .= $data; + }; + $client->setContentFile( $callback ); + $client->GET( $path ); + is( $test, $path, "GET into ContentFile (callback) works" ); + + $client->setContentFile( undef ); }; warn "Tests died: $@" if $@; -- cgit v1.2.3 From c70df145f063d8e6b69d2ed9d50fa033958b4865 Mon Sep 17 00:00:00 2001 From: "Kevin L. Kane" Date: Wed, 5 Aug 2015 11:06:06 -0400 Subject: bumping version to 273 for new CPAN release; adding missing MANIFEST file so make dist will work --- CHANGES | 10 ++++++++++ MANIFEST | 15 +++++++++++++++ META.yml | 2 +- README.md | 2 +- lib/REST/Client.pm | 2 +- 5 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 MANIFEST diff --git a/CHANGES b/CHANGES index 3d35d0c..9569e8d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +273 +* Add ContentFile that will allow writing responses directly to file or + process using a call back through LWP::UserAgent + +* Seperated CA file from SSL cert and SSL key directives to allow for + hostname verificaiton and ca file specification independently. + Thanks David Imbs. + +* No longer depends on Crypt::SSLeay + 272 * Fix bug that didn't allow false PUT content. Thanks Thomas Hörndlein! diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..20c7709 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,15 @@ +CHANGES +META.yml +Makefile.PL +inc/Module/Install.pm +inc/Module/Install/Win32.pm +inc/Module/Install/Metadata.pm +inc/Module/Install/Base.pm +inc/Module/Install/Makefile.pm +inc/Module/Install/Fetch.pm +inc/Module/Install/WriteAll.pm +inc/Module/Install/Can.pm +README.md +t/basic.t +lib/REST/Client.pm +MANIFEST diff --git a/META.yml b/META.yml index 3e281a4..510b906 100644 --- a/META.yml +++ b/META.yml @@ -25,4 +25,4 @@ requires: perl: 5.8.0 resources: license: http://dev.perl.org/licenses/ -version: 272 +version: 273 diff --git a/README.md b/README.md index d08453d..85f833b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # REST::Client REST::Client module for CPAN. -See http://search.cpan.org/~mcrawfor/REST-Client-272/lib/REST/Client.pm +See http://search.cpan.org/perldoc?REST::Client diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index 853338f..fa35fec 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -81,7 +81,7 @@ use 5.008_000; use constant TRUE => 1; use constant FALSE => 0; -our ($VERSION) = ('$Rev: 272 $' =~ /(\d+)/); +our ($VERSION) = ('$Rev: 273 $' =~ /(\d+)/); use URI; use LWP::UserAgent; -- cgit v1.2.3 From 3cb20d8f8c42c3433a269abbaf437ad101a97563 Mon Sep 17 00:00:00 2001 From: "Gustavo L. de M. Chaves" Date: Tue, 10 Jan 2017 16:46:14 -0200 Subject: Do not prepend default host to absolute URLs Issue: https://rt.cpan.org/Ticket/Display.html?id=119790 --- lib/REST/Client.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index fa35fec..6e77723 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -102,8 +102,8 @@ The config flags are: =item host -A default host that will be prepended to all requests. Allows you to just -specify the path when making requests. +A default host that will be prepended to all requests using relative URLs. +Allows you to just specify the path when making requests. The default is undef - you must include the host in your requests. @@ -476,6 +476,9 @@ sub _prepareURL { my $self = shift; my $url = shift; + # Do not prepend default host to absolute URLs. + return $url if $url =~ /^https?:/; + my $host = $self->getHost; if($host){ $url = '/'.$url unless $url =~ /^\//; -- cgit v1.2.3 From c2fc80fd242bf15e91891fafd2ceb9d0f147e532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Tue, 14 Dec 2021 22:07:23 +0100 Subject: Convert build system to Dist::Zilla Closes: https://rt.cpan.org/Public/Bug/Display.html?id=122263 Closes: https://rt.cpan.org/Public/Bug/Display.html?id=120854 --- .gitignore | 16 + CHANGES | 76 ----- Changes | 76 +++++ MANIFEST | 15 - MANIFEST.SKIP | 38 +++ META.yml | 28 -- Makefile.PL | 11 - dist.ini | 51 ++++ inc/Module/Install.pm | 445 ---------------------------- inc/Module/Install/Base.pm | 78 ----- inc/Module/Install/Can.pm | 81 ------ inc/Module/Install/Fetch.pm | 93 ------ inc/Module/Install/Makefile.pm | 300 ------------------- inc/Module/Install/Metadata.pm | 647 ----------------------------------------- inc/Module/Install/Win32.pm | 64 ---- inc/Module/Install/WriteAll.pm | 60 ---- lib/REST/Client.pm | 18 +- 17 files changed, 183 insertions(+), 1914 deletions(-) create mode 100644 .gitignore delete mode 100644 CHANGES create mode 100644 Changes delete mode 100644 MANIFEST create mode 100644 MANIFEST.SKIP delete mode 100644 META.yml delete mode 100644 Makefile.PL create mode 100644 dist.ini delete mode 100644 inc/Module/Install.pm delete mode 100644 inc/Module/Install/Base.pm delete mode 100644 inc/Module/Install/Can.pm delete mode 100644 inc/Module/Install/Fetch.pm delete mode 100644 inc/Module/Install/Makefile.pm delete mode 100644 inc/Module/Install/Metadata.pm delete mode 100644 inc/Module/Install/Win32.pm delete mode 100644 inc/Module/Install/WriteAll.pm diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5610a24 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +.settings +.project + +/blib +/_build +/.build +/pod2htmd.tmp +/pod2htmi.tmp +/REST-Client-* +/cover_db +/dzil.spec + +*~ +nytprof* +*.patch +*.pm.bak diff --git a/CHANGES b/CHANGES deleted file mode 100644 index 9569e8d..0000000 --- a/CHANGES +++ /dev/null @@ -1,76 +0,0 @@ -273 -* Add ContentFile that will allow writing responses directly to file or - process using a call back through LWP::UserAgent - -* Seperated CA file from SSL cert and SSL key directives to allow for - hostname verificaiton and ca file specification independently. - Thanks David Imbs. - -* No longer depends on Crypt::SSLeay - -272 -* Fix bug that didn't allow false PUT content. Thanks Thomas Hörndlein! - -271 -* Move to LWP 6.x style SSL setup. Thanks Martin Drasar and Joel Crosswhite, - for reports and testing. - -249 -* Remove Makefile from distribution. - -245 -* Fix test dependencies. - -243 -* Gave up on counting tests correctly, use done_testing(). - -240 -* Fix embarassing test-count mismatch. Thanks Wes Young. - -236 -* Added PATCH support by applying Scott Call's PATCH patch. Thanks! - -217 -* Disabled use of http::server::simple on windows, suggested by - Adam Kennedy, thanks. - -171 -* Improved POD with better organization and a fix suggested by - Joshua Barratt (Thanks!) -* Added support for PKCS12 certificates in the config API, - suggested by Sabst (Thanks!) - -164 -* Added a responseHeaders() method -* Added sanity tests of responseHeaders() and responseHeader() - -150 -* Made the tests smarter about skipping when required libs not present. - -134 -* Added a method for accessing the LWP::UserAgent. -* Added user agent config. -* Cached user agent for all requests. -* Improved pod. -* Basic tests. - -118 -* Changed default behavior to not follow redirects. -* Added an option to re-enable original auto-following behavior. - -95 -*Fixed http://rt.cpan.org/Public/Bug/Display.html?id=43819 - thanks Russ. - -88 -* Added html content-type detection to responseXPath to avoid xmlns issues when parsing html/xhtml. - -62 -* Switched to parse_string in the XPath convienince function. parse_html_string was causing - trouble with plain XML. - -57 -*added changes -*unmade a CPAN mistake - -56 -*initial release diff --git a/Changes b/Changes new file mode 100644 index 0000000..9569e8d --- /dev/null +++ b/Changes @@ -0,0 +1,76 @@ +273 +* Add ContentFile that will allow writing responses directly to file or + process using a call back through LWP::UserAgent + +* Seperated CA file from SSL cert and SSL key directives to allow for + hostname verificaiton and ca file specification independently. + Thanks David Imbs. + +* No longer depends on Crypt::SSLeay + +272 +* Fix bug that didn't allow false PUT content. Thanks Thomas Hörndlein! + +271 +* Move to LWP 6.x style SSL setup. Thanks Martin Drasar and Joel Crosswhite, + for reports and testing. + +249 +* Remove Makefile from distribution. + +245 +* Fix test dependencies. + +243 +* Gave up on counting tests correctly, use done_testing(). + +240 +* Fix embarassing test-count mismatch. Thanks Wes Young. + +236 +* Added PATCH support by applying Scott Call's PATCH patch. Thanks! + +217 +* Disabled use of http::server::simple on windows, suggested by + Adam Kennedy, thanks. + +171 +* Improved POD with better organization and a fix suggested by + Joshua Barratt (Thanks!) +* Added support for PKCS12 certificates in the config API, + suggested by Sabst (Thanks!) + +164 +* Added a responseHeaders() method +* Added sanity tests of responseHeaders() and responseHeader() + +150 +* Made the tests smarter about skipping when required libs not present. + +134 +* Added a method for accessing the LWP::UserAgent. +* Added user agent config. +* Cached user agent for all requests. +* Improved pod. +* Basic tests. + +118 +* Changed default behavior to not follow redirects. +* Added an option to re-enable original auto-following behavior. + +95 +*Fixed http://rt.cpan.org/Public/Bug/Display.html?id=43819 - thanks Russ. + +88 +* Added html content-type detection to responseXPath to avoid xmlns issues when parsing html/xhtml. + +62 +* Switched to parse_string in the XPath convienince function. parse_html_string was causing + trouble with plain XML. + +57 +*added changes +*unmade a CPAN mistake + +56 +*initial release diff --git a/MANIFEST b/MANIFEST deleted file mode 100644 index 20c7709..0000000 --- a/MANIFEST +++ /dev/null @@ -1,15 +0,0 @@ -CHANGES -META.yml -Makefile.PL -inc/Module/Install.pm -inc/Module/Install/Win32.pm -inc/Module/Install/Metadata.pm -inc/Module/Install/Base.pm -inc/Module/Install/Makefile.pm -inc/Module/Install/Fetch.pm -inc/Module/Install/WriteAll.pm -inc/Module/Install/Can.pm -README.md -t/basic.t -lib/REST/Client.pm -MANIFEST diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP new file mode 100644 index 0000000..e261e57 --- /dev/null +++ b/MANIFEST.SKIP @@ -0,0 +1,38 @@ +# Avoid version control files. +\.gitignore$ +\.git$ + +# Avoid Makemaker generated and utility files. +\bMakefile$ +\bblib +\bMakeMaker-\d +\bpm_to_blib$ +\bblibdirs$ +^MYMETA\.yml$ +^MYMETA\.json$ + +# Avoid Module::Build generated and utility files. +\bBuild$ +\bBuild.bat$ +\b_build +.tar.gz$ + +# Avoid tars and their unpacked directory trees +^REST-Client + +# Avoid temp and backup files. +~$ +\.tmp$ +\.old$ +\.bak$ +\#$ +\b\.# + +# NYTProf profiling output +nytprof + +# Devel::Cover output +^cover_db + +# coding documentation not for distribution +\bdoc\b diff --git a/META.yml b/META.yml deleted file mode 100644 index 510b906..0000000 --- a/META.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -abstract: 'A simple client for interacting with RESTful http/https resources' -author: - - 'Miles Crawford, ' -build_requires: - ExtUtils::MakeMaker: 6.42 - Test::More: 0.8 -configure_requires: - ExtUtils::MakeMaker: 6.42 -distribution_type: module -generated_by: 'Module::Install version 0.92' -license: perl -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 -name: REST-Client -no_index: - directory: - - inc - - t -requires: - LWP::Protocol::https: 0 - LWP::UserAgent: 0 - URI: 0 - perl: 5.8.0 -resources: - license: http://dev.perl.org/licenses/ -version: 273 diff --git a/Makefile.PL b/Makefile.PL deleted file mode 100644 index 93447c2..0000000 --- a/Makefile.PL +++ /dev/null @@ -1,11 +0,0 @@ -use inc::Module::Install; - -name 'REST-Client'; -all_from 'lib/REST/Client.pm'; - -requires 'URI' => 0; -requires 'LWP::UserAgent' => 0; -requires 'LWP::Protocol::https' => '0'; -test_requires 'Test::More' => '0.8'; - -WriteAll(); diff --git a/dist.ini b/dist.ini new file mode 100644 index 0000000..085d3b9 --- /dev/null +++ b/dist.ini @@ -0,0 +1,51 @@ +name = REST-Client +main_module = lib/REST/Client.pm +author = Miles Crawford +author = Kevin L. Kane +license = Perl_5 +copyright_holder = Miles Crawford +copyright_year = 2008 + +[VersionFromMainModule] + +[MetaResources] +homepage = https://github.com/milescrawford/cpan-rest-client +bugtracker.web = https://github.com/milescrawford/cpan-rest-client/issues +repository.url = https://github.com/milescrawford/cpan-rest-client.git +repository.web = https://github.com/milescrawford/cpan-rest-client +repository.type = git + +[GatherDir] + +[MetaJSON] + +[MakeMaker] + +[Git::Check] + +[Git::Commit] +commit_msg = Release %N %v%n%n%c + +[Git::Tag] +tag_format = %N-%v +tag_message = Release %N %v + +[Git::Push] + +[AutoPrereqs] +skip = XML::LibXML + +[Prereqs] +perl = 5.8.0 +LWP::Protocol::https = 0 + +[Prereqs / RuntimeSuggests] +XML::LibXML = 0 + +[TestRelease] +[ConfirmRelease] +[UploadToCPAN] + +[PodWeaver] + +[Test::ReportPrereqs] diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm deleted file mode 100644 index aceb4de..0000000 --- a/inc/Module/Install.pm +++ /dev/null @@ -1,445 +0,0 @@ -#line 1 -package Module::Install; - -# For any maintainers: -# The load order for Module::Install is a bit magic. -# It goes something like this... -# -# IF ( host has Module::Install installed, creating author mode ) { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install -# 3. The installed version of inc::Module::Install loads -# 4. inc::Module::Install calls "require Module::Install" -# 5. The ./inc/ version of Module::Install loads -# } ELSE { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install -# 3. The ./inc/ version of Module::Install loads -# } - -use 5.005; -use strict 'vars'; - -use vars qw{$VERSION $MAIN}; -BEGIN { - # All Module::Install core packages now require synchronised versions. - # This will be used to ensure we don't accidentally load old or - # different versions of modules. - # 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 - # Module::Install extensions. - $VERSION = '0.92'; - - # Storage for the pseudo-singleton - $MAIN = undef; - - *inc::Module::Install::VERSION = *VERSION; - @inc::Module::Install::ISA = __PACKAGE__; - -} - - - - - -# Whether or not inc::Module::Install is actually loaded, the -# $INC{inc/Module/Install.pm} is what will still get set as long as -# the caller loaded module this in the documented manner. -# If not set, the caller may NOT have loaded the bundled version, and thus -# they may not have a MI version that works with the Makefile.PL. This would -# result in false errors or unexpected behaviour. And we don't want that. -my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; -unless ( $INC{$file} ) { die <<"END_DIE" } - -Please invoke ${\__PACKAGE__} with: - - use inc::${\__PACKAGE__}; - -not: - - use ${\__PACKAGE__}; - -END_DIE - - - - - -# If the script that is loading Module::Install is from the future, -# then make will detect this and cause it to re-run over and over -# again. This is bad. Rather than taking action to touch it (which -# is unreliable on some platforms and requires write permissions) -# for now we should catch this and refuse to run. -if ( -f $0 ) { - my $s = (stat($0))[9]; - - # If the modification time is only slightly in the future, - # sleep briefly to remove the problem. - my $a = $s - time; - if ( $a > 0 and $a < 5 ) { sleep 5 } - - # Too far in the future, throw an error. - my $t = time; - if ( $s > $t ) { die <<"END_DIE" } - -Your installer $0 has a modification time in the future ($s > $t). - -This is known to create infinite loops in make. - -Please correct this, then run $0 again. - -END_DIE -} - - - - - -# Build.PL was formerly supported, but no longer is due to excessive -# difficulty in implementing every single feature twice. -if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } - -Module::Install no longer supports Build.PL. - -It was impossible to maintain duel backends, and has been deprecated. - -Please remove all Build.PL files and only use the Makefile.PL installer. - -END_DIE - - - - - -# To save some more typing in Module::Install installers, every... -# use inc::Module::Install -# ...also acts as an implicit use strict. -$^H |= strict::bits(qw(refs subs vars)); - - - - - -use Cwd (); -use File::Find (); -use File::Path (); -use FindBin; - -sub autoload { - my $self = shift; - my $who = $self->_caller; - my $cwd = Cwd::cwd(); - my $sym = "${who}::AUTOLOAD"; - $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); - if ( my $code = $sym->{$pwd} ) { - # Delegate back to parent dirs - goto &$code unless $cwd eq $pwd; - } - $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; - my $method = $1; - if ( uc($method) eq $method ) { - # Do nothing - return; - } elsif ( $method =~ /^_/ and $self->can($method) ) { - # Dispatch to the root M:I class - return $self->$method(@_); - } - - # Dispatch to the appropriate plugin - unshift @_, ( $self, $1 ); - goto &{$self->can('call')}; - }; -} - -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - unless ( -f $self->{file} ) { - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{"$self->{file}"}; - delete $INC{"$self->{path}.pm"}; - - # Save to the singleton - $MAIN = $self; - - return 1; -} - -sub preload { - my $self = shift; - unless ( $self->{extensions} ) { - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ); - } - - my @exts = @{$self->{extensions}}; - unless ( @exts ) { - @exts = $self->{admin}->load_all_extensions; - } - - my %seen; - foreach my $obj ( @exts ) { - while (my ($method, $glob) = each %{ref($obj) . '::'}) { - next unless $obj->can($method); - next if $method =~ /^_/; - next if $method eq uc($method); - $seen{$method}++; - } - } - - my $who = $self->_caller; - foreach my $name ( sort keys %seen ) { - *{"${who}::$name"} = sub { - ${"${who}::AUTOLOAD"} = "${who}::$name"; - goto &{"${who}::AUTOLOAD"}; - }; - } -} - -sub new { - my ($class, %args) = @_; - - # ignore the prefix on extension modules built from top level. - my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { - delete $args{prefix}; - } - - return $args{_self} if $args{_self}; - - $args{dispatch} ||= 'Admin'; - $args{prefix} ||= 'inc'; - $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); - $args{bundle} ||= 'inc/BUNDLES'; - $args{base} ||= $base_path; - $class =~ s/^\Q$args{prefix}\E:://; - $args{name} ||= $class; - $args{version} ||= $class->VERSION; - unless ( $args{path} ) { - $args{path} = $args{name}; - $args{path} =~ s!::!/!g; - } - $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; - $args{wrote} = 0; - - bless( \%args, $class ); -} - -sub call { - my ($self, $method) = @_; - my $obj = $self->load($method) or return; - splice(@_, 0, 2, $obj); - goto &{$obj->can($method)}; -} - -sub load { - my ($self, $method) = @_; - - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; - - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } - - my $admin = $self->{admin} or die <<"END_DIE"; -The '$method' method does not exist in the '$self->{prefix}' path! -Please remove the '$self->{prefix}' directory and run $0 again to load it. -END_DIE - - my $obj = $admin->load($method, 1); - push @{$self->{extensions}}, $obj; - - $obj; -} - -sub load_extensions { - my ($self, $path, $top) = @_; - - unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { - unshift @INC, $self->{prefix}; - } - - foreach my $rv ( $self->find_extensions($path) ) { - my ($file, $pkg) = @{$rv}; - next if $self->{pathnames}{$pkg}; - - local $@; - my $new = eval { require $file; $pkg->can('new') }; - unless ( $new ) { - warn $@ if $@; - next; - } - $self->{pathnames}{$pkg} = delete $INC{$file}; - push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); - } - - $self->{extensions} ||= []; -} - -sub find_extensions { - my ($self, $path) = @_; - - my @found; - File::Find::find( sub { - my $file = $File::Find::name; - return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; - my $subpath = $1; - return if lc($subpath) eq lc($self->{dispatch}); - - $file = "$self->{path}/$subpath.pm"; - my $pkg = "$self->{name}::$subpath"; - $pkg =~ s!/!::!g; - - # If we have a mixed-case package name, assume case has been preserved - # correctly. Otherwise, root through the file to locate the case-preserved - # version of the package name. - if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { - my $content = Module::Install::_read($subpath . '.pm'); - my $in_pod = 0; - foreach ( split //, $content ) { - $in_pod = 1 if /^=\w/; - $in_pod = 0 if /^=cut/; - next if ($in_pod || /^=cut/); # skip pod text - next if /^\s*#/; # and comments - if ( m/^\s*package\s+($pkg)\s*;/i ) { - $pkg = $1; - last; - } - } - } - - push @found, [ $file, $pkg ]; - }, $path ) if -d $path; - - @found; -} - - - - - -##################################################################### -# Common Utility Functions - -sub _caller { - my $depth = 0; - my $call = caller($depth); - while ( $call eq __PACKAGE__ ) { - $depth++; - $call = caller($depth); - } - return $call; -} - -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _read { - local *FH; - open( FH, '<', $_[0] ) or die "open($_[0]): $!"; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_NEW -sub _read { - local *FH; - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; - my $string = do { local $/; }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_OLD - -sub _readperl { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; - $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; - return $string; -} - -sub _readpod { - my $string = Module::Install::_read($_[0]); - $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; - return $string if $_[0] =~ /\.pod\z/; - $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; - $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; - $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; - $string =~ s/^\n+//s; - return $string; -} - -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _write { - local *FH; - open( FH, '>', $_[0] ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_NEW -sub _write { - local *FH; - open( FH, "> $_[0]" ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; - } - close FH or die "close($_[0]): $!"; -} -END_OLD - -# _version is for processing module versions (eg, 1.03_05) not -# Perl versions (eg, 5.8.1). -sub _version ($) { - my $s = shift || 0; - my $d =()= $s =~ /(\.)/g; - if ( $d >= 2 ) { - # Normalise multipart versions - $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; - } - $s =~ s/^(\d+)\.?//; - my $l = $1 || 0; - my @v = map { - $_ . '0' x (3 - length $_) - } $s =~ /(\d{1,3})\D?/g; - $l = $l . '.' . join '', @v if @v; - return $l + 0; -} - -sub _cmp ($$) { - _version($_[0]) <=> _version($_[1]); -} - -# Cloned from Params::Util::_CLASS -sub _CLASS ($) { - ( - defined $_[0] - and - ! ref $_[0] - and - $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s - ) ? $_[0] : undef; -} - -1; - -# Copyright 2008 - 2010 Adam Kennedy. diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm deleted file mode 100644 index 618bf57..0000000 --- a/inc/Module/Install/Base.pm +++ /dev/null @@ -1,78 +0,0 @@ -#line 1 -package Module::Install::Base; - -use strict 'vars'; -use vars qw{$VERSION}; -BEGIN { - $VERSION = '0.92'; -} - -# Suspend handler for "redefined" warnings -BEGIN { - my $w = $SIG{__WARN__}; - $SIG{__WARN__} = sub { $w }; -} - -#line 42 - -sub new { - my $class = shift; - unless ( defined &{"${class}::call"} ) { - *{"${class}::call"} = sub { shift->_top->call(@_) }; - } - unless ( defined &{"${class}::load"} ) { - *{"${class}::load"} = sub { shift->_top->load(@_) }; - } - bless { @_ }, $class; -} - -#line 61 - -sub AUTOLOAD { - local $@; - my $func = eval { shift->_top->autoload } or return; - goto &$func; -} - -#line 75 - -sub _top { - $_[0]->{_top}; -} - -#line 90 - -sub admin { - $_[0]->_top->{admin} - or - Module::Install::Base::FakeAdmin->new; -} - -#line 106 - -sub is_admin { - $_[0]->admin->VERSION; -} - -sub DESTROY {} - -package Module::Install::Base::FakeAdmin; - -my $fake; - -sub new { - $fake ||= bless(\@_, $_[0]); -} - -sub AUTOLOAD {} - -sub DESTROY {} - -# Restore warning handler -BEGIN { - $SIG{__WARN__} = $SIG{__WARN__}->(); -} - -1; - -#line 154 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm deleted file mode 100644 index 75b8a27..0000000 --- a/inc/Module/Install/Can.pm +++ /dev/null @@ -1,81 +0,0 @@ -#line 1 -package Module::Install::Can; - -use strict; -use Config (); -use File::Spec (); -use ExtUtils::MakeMaker (); -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '0.92'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# check if we can load some module -### Upgrade this to not have to load the module if possible -sub can_use { - my ($self, $mod, $ver) = @_; - $mod =~ s{::|\\}{/}g; - $mod .= '.pm' unless $mod =~ /\.pm$/i; - - my $pkg = $mod; - $pkg =~ s{/}{::}g; - $pkg =~ s{\.pm$}{}i; - - local $@; - eval { require $mod; $pkg->VERSION($ver || 0); 1 }; -} - -# check if we can run some command -sub can_run { - my ($self, $cmd) = @_; - - my $_cmd = $cmd; - return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); - - for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - next if $dir eq ''; - my $abs = File::Spec->catfile($dir, $_[1]); - return $abs if (-x $abs or $abs = MM->maybe_command($abs)); - } - - return; -} - -# can we locate a (the) C compiler -sub can_cc { - my $self = shift; - my @chunks = split(/ /, $Config::Config{cc}) or return; - - # $Config{cc} may contain args; try to find out the program part - while (@chunks) { - return $self->can_run("@chunks") || (pop(@chunks), next); - } - - return; -} - -# Fix Cygwin bug on maybe_command(); -if ( $^O eq 'cygwin' ) { - require ExtUtils::MM_Cygwin; - require ExtUtils::MM_Win32; - if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { - *ExtUtils::MM_Cygwin::maybe_command = sub { - my ($self, $file) = @_; - if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { - ExtUtils::MM_Win32->maybe_command($file); - } else { - ExtUtils::MM_Unix->maybe_command($file); - } - } - } -} - -1; - -__END__ - -#line 156 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm deleted file mode 100644 index e3d6800..0000000 --- a/inc/Module/Install/Fetch.pm +++ /dev/null @@ -1,93 +0,0 @@ -#line 1 -package Module::Install::Fetch; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '0.92'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub get_file { - my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - - if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { - $args{url} = $args{ftp_url} - or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - } - - $|++; - print "Fetching '$file' from $host... "; - - unless (eval { require Socket; Socket::inet_aton($host) }) { - warn "'$host' resolve failed!\n"; - return; - } - - return unless $scheme eq 'ftp' or $scheme eq 'http'; - - require Cwd; - my $dir = Cwd::getcwd(); - chdir $args{local_dir} or return if exists $args{local_dir}; - - if (eval { require LWP::Simple; 1 }) { - LWP::Simple::mirror($args{url}, $file); - } - elsif (eval { require Net::FTP; 1 }) { eval { - # use Net::FTP to get past firewall - my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); - $ftp->login("anonymous", 'anonymous@example.com'); - $ftp->cwd($path); - $ftp->binary; - $ftp->get($file) or (warn("$!\n"), return); - $ftp->quit; - } } - elsif (my $ftp = $self->can_run('ftp')) { eval { - # no Net::FTP, fallback to ftp.exe - require FileHandle; - my $fh = FileHandle->new; - - local $SIG{CHLD} = 'IGNORE'; - unless ($fh->open("|$ftp -n")) { - warn "Couldn't open ftp: $!\n"; - chdir $dir; return; - } - - my @dialog = split(/\n/, <<"END_FTP"); -open $host -user anonymous anonymous\@example.com -cd $path -binary -get $file $file -quit -END_FTP - foreach (@dialog) { $fh->print("$_\n") } - $fh->close; - } } - else { - warn "No working 'ftp' program available!\n"; - chdir $dir; return; - } - - unless (-f $file) { - warn "Fetching failed: $@\n"; - chdir $dir; return; - } - - return if exists $args{size} and -s $file != $args{size}; - system($args{run}) if exists $args{run}; - unlink($file) if $args{remove}; - - print(((!exists $args{check_for} or -e $args{check_for}) - ? "done!" : "failed! ($!)"), "\n"); - chdir $dir; return !$?; -} - -1; diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm deleted file mode 100644 index acf10ef..0000000 --- a/inc/Module/Install/Makefile.pm +++ /dev/null @@ -1,300 +0,0 @@ -#line 1 -package Module::Install::Makefile; - -use strict 'vars'; -use ExtUtils::MakeMaker (); -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '0.92'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub Makefile { $_[0] } - -my %seen = (); - -sub prompt { - shift; - - # Infinite loop protection - my @c = caller(); - if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { - die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; - } - - # In automated testing, always use defaults - if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { - local $ENV{PERL_MM_USE_DEFAULT} = 1; - goto &ExtUtils::MakeMaker::prompt; - } else { - goto &ExtUtils::MakeMaker::prompt; - } -} - -# Store a cleaned up version of the MakeMaker version, -# since we need to behave differently in a variety of -# ways based on the MM version. -my $makemaker = eval $ExtUtils::MakeMaker::VERSION; - -# If we are passed a param, do a "newer than" comparison. -# Otherwise, just return the MakeMaker version. -sub makemaker { - ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 -} - -sub makemaker_args { - my $self = shift; - my $args = ( $self->{makemaker_args} ||= {} ); - %$args = ( %$args, @_ ); - return $args; -} - -# For mm args that take multiple space-seperated args, -# append an argument to the current list. -sub makemaker_append { - my $self = shift; - my $name = shift; - my $args = $self->makemaker_args; - $args->{name} = defined $args->{$name} - ? join( ' ', $args->{name}, @_ ) - : join( ' ', @_ ); -} - -sub build_subdirs { - my $self = shift; - my $subdirs = $self->makemaker_args->{DIR} ||= []; - for my $subdir (@_) { - push @$subdirs, $subdir; - } -} - -sub clean_files { - my $self = shift; - my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), - ); -} - -sub realclean_files { - my $self = shift; - my $realclean = $self->makemaker_args->{realclean} ||= {}; - %$realclean = ( - %$realclean, - FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), - ); -} - -sub libs { - my $self = shift; - my $libs = ref $_[0] ? shift : [ shift ]; - $self->makemaker_args( LIBS => $libs ); -} - -sub inc { - my $self = shift; - $self->makemaker_args( INC => shift ); -} - -my %test_dir = (); - -sub _wanted_t { - /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1; -} - -sub tests_recursive { - my $self = shift; - if ( $self->tests ) { - die "tests_recursive will not work if tests are already defined"; - } - my $dir = shift || 't'; - unless ( -d $dir ) { - die "tests_recursive dir '$dir' does not exist"; - } - %test_dir = (); - require File::Find; - File::Find::find( \&_wanted_t, $dir ); - $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir ); -} - -sub write { - my $self = shift; - die "&Makefile->write() takes no arguments\n" if @_; - - # Check the current Perl version - my $perl_version = $self->perl_version; - if ( $perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - } - - # Make sure we have a new enough MakeMaker - require ExtUtils::MakeMaker; - - if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { - # MakeMaker can complain about module versions that include - # an underscore, even though its own version may contain one! - # Hence the funny regexp to get rid of it. See RT #35800 - # for details. - my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/; - $self->build_requires( 'ExtUtils::MakeMaker' => $v ); - $self->configure_requires( 'ExtUtils::MakeMaker' => $v ); - } else { - # Allow legacy-compatibility with 5.005 by depending on the - # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); - $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 ); - } - - # Generate the MakeMaker params - my $args = $self->makemaker_args; - $args->{DISTNAME} = $self->name; - $args->{NAME} = $self->module_name || $self->name; - $args->{VERSION} = $self->version; - $args->{NAME} =~ s/-/::/g; - if ( $self->tests ) { - $args->{test} = { TESTS => $self->tests }; - } - if ( $] >= 5.005 ) { - $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = $self->author; - } - if ( $self->makemaker(6.10) ) { - $args->{NO_META} = 1; - } - if ( $self->makemaker(6.17) and $self->sign ) { - $args->{SIGN} = 1; - } - unless ( $self->is_admin ) { - delete $args->{SIGN}; - } - - my $prereq = ($args->{PREREQ_PM} ||= {}); - %$prereq = ( %$prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->requires) - ); - - # Remove any reference to perl, PREREQ_PM doesn't support it - delete $args->{PREREQ_PM}->{perl}; - - # Merge both kinds of requires into BUILD_REQUIRES - my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); - %$build_prereq = ( %$build_prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->configure_requires, $self->build_requires) - ); - - # Remove any reference to perl, BUILD_REQUIRES doesn't support it - delete $args->{BUILD_REQUIRES}->{perl}; - - # Delete bundled dists from prereq_pm - my $subdirs = ($args->{DIR} ||= []); - if ($self->bundles) { - foreach my $bundle (@{ $self->bundles }) { - my ($file, $dir) = @$bundle; - push @$subdirs, $dir if -d $dir; - delete $build_prereq->{$file}; #Delete from build prereqs only - } - } - - unless ( $self->makemaker('6.55_03') ) { - %$prereq = (%$prereq,%$build_prereq); - delete $args->{BUILD_REQUIRES}; - } - - if ( my $perl_version = $self->perl_version ) { - eval "use $perl_version; 1" - or die "ERROR: perl: Version $] is installed, " - . "but we need version >= $perl_version"; - - if ( $self->makemaker(6.48) ) { - $args->{MIN_PERL_VERSION} = $perl_version; - } - } - - $args->{INSTALLDIRS} = $self->installdirs; - - my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; - - my $user_preop = delete $args{dist}->{PREOP}; - if (my $preop = $self->admin->preop($user_preop)) { - foreach my $key ( keys %$preop ) { - $args{dist}->{$key} = $preop->{$key}; - } - } - - my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); - $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); -} - -sub fix_up_makefile { - my $self = shift; - my $makefile_name = shift; - my $top_class = ref($self->_top) || ''; - my $top_version = $self->_top->VERSION || ''; - - my $preamble = $self->preamble - ? "# Preamble by $top_class $top_version\n" - . $self->preamble - : ''; - my $postamble = "# Postamble by $top_class $top_version\n" - . ($self->postamble || ''); - - local *MAKEFILE; - open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - my $makefile = do { local $/; }; - close MAKEFILE or die $!; - - $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; - $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; - $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; - $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; - $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; - - # Module::Install will never be used to build the Core Perl - # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks - # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist - $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; - #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; - - # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. - $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; - - # XXX - This is currently unused; not sure if it breaks other MM-users - # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - - open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - print MAKEFILE "$preamble$makefile$postamble" or die $!; - close MAKEFILE or die $!; - - 1; -} - -sub preamble { - my ($self, $text) = @_; - $self->{preamble} = $text . $self->{preamble} if defined $text; - $self->{preamble}; -} - -sub postamble { - my ($self, $text) = @_; - $self->{postamble} ||= $self->admin->postamble; - $self->{postamble} .= $text if defined $text; - $self->{postamble} -} - -1; - -__END__ - -#line 426 diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm deleted file mode 100644 index b00e6b1..0000000 --- a/inc/Module/Install/Metadata.pm +++ /dev/null @@ -1,647 +0,0 @@ -#line 1 -package Module::Install::Metadata; - -use strict 'vars'; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '0.92'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -my @boolean_keys = qw{ - sign -}; - -my @scalar_keys = qw{ - name - module_name - abstract - author - version - distribution_type - tests - installdirs -}; - -my @tuple_keys = qw{ - configure_requires - build_requires - requires - recommends - bundles - resources -}; - -my @resource_keys = qw{ - homepage - bugtracker - repository -}; - -my @array_keys = qw{ - keywords -}; - -sub Meta { shift } -sub Meta_BooleanKeys { @boolean_keys } -sub Meta_ScalarKeys { @scalar_keys } -sub Meta_TupleKeys { @tuple_keys } -sub Meta_ResourceKeys { @resource_keys } -sub Meta_ArrayKeys { @array_keys } - -foreach my $key ( @boolean_keys ) { - *$key = sub { - my $self = shift; - if ( defined wantarray and not @_ ) { - return $self->{values}->{$key}; - } - $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); - return $self; - }; -} - -foreach my $key ( @scalar_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} = shift; - return $self; - }; -} - -foreach my $key ( @array_keys ) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} if defined wantarray and !@_; - $self->{values}->{$key} ||= []; - push @{$self->{values}->{$key}}, @_; - return $self; - }; -} - -foreach my $key ( @resource_keys ) { - *$key = sub { - my $self = shift; - unless ( @_ ) { - return () unless $self->{values}->{resources}; - return map { $_->[1] } - grep { $_->[0] eq $key } - @{ $self->{values}->{resources} }; - } - return $self->{values}->{resources}->{$key} unless @_; - my $uri = shift or die( - "Did not provide a value to $key()" - ); - $self->resources( $key => $uri ); - return 1; - }; -} - -foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { - *$key = sub { - my $self = shift; - return $self->{values}->{$key} unless @_; - my @added; - while ( @_ ) { - my $module = shift or last; - my $version = shift || 0; - push @added, [ $module, $version ]; - } - push @{ $self->{values}->{$key} }, @added; - return map {@$_} @added; - }; -} - -# Resource handling -my %lc_resource = map { $_ => 1 } qw{ - homepage - license - bugtracker - repository -}; - -sub resources { - my $self = shift; - while ( @_ ) { - my $name = shift or last; - my $value = shift or next; - if ( $name eq lc $name and ! $lc_resource{$name} ) { - die("Unsupported reserved lowercase resource '$name'"); - } - $self->{values}->{resources} ||= []; - push @{ $self->{values}->{resources} }, [ $name, $value ]; - } - $self->{values}->{resources}; -} - -# Aliases for build_requires that will have alternative -# meanings in some future version of META.yml. -sub test_requires { shift->build_requires(@_) } -sub install_requires { shift->build_requires(@_) } - -# Aliases for installdirs options -sub install_as_core { $_[0]->installdirs('perl') } -sub install_as_cpan { $_[0]->installdirs('site') } -sub install_as_site { $_[0]->installdirs('site') } -sub install_as_vendor { $_[0]->installdirs('vendor') } - -sub dynamic_config { - my $self = shift; - unless ( @_ ) { - warn "You MUST provide an explicit true/false value to dynamic_config\n"; - return $self; - } - $self->{values}->{dynamic_config} = $_[0] ? 1 : 0; - return 1; -} - -sub perl_version { - my $self = shift; - return $self->{values}->{perl_version} unless @_; - my $version = shift or die( - "Did not provide a value to perl_version()" - ); - - # Normalize the version - $version = $self->_perl_version($version); - - # We don't support the reall old versions - unless ( $version >= 5.005 ) { - die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; - } - - $self->{values}->{perl_version} = $version; -} - -#Stolen from M::B -my %license_urls = ( - perl => 'http://dev.perl.org/licenses/', - apache => 'http://apache.org/licenses/LICENSE-2.0', - artistic => 'http://opensource.org/licenses/artistic-license.php', - artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', - lgpl => 'http://opensource.org/licenses/lgpl-license.php', - lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', - lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', - bsd => 'http://opensource.org/licenses/bsd-license.php', - gpl => 'http://opensource.org/licenses/gpl-license.php', - gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', - gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', - mit => 'http://opensource.org/licenses/mit-license.php', - mozilla => 'http://opensource.org/licenses/mozilla1.1.php', - open_source => undef, - unrestricted => undef, - restrictive => undef, - unknown => undef, -); - -sub license { - my $self = shift; - return $self->{values}->{license} unless @_; - my $license = shift or die( - 'Did not provide a value to license()' - ); - $self->{values}->{license} = $license; - - # Automatically fill in license URLs - if ( $license_urls{$license} ) { - $self->resources( license => $license_urls{$license} ); - } - - return 1; -} - -sub all_from { - my ( $self, $file ) = @_; - - unless ( defined($file) ) { - my $name = $self->name or die( - "all_from called with no args without setting name() first" - ); - $file = join('/', 'lib', split(/-/, $name)) . '.pm'; - $file =~ s{.*/}{} unless -e $file; - unless ( -e $file ) { - die("all_from cannot find $file from $name"); - } - } - unless ( -f $file ) { - die("The path '$file' does not exist, or is not a file"); - } - - $self->{values}{all_from} = $file; - - # Some methods pull from POD instead of code. - # If there is a matching .pod, use that instead - my $pod = $file; - $pod =~ s/\.pm$/.pod/i; - $pod = $file unless -e $pod; - - # Pull the different values - $self->name_from($file) unless $self->name; - $self->version_from($file) unless $self->version; - $self->perl_version_from($file) unless $self->perl_version; - $self->author_from($pod) unless $self->author; - $self->license_from($pod) unless $self->license; - $self->abstract_from($pod) unless $self->abstract; - - return 1; -} - -sub provides { - my $self = shift; - my $provides = ( $self->{values}->{provides} ||= {} ); - %$provides = (%$provides, @_) if @_; - return $provides; -} - -sub auto_provides { - my $self = shift; - return $self unless $self->is_admin; - unless (-e 'MANIFEST') { - warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; - return $self; - } - # Avoid spurious warnings as we are not checking manifest here. - local $SIG{__WARN__} = sub {1}; - require ExtUtils::Manifest; - local *ExtUtils::Manifest::manicheck = sub { return }; - - require Module::Build; - my $build = Module::Build->new( - dist_name => $self->name, - dist_version => $self->version, - license => $self->license, - ); - $self->provides( %{ $build->find_dist_packages || {} } ); -} - -sub feature { - my $self = shift; - my $name = shift; - my $features = ( $self->{values}->{features} ||= [] ); - my $mods; - - if ( @_ == 1 and ref( $_[0] ) ) { - # The user used ->feature like ->features by passing in the second - # argument as a reference. Accomodate for that. - $mods = $_[0]; - } else { - $mods = \@_; - } - - my $count = 0; - push @$features, ( - $name => [ - map { - ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ - } @$mods - ] - ); - - return @$features; -} - -sub features { - my $self = shift; - while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { - $self->feature( $name, @$mods ); - } - return $self->{values}->{features} - ? @{ $self->{values}->{features} } - : (); -} - -sub no_index { - my $self = shift; - my $type = shift; - push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; - return $self->{values}->{no_index}; -} - -sub read { - my $self = shift; - $self->include_deps( 'YAML::Tiny', 0 ); - - require YAML::Tiny; - my $data = YAML::Tiny::LoadFile('META.yml'); - - # Call methods explicitly in case user has already set some values. - while ( my ( $key, $value ) = each %$data ) { - next unless $self->can($key); - if ( ref $value eq 'HASH' ) { - while ( my ( $module, $version ) = each %$value ) { - $self->can($key)->($self, $module => $version ); - } - } else { - $self->can($key)->($self, $value); - } - } - return $self; -} - -sub write { - my $self = shift; - return $self unless $self->is_admin; - $self->admin->write_meta; - return $self; -} - -sub version_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->version( ExtUtils::MM_Unix->parse_version($file) ); -} - -sub abstract_from { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->abstract( - bless( - { DISTNAME => $self->name }, - 'ExtUtils::MM_Unix' - )->parse_abstract($file) - ); -} - -# Add both distribution and module name -sub name_from { - my ($self, $file) = @_; - if ( - Module::Install::_read($file) =~ m/ - ^ \s* - package \s* - ([\w:]+) - \s* ; - /ixms - ) { - my ($name, $module_name) = ($1, $1); - $name =~ s{::}{-}g; - $self->name($name); - unless ( $self->module_name ) { - $self->module_name($module_name); - } - } else { - die("Cannot determine name from $file\n"); - } -} - -sub _extract_perl_version { - if ( - $_[0] =~ m/ - ^\s* - (?:use|require) \s* - v? - ([\d_\.]+) - \s* ; - /ixms - ) { - my $perl_version = $1; - $perl_version =~ s{_}{}g; - return $perl_version; - } else { - return; - } -} - -sub perl_version_from { - my $self = shift; - my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); - if ($perl_version) { - $self->perl_version($perl_version); - } else { - warn "Cannot determine perl version info from $_[0]\n"; - return; - } -} - -sub author_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - if ($content =~ m/ - =head \d \s+ (?:authors?)\b \s* - ([^\n]*) - | - =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* - .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* - ([^\n]*) - /ixms) { - my $author = $1 || $2; - $author =~ s{E}{<}g; - $author =~ s{E}{>}g; - $self->author($author); - } else { - warn "Cannot determine author info from $_[0]\n"; - } -} - -sub _extract_license { - if ( - $_[0] =~ m/ - ( - =head \d \s+ - (?:licen[cs]e|licensing|copyrights?|legal)\b - .*? - ) - (=head\\d.*|=cut.*|) - \z - /ixms ) { - my $license_text = $1; - my @phrases = ( - 'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1, - 'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'BSD license' => 'bsd', 1, - 'Artistic license' => 'artistic', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s#\s+#\\s+#gs; - if ( $license_text =~ /\b$pattern\b/i ) { - return $license; - } - } - } else { - return; - } -} - -sub license_from { - my $self = shift; - if (my $license=_extract_license(Module::Install::_read($_[0]))) { - $self->license($license); - } else { - warn "Cannot determine license info from $_[0]\n"; - return 'unknown'; - } -} - -sub _extract_bugtracker { - my @links = $_[0] =~ m#L<( - \Qhttp://rt.cpan.org/\E[^>]+| - \Qhttp://github.com/\E[\w_]+/[\w_]+/issues| - \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list - )>#gx; - my %links; - @links{@links}=(); - @links=keys %links; - return @links; -} - -sub bugtracker_from { - my $self = shift; - my $content = Module::Install::_read($_[0]); - my @links = _extract_bugtracker($content); - unless ( @links ) { - warn "Cannot determine bugtracker info from $_[0]\n"; - return 0; - } - if ( @links > 1 ) { - warn "Found more than one bugtracker link in $_[0]\n"; - return 0; - } - - # Set the bugtracker - bugtracker( $links[0] ); - return 1; -} - -sub requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->requires( $module => $version ); - } -} - -sub test_requires_from { - my $self = shift; - my $content = Module::Install::_readperl($_[0]); - my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; - while ( @requires ) { - my $module = shift @requires; - my $version = shift @requires; - $self->test_requires( $module => $version ); - } -} - -# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to -# numbers (eg, 5.006001 or 5.008009). -# Also, convert double-part versions (eg, 5.8) -sub _perl_version { - my $v = $_[-1]; - $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; - $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; - $v =~ s/(\.\d\d\d)000$/$1/; - $v =~ s/_.+$//; - if ( ref($v) ) { - # Numify - $v = $v + 0; - } - return $v; -} - - - - - -###################################################################### -# MYMETA Support - -sub WriteMyMeta { - die "WriteMyMeta has been deprecated"; -} - -sub write_mymeta_yaml { - my $self = shift; - - # We need YAML::Tiny to write the MYMETA.yml file - unless ( eval { require YAML::Tiny; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.yml\n"; - YAML::Tiny::DumpFile('MYMETA.yml', $meta); -} - -sub write_mymeta_json { - my $self = shift; - - # We need JSON to write the MYMETA.json file - unless ( eval { require JSON; 1; } ) { - return 1; - } - - # Generate the data - my $meta = $self->_write_mymeta_data or return 1; - - # Save as the MYMETA.yml file - print "Writing MYMETA.json\n"; - Module::Install::_write( - 'MYMETA.json', - JSON->new->pretty(1)->canonical->encode($meta), - ); -} - -sub _write_mymeta_data { - my $self = shift; - - # If there's no existing META.yml there is nothing we can do - return undef unless -f 'META.yml'; - - # We need Parse::CPAN::Meta to load the file - unless ( eval { require Parse::CPAN::Meta; 1; } ) { - return undef; - } - - # Merge the perl version into the dependencies - my $val = $self->Meta->{values}; - my $perl = delete $val->{perl_version}; - if ( $perl ) { - $val->{requires} ||= []; - my $requires = $val->{requires}; - - # Canonize to three-dot version after Perl 5.6 - if ( $perl >= 5.006 ) { - $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e - } - unshift @$requires, [ perl => $perl ]; - } - - # Load the advisory META.yml file - my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); - my $meta = $yaml[0]; - - # Overwrite the non-configure dependency hashs - delete $meta->{requires}; - delete $meta->{build_requires}; - delete $meta->{recommends}; - if ( exists $val->{requires} ) { - $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; - } - if ( exists $val->{build_requires} ) { - $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; - } - - return $meta; -} - -1; diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm deleted file mode 100644 index 89f16f0..0000000 --- a/inc/Module/Install/Win32.pm +++ /dev/null @@ -1,64 +0,0 @@ -#line 1 -package Module::Install::Win32; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '0.92'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# determine if the user needs nmake, and download it if needed -sub check_nmake { - my $self = shift; - $self->load('can_run'); - $self->load('get_file'); - - require Config; - return unless ( - $^O eq 'MSWin32' and - $Config::Config{make} and - $Config::Config{make} =~ /^nmake\b/i and - ! $self->can_run('nmake') - ); - - print "The required 'nmake' executable not found, fetching it...\n"; - - require File::Basename; - my $rv = $self->get_file( - url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', - ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', - local_dir => File::Basename::dirname($^X), - size => 51928, - run => 'Nmake15.exe /o > nul', - check_for => 'Nmake.exe', - remove => 1, - ); - - die <<'END_MESSAGE' unless $rv; - -------------------------------------------------------------------------------- - -Since you are using Microsoft Windows, you will need the 'nmake' utility -before installation. It's available at: - - http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe - or - ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe - -Please download the file manually, save it to a directory in %PATH% (e.g. -C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to -that directory, and run "Nmake15.exe" from there; that will create the -'nmake.exe' file needed by this module. - -You may then resume the installation process described in README. - -------------------------------------------------------------------------------- -END_MESSAGE - -} - -1; diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm deleted file mode 100644 index af3ea05..0000000 --- a/inc/Module/Install/WriteAll.pm +++ /dev/null @@ -1,60 +0,0 @@ -#line 1 -package Module::Install::WriteAll; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '0.92';; - @ISA = qw{Module::Install::Base}; - $ISCORE = 1; -} - -sub WriteAll { - my $self = shift; - my %args = ( - meta => 1, - sign => 0, - inline => 0, - check_nmake => 1, - @_, - ); - - $self->sign(1) if $args{sign}; - $self->admin->WriteAll(%args) if $self->is_admin; - - $self->check_nmake if $args{check_nmake}; - unless ( $self->makemaker_args->{PL_FILES} ) { - $self->makemaker_args( PL_FILES => {} ); - } - - # Until ExtUtils::MakeMaker support MYMETA.yml, make sure - # we clean it up properly ourself. - $self->realclean_files('MYMETA.yml'); - - if ( $args{inline} ) { - $self->Inline->write; - } else { - $self->Makefile->write; - } - - # The Makefile write process adds a couple of dependencies, - # so write the META.yml files after the Makefile. - if ( $args{meta} ) { - $self->Meta->write; - } - - # Experimental support for MYMETA - if ( $ENV{X_MYMETA} ) { - if ( $ENV{X_MYMETA} eq 'JSON' ) { - $self->Meta->write_mymeta_json; - } else { - $self->Meta->write_mymeta_yaml; - } - } - - return 1; -} - -1; diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index 6e77723..d5c53cf 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -1,8 +1,7 @@ package REST::Client; +#ABSTRACT: A simple client for interacting with RESTful http/https resources -=head1 NAME - -REST::Client - A simple client for interacting with RESTful http/https resources +our $VERSION = '273'; =head1 SYNOPSIS @@ -81,8 +80,6 @@ use 5.008_000; use constant TRUE => 1; use constant FALSE => 0; -our ($VERSION) = ('$Rev: 273 $' =~ /(\d+)/); - use URI; use LWP::UserAgent; use Carp qw(croak carp); @@ -543,14 +540,3 @@ sub _buildAccessors { Caching, content-type negotiation, readable handles for body content. -=head1 AUTHOR - -Miles Crawford, Emcrawfor@cpan.orgE - -=head1 COPYRIGHT - -Copyright 2008 - 2010 by Miles Crawford - -This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. - -=cut -- cgit v1.2.3 From 499cae52bfb5b17d9b89cf6270957497f3652e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Tue, 14 Dec 2021 23:00:27 +0100 Subject: Bump version number to 280 --- lib/REST/Client.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index d5c53cf..473fd8f 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -1,7 +1,7 @@ package REST::Client; #ABSTRACT: A simple client for interacting with RESTful http/https resources -our $VERSION = '273'; +our $VERSION = '280'; =head1 SYNOPSIS -- cgit v1.2.3 From 15b392e5550f6e5299a63d7156d048478e1e4cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Tue, 14 Dec 2021 23:06:19 +0100 Subject: Release REST-Client 280 * Convert build system to MakeMaker and Dist::Zilla Fixes the installation on recent Perl without '.' in @INC (RT #122263, RT #120854) * Do not prepend default host to absolute URLs (RT #119790) * Point to Github for source repository and issue tracker --- Changes | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Changes b/Changes index 9569e8d..a136025 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,13 @@ + +History for the REST-Client Perl distribution + +280 2021-12-14 + * Convert build system to MakeMaker and Dist::Zilla + Fixes the installation on recent Perl without '.' in @INC + (RT #122263, RT #120854) + * Do not prepend default host to absolute URLs (RT #119790) + * Point to Github for source repository and issue tracker + 273 * Add ContentFile that will allow writing responses directly to file or process using a call back through LWP::UserAgent -- cgit v1.2.3 From 782c1d09d42ff5306f56895516e4e228837b6c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 17 Dec 2021 19:25:45 +0100 Subject: Run tests via github actions Shamelessly adapted from Lab::Measurement --- .github/scripts/prove-test.bash | 28 ++++++++++++++++++++++++++++ .github/workflows/test.yml | 21 +++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100755 .github/scripts/prove-test.bash create mode 100644 .github/workflows/test.yml diff --git a/.github/scripts/prove-test.bash b/.github/scripts/prove-test.bash new file mode 100755 index 0000000..e17fc56 --- /dev/null +++ b/.github/scripts/prove-test.bash @@ -0,0 +1,28 @@ +# Stop script on first error +set -o errexit + +# Prevent "Please tell me who you are" errors for certain DZIL configs +git config --global user.name 'github-actions' + +# check perl version +perl --version + +# +# Install Dist::Zilla and module dependencies +# + +cpanm -n Dist::Zilla + +# Install DZIL plugins etc if needed +cd $GITHUB_WORKSPACE +dzil authordeps --missing | grep -vP '[^\w:]' | xargs cpanm -n +dzil listdeps --missing --cpanm | grep -vP '[^\w:~"\.]' | xargs cpanm -n + +# dependencies of module tests +cpanm -n HTTP::Server::Simple + +# +# Run tests (user tests as well as maintainer tests) +# + +prove --verbose -l -s -r t xt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..416cd8c --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,21 @@ +name: test +on: [push] +jobs: + 'prove-lrt': + runs-on: ubuntu-latest + strategy: + matrix: + perl: ['5.24', '5.26', '5.28', '5.30', '5.32', '5.34'] + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + - uses: shogo82148/actions-setup-perl@v1 + with: + perl-version: ${{matrix.perl}} + - run: lsb_release -a + + # run test in script to avoid tedious quoting of bash code + - name: prove-test + run: ./.github/scripts/prove-test.bash + shell: bash + -- cgit v1.2.3 From f390a47f0e61c65c419fe33c0ac71136836c1500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 17 Dec 2021 19:31:31 +0100 Subject: No "xt" maintainer tests directory here --- .github/scripts/prove-test.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/prove-test.bash b/.github/scripts/prove-test.bash index e17fc56..3af1b05 100755 --- a/.github/scripts/prove-test.bash +++ b/.github/scripts/prove-test.bash @@ -25,4 +25,4 @@ cpanm -n HTTP::Server::Simple # Run tests (user tests as well as maintainer tests) # -prove --verbose -l -s -r t xt +prove --verbose -l -s -r t -- cgit v1.2.3 From 43d9dde236cd8fe763974c4300ec032daabdf857 Mon Sep 17 00:00:00 2001 From: Kevin Kane Date: Wed, 28 Feb 2018 14:37:53 -0500 Subject: removing hard requirement on request verbs as custom verbs are supported in http 1/2 specs (cherry picked from commit e06bd9e2cec1a70024193d96453606b764ba7ab7) --- lib/REST/Client.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index 473fd8f..2a30cac 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -325,7 +325,6 @@ sub request { #error check - croak "REST::Client exception: First argument to request must be one of GET, PATCH, PUT, POST, DELETE, OPTIONS, HEAD" unless $method =~ /^(get|patch|put|post|delete|options|head)$/i; croak "REST::Client exception: Must provide a url to $method" unless $url; croak "REST::Client exception: headers must be presented as a hashref" if $headers && ref $headers ne 'HASH'; -- cgit v1.2.3 From 23531d00eb10f1cafe3af345321ea5a305d91bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 17 Dec 2021 22:46:27 +0100 Subject: Bump version number to 281 --- lib/REST/Client.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/REST/Client.pm b/lib/REST/Client.pm index 2a30cac..b47b3b5 100644 --- a/lib/REST/Client.pm +++ b/lib/REST/Client.pm @@ -1,7 +1,7 @@ package REST::Client; #ABSTRACT: A simple client for interacting with RESTful http/https resources -our $VERSION = '280'; +our $VERSION = '281'; =head1 SYNOPSIS -- cgit v1.2.3 From 33753a8bddd1977919082654ae6de18641920b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Fri, 17 Dec 2021 22:48:01 +0100 Subject: Release REST-Client 281 * Allow arbitrary request verbs (RT #124620) --- Changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changes b/Changes index a136025..ddede02 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,9 @@ History for the REST-Client Perl distribution +281 2021-12-17 + * Allow arbitrary request verbs (RT #124620) + 280 2021-12-14 * Convert build system to MakeMaker and Dist::Zilla Fixes the installation on recent Perl without '.' in @INC -- cgit v1.2.3