Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into mickey/permission_endpoints
  • Loading branch information
oalders committed Jun 13, 2017
2 parents 9cae8db + 7dd8420 commit cff6635
Show file tree
Hide file tree
Showing 31 changed files with 2,337 additions and 2,046 deletions.
4 changes: 4 additions & 0 deletions .tidyallrc
Expand Up @@ -9,3 +9,7 @@ select = .gitignore
[JSBeautify]
select = root/static/js/cpan.js
argv = --indent-size 4 --end_with_newline

[Test::Vars]
select = {lib,t}/**/*.pm
ignore = lib/MetaCPAN/Web/View/HTML.pm
25 changes: 16 additions & 9 deletions .travis.yml
Expand Up @@ -3,18 +3,25 @@ perl:
- "5.22"

matrix:
fast_finish: true
allow_failures:
- perl: "5.22"
env: USE_CPANFILE_SNAPSHOT=false

- env: USE_CPANFILE_SNAPSHOT=false CPAN_RESOLVER=metadb PERL_CARTON_PATH=$TRAVIS_BUILD_DIR/no-snapshot HARNESS_VERBOSE=1
- env: USE_CPANFILE_SNAPSHOT=true COVERAGE=1
env:
global:
# Carton --deployment only works on the same version of perl
# that the snapshot was built from.
- DEPLOYMENT_PERL_VERSION=5.22
- DEVEL_COVER_OPTIONS="-ignore,^local/"
- PERL_CARTON_PATH=$TRAVIS_BUILD_DIR/local
- CPAN_RESOLVER=snapshot
matrix:
- COVERAGE=1 USE_CPANFILE_SNAPSHOT=true
- USE_CPANFILE_SNAPSHOT=false

# Get one passing run with coverage and one passing run with Test::Vars
# checks. If run together they more than double the build time.
- USE_CPANFILE_SNAPSHOT=false CPAN_RESOLVER=metadb PERL_CARTON_PATH=$TRAVIS_BUILD_DIR/no-snapshot HARNESS_VERBOSE=1
- USE_CPANFILE_SNAPSHOT=true
- USE_CPANFILE_SNAPSHOT=true COVERAGE=1

before_install:
- git clone git://github.com/travis-perl/helpers ~/travis-perl-helpers
Expand All @@ -27,15 +34,15 @@ before_install:

install:
- cpan-install --coverage # installs converage prereqs, if enabled
- 'cpm install `test "${USE_CPANFILE_SNAPSHOT}" = "false" && echo " --resolver metadb" || echo " --resolver snapshot"`'
- cpm install -L $PERL_CARTON_PATH --resolver $CPAN_RESOLVER

before_script:
- coverage-setup

script:
# Devel::Cover isn't in the cpanfile
# but if it's installed into the global dirs this should work.
- carton exec prove -lr -j$(test-jobs) t
# Parallel tests seem to have Heisenfailures. Disable for now.
# - carton exec prove -lr -j$(test-jobs) t
- carton exec prove -lr t

after_success:
- coverage-report
Expand Down
24 changes: 18 additions & 6 deletions app.psgi
Expand Up @@ -8,7 +8,7 @@ use warnings;
# TODO: When we know everything will work reliably: $ENV{PLACK_ENV} ||= 'development';
#
use File::Basename;
use Config::JFDI;
use Config::ZOMG ();
use Log::Log4perl;
use File::Spec;
use File::Path ();
Expand All @@ -21,7 +21,7 @@ my $config;
BEGIN {
$root_dir = File::Basename::dirname(__FILE__);
$dev_mode = $ENV{PLACK_ENV} && $ENV{PLACK_ENV} eq 'development';
$config = Config::JFDI->new(
$config = Config::ZOMG->open(
name => 'MetaCPAN::Web',
path => $root_dir,
);
Expand All @@ -31,8 +31,9 @@ BEGIN {
$ENV{METACPAN_WEB_DEBUG} = 1;
}

my $log4perl_config = File::Spec->rel2abs( $config->get->{log4perl_file}
|| 'log4perl.conf', $root_dir );
my $log4perl_config
= File::Spec->rel2abs( $config->{log4perl_file} || 'log4perl.conf',
$root_dir );
Log::Log4perl::init($log4perl_config);

# use a unique package and tell l4p to ignore it when finding the warning location.
Expand All @@ -53,6 +54,17 @@ my $tempdir = "$root_dir/var/tmp";
builder {

enable 'ReverseProxy';
enable sub {
my $app = shift;
sub {
my ($env) = @_;
Log::Log4perl::MDC->put( "ip", $env->{REMOTE_ADDR} );
Log::Log4perl::MDC->put( "method", $env->{REMOTE_METHOD} );
Log::Log4perl::MDC->put( "url", $env->{REQUEST_URI} );
Log::Log4perl::MDC->put( "referer", $env->{HTTP_REFERER} );
$app->($env);
};
};
enable 'Runtime';

unless ( $ENV{HARNESS_ACTIVE} or $0 =~ /\.t$/ ) {
Expand All @@ -74,15 +86,15 @@ builder {

builder {
die 'cookie_secret not configured'
unless $config->get->{cookie_secret};
unless $config->{cookie_secret};

# Add session cookie here only
enable 'Session::Cookie::MetaCPAN' => (
session_key => 'metacpan_secure',
expires => 2**30,
secure => ( !$dev_mode ),
httponly => 1,
secret => $config->get->{cookie_secret},
secret => $config->{cookie_secret},
);

MetaCPAN::Web->psgi_app;
Expand Down
33 changes: 15 additions & 18 deletions cpanfile
Expand Up @@ -15,25 +15,23 @@ requires 'Catalyst::Plugin::Static::Simple';
requires 'Catalyst::TraitFor::Request::REST::ForBrowsers';
requires 'Catalyst::View::JSON';
requires 'Catalyst::View::TT::Alloy';
requires 'CatalystX::RoleApplicator';
requires 'CatalystX::Fastly::Role::Response', '0.06';
requires 'CatalystX::RoleApplicator';
requires 'Config::General';
requires 'Config::JFDI';
requires 'Config::ZOMG', '1.000000';
requires 'Cpanel::JSON::XS';
requires 'Data::Dumper';
requires 'Data::Pageset';
requires 'Data::Printer', '0.38';
requires 'DateTime', '1.24';
requires 'DateTime::Format::HTTP';
requires 'DateTime::Format::ISO8601';
requires 'Devel::Confess';
requires 'Digest::MD5';
requires 'Digest::SHA1';
requires 'Search::Elasticsearch', '== 2.03';
requires 'Encode', '2.51';
requires 'Exporter';
requires 'Format::Human::Bytes';
requires 'File::Path';
requires 'Format::Human::Bytes';
requires 'Getopt::Long::Descriptive';
requires 'Gravatar::URL';
requires 'HTML::Escape';
Expand All @@ -47,41 +45,39 @@ requires 'Hash::AsObject';
requires 'Hash::Merge';
requires 'Importer';
requires 'JavaScript::Minifier::XS';
requires 'List::AllUtils';
requires 'List::MoreUtils';
requires 'List::Util';
requires 'Log::Log4perl::Catalyst';
requires 'List::Util', '1.45';
requires 'Locale::Country','3.28';
requires 'Log::Log4perl::Catalyst';
requires 'MetaCPAN::Moose';
requires 'MetaCPAN::Role', '0.06';
requires 'Module::Build::Tiny', '0.037';
requires 'Module::Runtime';
requires 'Moose', '2.1605';
requires 'Moo', '2.000002';
requires 'Moose', '2.1605';
requires 'MooseX::ClassAttribute';
requires 'MooseX::Fastly::Role', '0.03';
requires 'MooseX::Role::Parameterized', '1.02';
requires 'MooseX::StrictConstructor';
requires 'MooseX::Fastly::Role', '0.03';
requires 'PerlIO::gzip';
requires 'MetaCPAN::Moose';
requires 'MetaCPAN::Role', '0.06';
requires 'MooseX::Types::Common::Numeric';
requires 'MooseX::Types::Common::String';
requires 'MooseX::Types::Moose';
requires 'MooseX::Types::URI', '0.08';
requires 'Net::Fastly', '1.05';
requires 'Path::Tiny', '0.076';
requires 'Params::ValidationCompiler';
requires 'Path::Tiny', '0.076';
requires 'PerlIO::gzip';
requires 'Plack', '1.0039';
requires 'Plack::Middleware::ReverseProxy';
requires 'Plack::Middleware::Runtime';
requires 'Plack::Middleware::ServerStatus::Lite';
requires 'Plack::Middleware::Session', '0.22';
requires 'Plack::Middleware::Session::Cookie';
requires 'Plack::Response';
requires 'Plack::Session';
requires 'Plack::Test';
requires 'Ref::Util', '>= 0.008';
requires 'Regexp::Common';
requires 'Regexp::Common::time';
requires 'Search::Elasticsearch', '== 2.03';
requires 'Starman', '>= 0.4008';
requires 'Template::Alloy';
requires 'Template::Plugin::Comma';
Expand All @@ -93,20 +89,21 @@ requires 'Template::Plugin::Number::Format';
requires 'Template::Plugin::Page';
requires 'Text::Pluralize';
requires 'Try::Tiny', '0.24';
requires 'YAML', '1.15'; # fix dep chain issue
requires 'URI', '1.71';
requires 'URI::Escape';
requires 'XML::Feed';
requires 'XML::Simple';
requires 'YAML', '1.15'; # fix dep chain issue

test_requires 'App::Prove';
test_requires 'Code::TidyAll', '>= 0.47';
test_requires 'Code::TidyAll::Plugin::Test::Vars', '0.04';
test_requires 'Path::Iterator::Rule', '1.008';
test_requires 'Perl::Critic', '1.124';
test_requires 'Perl::Tidy';
test_requires 'Test::Code::TidyAll';
test_requires 'Test::MockObject','1.09';
test_requires 'Test::More', '0.96';
test_requires 'Perl::Critic', '1.124';
test_requires 'Test::Perl::Critic';
test_requires 'Test::XPath', '0.15';

0 comments on commit cff6635

Please sign in to comment.