This is an automated email from the git hooks/post-receive script. js pushed a commit to annotated tag debian/0.019-1 in repository libattean-perl.
commit 7f30198247534c8ae78d4f7f50e30d8e2682abf4 Merge: 451e1ef 2cf21b0 Author: Jonas Smedegaard <d...@jones.dk> Date: Mon Feb 12 13:43:24 2018 +0100 New upstream version 0.019 CONTRIBUTING | 2 - Changes | 21 +++ LICENSE | 21 --- MANIFEST | 1 - META.yml | 5 +- Makefile.PL | 1 + README.md | 8 +- SIGNATURE | 256 ++++++++++++++-------------- inc/Module/Install.pm | 35 +--- inc/Module/Install/Base.pm | 2 +- inc/Module/Install/Can.pm | 13 +- inc/Module/Install/Fetch.pm | 2 +- inc/Module/Install/Makefile.pm | 2 +- inc/Module/Install/Metadata.pm | 2 +- inc/Module/Install/Scripts.pm | 2 +- inc/Module/Install/Win32.pm | 2 +- inc/Module/Install/WriteAll.pm | 2 +- lib/Attean.pm | 8 +- lib/Attean/API.pm | 29 ++-- lib/Attean/API/AbbreviatingParser.pod | 6 +- lib/Attean/API/AbbreviatingSerializer.pod | 9 +- lib/Attean/API/AggregateExpression.pod | 6 +- lib/Attean/API/AppendableSerializer.pod | 6 +- lib/Attean/API/AtOnceParser.pod | 6 +- lib/Attean/API/Binding.pm | 41 ++--- lib/Attean/API/Blank.pod | 6 +- lib/Attean/API/BlankOrIRI.pod | 6 +- lib/Attean/API/BulkUpdatableModel.pod | 6 +- lib/Attean/API/Expression.pm | 28 +-- lib/Attean/API/IRI.pod | 6 +- lib/Attean/API/Iterator.pm | 30 ++-- lib/Attean/API/Literal.pod | 6 +- lib/Attean/API/MixedStatementParser.pod | 6 +- lib/Attean/API/MixedStatementSerializer.pod | 6 +- lib/Attean/API/Model.pm | 24 +-- lib/Attean/API/MutableModel.pod | 6 +- lib/Attean/API/MutableTripleStore.pod | 6 +- lib/Attean/API/Parser.pm | 35 ++-- lib/Attean/API/Plan.pm | 23 ++- lib/Attean/API/PullParser.pod | 6 +- lib/Attean/API/PushParser.pod | 6 +- lib/Attean/API/Quad.pod | 6 +- lib/Attean/API/QuadParser.pod | 6 +- lib/Attean/API/QuadPattern.pod | 6 +- lib/Attean/API/QuadSerializer.pod | 6 +- lib/Attean/API/Query.pm | 48 +++--- lib/Attean/API/QueryPlanner.pm | 41 ++--- lib/Attean/API/RepeatableIterator.pod | 6 +- lib/Attean/API/Result.pod | 6 +- lib/Attean/API/ResultParser.pod | 6 +- lib/Attean/API/ResultSerializer.pod | 6 +- lib/Attean/API/Serializer.pm | 26 +-- lib/Attean/API/Store.pm | 38 ++--- lib/Attean/API/Term.pm | 43 ++--- lib/Attean/API/TermOrVariable.pod | 6 +- lib/Attean/API/TermParser.pod | 6 +- lib/Attean/API/TermSerializer.pod | 6 +- lib/Attean/API/Triple.pod | 6 +- lib/Attean/API/TripleOrQuad.pod | 6 +- lib/Attean/API/TripleParser.pod | 6 +- lib/Attean/API/TriplePattern.pod | 6 +- lib/Attean/API/TripleSerializer.pod | 6 +- lib/Attean/API/Variable.pod | 6 +- lib/Attean/AggregateExpression.pod | 6 +- lib/Attean/Algebra.pm | 86 +++++----- lib/Attean/BindingEqualityTest.pm | 8 +- lib/Attean/Blank.pm | 8 +- lib/Attean/CodeIterator.pm | 8 +- lib/Attean/Expression.pm | 22 +-- lib/Attean/IDPQueryPlanner.pm | 8 +- lib/Attean/IRI.pm | 10 +- lib/Attean/IteratorSequence.pm | 8 +- lib/Attean/ListIterator.pm | 8 +- lib/Attean/Literal.pm | 10 +- lib/Attean/Plan.pm | 66 +++---- lib/Attean/Quad.pm | 10 +- lib/Attean/QuadModel.pm | 10 +- lib/Attean/QueryPlanner.pm | 8 +- lib/Attean/RDF.pm | 8 +- lib/Attean/Result.pm | 8 +- lib/Attean/SimpleQueryEvaluator.pm | 10 +- lib/Attean/TermMap.pm | 8 +- lib/Attean/TreeRewriter.pm | 8 +- lib/Attean/Triple.pm | 10 +- lib/Attean/TripleModel.pm | 20 +-- lib/Attean/Variable.pm | 8 +- lib/AtteanX/API/JoinRotatingPlanner.pm | 14 +- lib/AtteanX/API/Lexer.pm | 12 +- lib/AtteanX/Parser/NQuads.pm | 6 +- lib/AtteanX/Parser/NTriples.pm | 6 +- lib/AtteanX/Parser/NTuples.pm | 8 +- lib/AtteanX/Parser/RDFXML.pm | 6 +- lib/AtteanX/Parser/SPARQL.pm | 8 +- lib/AtteanX/Parser/SPARQLJSON.pm | 6 +- lib/AtteanX/Parser/SPARQLLex.pm | 8 +- lib/AtteanX/Parser/SPARQLTSV.pm | 6 +- lib/AtteanX/Parser/SPARQLXML.pm | 6 +- lib/AtteanX/Parser/SPARQLXML/SAXHandler.pm | 9 +- lib/AtteanX/Parser/Turtle.pm | 8 +- lib/AtteanX/Parser/Turtle/Constants.pm | 6 +- lib/AtteanX/Parser/Turtle/Lexer.pm | 6 +- lib/AtteanX/Parser/Turtle/Token.pm | 8 +- lib/AtteanX/SPARQL/Constants.pm | 6 +- lib/AtteanX/SPARQL/Token.pm | 8 +- lib/AtteanX/Serializer/CanonicalNTriples.pm | 8 +- lib/AtteanX/Serializer/NQuads.pm | 6 +- lib/AtteanX/Serializer/NTriples.pm | 6 +- lib/AtteanX/Serializer/NTuples.pm | 8 +- lib/AtteanX/Serializer/RDFXML.pm | 8 +- lib/AtteanX/Serializer/SPARQL.pm | 8 +- lib/AtteanX/Serializer/SPARQLCSV.pm | 8 +- lib/AtteanX/Serializer/SPARQLHTML.pm | 8 +- lib/AtteanX/Serializer/SPARQLJSON.pm | 8 +- lib/AtteanX/Serializer/SPARQLTSV.pm | 8 +- lib/AtteanX/Serializer/SPARQLXML.pm | 8 +- lib/AtteanX/Serializer/Turtle.pm | 6 +- lib/AtteanX/Serializer/TurtleTokens.pm | 8 +- lib/AtteanX/Store/Memory.pm | 6 +- lib/AtteanX/Store/Simple.pm | 6 +- lib/AtteanX/Store/SimpleTripleStore.pm | 6 +- meta/changes.ttl | 36 +++- t/algebra.t | 4 +- t/parser-turtle.t | 14 ++ t/simple.t | 2 +- t/term-map.t | 10 +- 125 files changed, 861 insertions(+), 806 deletions(-) diff --cc Changes index 3e0263a,0000000..53c6db2 mode 100644,000000..100644 --- a/Changes +++ b/Changes @@@ -1,425 -1,0 +1,446 @@@ +Attean +====== + +Created: 2014-09-27 +Home page: <http://search.cpan.org/dist/Attean/> +Bug tracker: <https://github.com/kasei/attean/issues> + ++0.019 2018-02-04 ++ ++ - (Update) Documentation updates (#120, #121 from @kjetilk). ++ - (Update) Fix incorrect URI for langString (#119 from @kjetilk). ++ ++0.018 2018-01-06 ++ ++ - (Update) Added tests for turtle parser escape handling (#55). ++ - (Update) Allow UUIDs to have lowercase hex digits (#102). ++ - (Update) Documentation fixes (#105 from @Varadinsky). ++ - (Update) Fixed as_string serialization of CONSTRUCT algebras (#97). ++ - (Update) Improve code coverage for Attean::TermMap (#107 from ++ @Varadinsky). ++ - (Update) Improvements to HashJoin query planning (#103 from @KjetilK). ++ - (Update) Removed LICENSE file and updated licensing statement in ++ individual modules (#116). ++ - (Update) Updated Makefile.PL for perl 5.26. ++ - (Update) Updated required version of IRI (#118). ++ - (Update) Use Moo::Role instead of namespace::clean to cleanup namespaces ++ (#112 from @baby-gnu). ++ +0.017 2016-06-09 + + - (Addition) Port SPARQL-JSON serializer to Attean (#20, #101 from + @cakirke). + - (Update) Add a .gitignore file (#99 from @cakirke). + - (Update) Changed use of binmode to `use open` in attean_parse and + attean_query. + - (Update) Fix Construct plan string serialization. + - (Update) Fix declared arity of various algebra classes. + - (Update) Fixed bug in handling of restricted available named graphs + during query planning. + - (Update) Fixed documentation in Attean::QueryPlanner. + - (Update) Improved handling of unexpected EOF in AtteanX::Parser::SPARQL. + - (Update) Improved test coverage. + - (Update) Improved use of Travis CI (#100 from @cakirke). + - (Update) Make parse_term_from_string deprecations noisy. + - (Update) Removed default implementation of + Attean::API::Plan->plan_as_string. + - (Update) Updated SPARQL parser to produce Attean::Algebra::Reduced + algebra objects for REDUCED queries. + - (Update) Updated required versions of Moo and Test::Modern. + +0.016 2016-05-04 + + - (Addition) Ported RDF::Trine::Serializer::RDFXML to + AtteanX::Serializer::RDFXML (#22). + - (Update) Add serialization of SPARQL PREFIX declarations and prefixnames + when namespaces are set (#53). + - (Update) Added Test::Attean::QuadStore->cleanup_store method. + - (Update) Added Test::Attean::StoreCleanup role and added store cleanup + to store tests. + - (Update) Changed Attean::TriplePattern->as_quadpattern to delegate to + Attean::API::TriplePattern->as_quad_pattern. + - (Update) Fix overly aggressive code that attempted to turn IRIs into + prefix names during Turtle serialization. + - (Update) Fixed bug in SPARQL parsing of NIL tokens. + - (Update) Fixes to POD, test, and metadata issues reported by + jonassmedegaard (#93, #94, #95, #96). + - (Update) Improve Attean::SimpleQueryEvaluator to handle updated algebra + classes and iterator API. + - (Update) Improved test suite (includes #92 from KjetilK, #53). + - (Update) Removed AtteanX::RDFQueryTranslator (split into a new package) + and all other references to RDF::Query. + - (Update) Removed default implementation of Attean::API::Term->ebv (now + required of consumers). + - (Update) Serialize SPARQL and Turtle namespace declarations in a stable + order. + - (Update) Updated Attean::API::AbbreviatingParser->base definition to be + a consumer of Attean::API::IRI. + - (Update) Updated Attean::API::SPARQLSerializable->as_sparql to return a + unicode string, not bytes. + +0.015 2016-04-09 + + - (Update) Fixed metadata used to generate README files. + +0.014 2016-04-09 + + - (Addition) Add a size estimate attribute to Attean::Plan::Iterator (#90 + from KjetilK). + - (Addition) Added Attean::Plan::Iterator for cases where there is too + much data for Attean::Plan::Table (#88). + - (Update) Add ability for parsers to construct lazy IRIs. + - (Update) Add type checking to serialize_iter_* methods. + - (Update) Added Attean::ListIterator->size method (#89). + - (Update) Fix cases where result iterators were constructed without a + variables list. + - (Update) Improve error message generated for some SPARQL syntax errors. + - (Update) Update Attean::FunctionExpression to canonicalize ISURI to + ISIRI. + +0.013 2016-03-19 + + - (Addition) Added Attean::API::BulkUpdatableStore role. + - (Addition) Added Attean::API::MutableModel->load_urls_into_graph method. + - (Addition) Added Attean::API::QuadPattern->as_triple_pattern method. + - (Addition) Added Attean::API::TripleOrQuadPattern->parse and + AtteanX::Parser::SPARQL->parse_nodes methods (#82). + - (Addition) Added Attean::Algebra::Query to indicate a full query trees + and aid in serialization (#67). + - (Addition) Added AtteanX::SPARQL::Token->integer constructor. + - (Addition) Added parsing, algebra, planning, and test support for SPARQL + 1.1 Updates. + - (Update) Add and use Attean::Algebra::Query->subquery flag when + appropriate and stop generating needless unary join algebras. + - (Update) Add child accessor to Attean::API::UnaryQueryTree. + - (Update) Added CONTRIBUTING file. + - (Update) Allow producing short blank node labels in attean_query + results. + - (Update) Check types of invocant and model objects in calls to + cost_for_plan planning method (#77). + - (Update) Fix Attean::API::IDPJoinPlanner->cost_for_plan to pass the + planner object in calls to the model. + - (Update) Fix Attean::Algebra::Update->blank_nodes (#70). + - (Update) Fix Attean::QueryPlanner active_graphs argument during + recursive call to plans_for_algebra. + - (Update) Fix lost in-scope variables in aggregation algebra and plans + (#78). + - (Update) Fix result iterator generation for quad patterns to keep + associated variable names. + - (Update) Fix serialization of SILENT flag on Service queries. + - (Update) Fix sparql_tokens generation for quad patterns to use SPARQL + GRAPH syntax, not N-Quads syntax. + - (Update) Fixed bug in Attean::Literal that was returning rdf:string + instead of rdf:langString for language literals. + - (Update) Improve error messages in Attean::CodeIterator and + Attean::API::Binding. + - (Update) Improve errors and logging in SPARQL parser (#84 from KjetilK). + - (Update) Improve handling of utf8 encoding in SPARQL/XML, algebra, and + plan serializations. + - (Update) Improve temporary variable names in aggregates generated during + parsing. + - (Update) Improved Attean::Plan::Union to handle plans with zero + children. + - (Update) Improved error message in query planners (#76 from KjetilK). + - (Update) Pass tree depth as argument to algebra_as_string. + - (Update) Refactored SPARQL 1.1 test harness into a testing role (#80). + - (Update) Update bin/attean_query to allow dryruns to avoid generating + query plans when appropriate. + - (Update) Updated attean_query to allow updates. + +0.012 2016-02-04 + + - (Addition) Added Attean::API::TermOrVariable->apply_binding method. + - (Addition) Added AtteanX::Store::SimpleTripleStore. + - (Update) Die on attempts to add non-ground triples/quads to stores + (#66). + - (Update) Fixed Attean::Algebra::Table to consume + Attean::API::NullaryQueryTree instead of Attean::API::UnaryQueryTree. + - (Update) Fixed type checks performed when ATTEAN_TYPECHECK is set. + - (Update) Improve error reporting for unexpected EOF in + AtteanX::Parser::SPARQL. + - (Update) Throwing an error when Triple or Quad objects gets passed a + variable (#65 from KjetilK). + - (Update) Add planning support for DESCRIBE queries (#45). + - (Update) Add type checking to store get_triples and get_quads methods + (#61). + - (Update) Added logging in QueryPlanner and TreeRewriter (#64 from + KjetilK). + - (Update) Avoid attempting to parse empty XML documents when passed in as + a scalar (#60). + - (Update) Fix Attean::CodeIterator type checking to handle non-blessed + items properly. + - (Update) Fix AtteanX::Parser::RDFXML to properly use caller-supplied + base IRI. + - (Update) Fix algebra generation for describe queries in SPARQL parser. + - (Update) Fix bug in Attean::Plan::Aggregate handling of COUNT(*) + queries. + - (Update) Fix bugs in SPARQL CSV and TSV serializers. + - (Update) Fix sparql_tokens generation for integer and datatyped + literals. + - (Update) Fixed AtteanX::Parser::SPARQL to maintain its URI::NamespaceMap + on prefix declarations. + - (Update) Improve POD and test coverage (#55; #61 from KjetilK). + - (Update) Improve attean_parse and attean_parse including preservation of + prefix declarations where possible. + - (Update) Improve regex escaping in t/algebra.t to silence warnings in + perl 5.22. + - (Update) Improve use of SPARQL and Turtle token objects. + - (Update) Improved triple model classes to allow adding and droping + triple store graphs. + - (Update) Merge code paths for canonical NTriples serializer. + - (Update) Preserve in-scope variables in result iterators. + - (Update) Serialize SPARQL/XML bindings in a stable order. + - (Update) Simplify cost estimation code for hash joins in + Attean::API::QueryPlanner (#59 from KjetilK). + - (Update) Update SPARQL parser to die on unimplemented Update syntax. + - (Update) Update SPARQL/HTML serializer to implement + AbbreviatingSerializer (#54, #63 from Zoran Varadinsky). + - (Update) Update turtle serializer to consume + Attean::API::AppendableSerializer. + - (Update) Updated prerequisites in Makefile.PL and .travis.yml. + - (Update) Use Test::Modern. + +0.011 2016-01-16 + + - (Addition) Add initial implementation for Attean::MutableTripleModel. + - (Addition) Add logging of costs to query planner (#56 from KjetilK). + - (Addition) Add use of MooX::Log::Any (from KjetilK). + - (Addition) Added + Attean::API::Plan->subplans_of_type_are_variable_connected method. + - (Addition) Added Attean::API::Plan->children_are_variable_connected. + - (Addition) Added AtteanX::Parser::SPARQL->parse convenience method. + - (Addition) Added RDF/XML parser tests. + - (Addition) Added Turtle serializer. + - (Addition) Added exportable quadpattern constructor. + - (Addition) Added tests for get_sequence model accessor method (#3). + - (Update) Change API for Attean::API::CostPlanner->cost_for_plan to pass + in the query planner. + - (Update) Fix bug in handling unbound join variables in hash join + evaluation. + - (Update) Fix use of blank and variable shortcut constructors (#57 from + KjetilK). + - (Update) Fixed bug in + AtteanX::Serializer::SPARQLHTML->serialize_iter_to_bytes. + - (Update) Implementation of canonicalize method for triple and quad + patterns (#43 from KjetilK). + - (Update) Improve Attean::ExistsExpression->as_string. + - (Update) Improve cost estimation for cartesian joins in + Attean::API::QueryPlanner. + - (Update) Improved SPARQL serialization of algebra and expression trees + (including #51). + - (Update) Improved error handling in Attean::ListIterator->BUILD. + - (Update) Improved recognition of invalid aggregation queries. + - (Update) Make regexes used for prefixname parsing publicly accessibly. + - (Update) Merged shared constants for Turtle and SPARQL tokens. + - (Update) Moved subpatterns_of_type from Attean::API::Algebra to + Attean::API::DirectedAcyclicGraph. + - (Update) Renamed parse_term_from_string methods to parse_term_from_bytes + (adding delegating methods that should be decprecated in the future). + - (Update) Silence XML::Parser warnings on empty input documents. + - (Update) Update AtteanX::Parser::RDFXML to populate a namespace map + during parsing. + - (Update) Updated Attean::API::CanonicalizingBindingSet to produce the + same type of object as are input. + - (Update) Updated copyright years. + +0.010 2015-12-22 + + - (Addition) Add INVOKE function expression to allow representing + IRI-defined functions. + - (Addition) Added Attean::API::Algebra methods blank_nodes and + subpatterns_of_type. + - (Addition) Added Attean::API::SimpleCostPlanner. + - (Addition) Added Attean::API::UnionScopeVariablesPlan role to handle + common computation of in-scope variables (Github issue #38). + - (Addition) Added Attean::Algebra::Sequence class. + - (Addition) Added AtteanX::API::JoinRotatingPlanner role. + - (Addition) Added SPARQL parsing support for RANK operator (Github issue + #35). + - (Addition) Added initial algebra and plan support for group ranking + (Github issue #34). + - (Addition) Added simple SPARQL HTML serializer (ported from + RDF::Endpoint; Github issue #27). + - (Addition) Added simple SPARQL serializer implementation (Github issue + #36). + - (Update) Added ability to turn some query algebras into SPARQL token + interators. + - (Update) Compute in-scope variables in Attean::Plan::Quad instead of + relying on calling code (Github issue #39). + - (Update) Ensure query plan costs are integers, fixing a bug when running + on perl with long doubles (#42). + - (Update) Fixed attean_query to support custom output serializers. + - (Update) Fixed bug in Attean::Algebra::Project->in_scope_variables. + - (Update) Fixed bug in t/http-negotiation.t that caused false failures + when negotiation led to the Canonical NTriples serializer. + - (Update) Fixed mis-named method call in AtteanX::Store::Memory. + - (Update) Improve error messages in query planning code (manual patch + from #41). + - (Update) Improve serializer negotiation to support multiple classes that + handle the same media type. + - (Update) Ported RDF::Query SPARQL parser to Attean. + - (Update) Refactored query planner to separate IDP code from the core + planning code. + - (Update) Renamed Attean::API::Planner to Attean::API::QueryPlanner and + re-organized planning code. + - (Update) Update Changes metadata handling to use + Module::Instal::DOAPChangeSets (Github issue #25). + - (Update) Updated Attean::Algebra::Join to be n-ary, not binary. + - (Update) Updated attean_query to use the native SPARQL parser. + +0.009 2015-11-04 + + - (Addition) Added Attean::API::Result->shared_domain method. + - (Update) Improve handling on unicode data in SPARQL TSV parser. + - (Update) Improve query planner and plan implementations to support + SPARQL 1.1 test suite. + - (Update) Removed HeapSort plan implementation and use of Array::Heap due + to packaging concerns (issue #32). + +0.008 2015-08-18 + + - (Addition) Added Attean::API::Plan::Join role. + - (Addition) Added apply_triple and apply_quad methods to triple and quad + pattern classes to produce Result objects. + - (Addition) Added heap sort plan implementation. + - (Update) Attean::API::TripleOrQuadPattern constructors accept + non-existent parameters (#13). + - (Update) Consolidated BUILDARGS handling in + Attean::API::TripleOrQuadPattern. + - (Update) Moved computation of in_scope_variables from calling code to to + Plan class BUILDARGS. + +0.007 2015-07-16 + + - (Addition) Added Attean::API::Binding->apply_bindings to bind additional + variables. + - (Addition) Added Attean::API::Binding->is_ground. + - (Addition) Added Attean::API::TriplePattern->as_triple, + Attean::API::QuadPattern->as_quad. + - (Update) Added evaluation support for REGEX functions. + - (Update) Fix Attean plugin loading to allow non-plugins nested below the + plugin namespace. + - (Update) Improve SPARQL serialization for IRIs and triple patterns. + - (Update) Improve SPARQL serialization of OPTIONAL and boolean literals. + - (Update) POD improvements (PR #15 from Kjetil Kjernsmo). + +0.006 2015-06-30 + + - (Addition) Added + Attean::API::DirectedAcyclicGraph->has_only_subtree_types method. + - (Addition) Added Attean->acceptable_parsers method (GH issue #11). + - (Addition) Added methods to test terms and variables for common term + role consumption. + - (Update) Added HSP heuristics to Attean::IDPQueryPlanner (patch from + Kjetil Kjernsmo). + - (Update) Added documentation (patches from Kjetil Kjernsmo). + - (Update) Disable stable sortint in Attean::IDPQueryPlanner where it is + unnecessary (patch from Kjetil Kjernsmo). + - (Update) Fixed handling of blank nodes in BGPs in + Attean::IDPQueryPlanner. + - (Update) Updated Attean::IDPQueryPlanner->join_plans API to allow easier + extensibility. + - (Update) Updated attean_query to use the IDPQueryPlanner. + +0.005 2015-05-27 + + - (Update) Add initial code to support interesting orders in + Attean::IDPQueryPlanner. + - (Update) Added Attean::Plan::Unique class. + - (Update) Added POD description of each Attean::Plan class. + - (Update) Added evaluation support for type checking functions (ISIRI, + ISLITERAL, etc.). + - (Update) Added planning support for Extend and Ask algebra operations. + - (Update) Added planning support for Unique plans for DISTINCT queries + which are already ordered. + - (Update) Added query planning tests. + - (Update) Added use Set::Scalar in lib/Attean/Algebra.pm. + - (Update) Allow store-planning of more than just BGPs in + Attean::TripleModel. + - (Update) Change use of ListIterator to CodeIterator in plan classes that + can be pipelined. + - (Update) Changed Attean::Plan::Filter to check the EBV of a single, + named variable binding. + - (Update) Fixed bug in IDPQueryPlanner->cost_for_plan to reflect recently + changed Attean::Plan::Quad API. + - (Update) Improve propagation of distinct and ordered attributes during + query planning. + - (Update) Improved query planning. + - (Update) Removed references to Attean::QueryEvaluator (obviated by + $plan->evaluate). + - (Update) Removed unused/unnecessary code and comments. + - (Update) Rename Attean::Plan::Distinct to Attean::Plan::HashDistinct + (making room for different implementation strategies). + - (Update) Renamed Attean::Plan::Filter to Attean::Plan::EBVFilter. + - (Update) Simplified implementation of Attean::Plan::Unique. + - (Update) Split handling of BGP and GGP join planning in + Attean::IDPQueryPlanner for easier subclass overriding. + - (Update) Updated Attean::Plan::Quad to consume Attean::API::QuadPattern. + - (Update) Updated IDP query planner to produce correct plans for empty + BGPs. + +0.004 2015-05-18 + + - (Addition) Add Attean::ValueExpression->in_scope_variables method. + - (Addition) Add initial implementation of Attean::TripleModel. + - (Addition) Added Attean::API::Binding->values_consuming_role method. + - (Addition) Added Attean::TriplePattern->as_quadpattern method. + - (Addition) Added SPARQL CSV and XML serializers. + - (Addition) Added Test::Attean roles for caching quadstores. + - (Addition) Added Test::Attean::MutableTripleStore. + - (Addition) Added an IDP-based query planner and associated classes and + roles. + - (Addition) Added initial support for representing, translating, and + evaluating SERVICE patterns. + - (Update) Add SPARQL serialization support for Expression classes. + - (Update) Add algebra_as_string methods for some algebra classes missing + an implementation. + - (Update) Add variables to result iterators. + - (Update) Added Math::Cartesian::Product to prerequisite list. + - (Update) Added Test::Roo-based store tests. + - (Update) Added comments about handling of graphs in + Test::Attean::MutableQuadStore. + - (Update) Added missing use statements. + - (Update) Fix documentation of serialize_iter_to_io method. + - (Update) Fixed Attean->get_parser to accept media types with parameters. + - (Update) Fixed required version of perl in store test roles to be v5.14. + - (Update) Fixed serialization bug in + Attean::FunctionExpression->as_sparql. + - (Update) Improve SPARQL serialization for projection, slicing, ordering, + and distinct/reduced modifiers. + - (Update) Improve SPARQL serialization of algebra trees. + - (Update) Update Attean::API::Expression to consume + Attean::API::UnionScopeVariables. + - (Update) Updated AtteanX::Store::Memory to conform to both etag and time + caching roles. + - (Update) Updated Memory store matching methods to accept node arrays for + any quad pattern position. + +0.003 2015-02-19 + + - (Addition) Added Attean::TreeRewriter class. + - (Addition) Added count estimate methods to TripleStore QuadStore roles + (in lieu of github pull request #6). + - (Addition) Added missing algebra_as_string impelementations in + Attean::API::Query and Attean::Algebra. + - (Addition) Added tree_attributes methods to tree classes. + - (Update) Fixed method name typo in + Attean::API::TimeCacheableTripleStore. + - (Update) Split Cacheable roles into ETagCacheable and TimeCacheable + variants. + +0.002 2014-10-15 + + - (Addition) Added Attean->negotiate_serializer method. + - (Addition) Added POD for many classes and roles. + - (Update) Changed media_type attributes to class methods in Serializer + classes. + - (Update) Moved RDF::Query algebra translator to + AtteanX::RDFQueryTranslator. + - (Update) Switched from Sub::Name to Sub::Util (github issue #5). + - (Update) Updated Attean->get_serializer to support media_type argument. + - (Update) Wrap mutating methods in a single bulk-update. + +0.001 2014-09-27 + + - (Addition) Initial release. + diff --cc META.yml index 22af4a3,0000000..07bba31 mode 100644,000000..100644 --- a/META.yml +++ b/META.yml @@@ -1,65 -1,0 +1,64 @@@ +--- +abstract: 'A Semantic Web Framework' +author: + - 'Gregory Todd Williams C<< <gwilli...@cpan.org> >>' + - 'Gregory Todd Williams <gwilli...@cpan.org>' +build_requires: + ExtUtils::MakeMaker: 6.59 + HTTP::Message::PSGI: 0 + Regexp::Common: 0 + Test::Exception: 0 + Test::LWP::UserAgent: 0 + Test::More: 0.88 + XML::Simple: 0 +configure_requires: + ExtUtils::MakeMaker: 6.59 +distribution_type: module +dynamic_config: 1 - generated_by: 'Module::Install version 1.16' ++generated_by: 'Module::Install version 1.17' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Attean +no_index: + directory: + - inc - - share + - t + - xt +requires: + Algorithm::Combinatorics: 0 + Data::UUID: 0 + DateTime::Format::W3CDTF: 0 + File::Slurp: 0 + HTTP::Negotiate: 0 + IRI: 0.005 + JSON: 0 + LWP::UserAgent: 0 + List::MoreUtils: 0 + Math::Cartesian::Product: 1.008 + Module::Pluggable: 0 + Moo: 2.000002 + MooX::Log::Any: 0 + Role::Tiny: 2.000003 + Set::Scalar: 0 + Sub::Install: 0 + Sub::Util: 1.4 + Test::Modern: 0.012 + Test::Moose: 0 + Test::Roo: 0 + Text::CSV: 0 + Try::Tiny: 0 + Type::Tiny: 0 + URI::Escape: 1.36 + URI::NamespaceMap: 0.12 + XML::SAX: 0 + namespace::clean: 0 + perl: 5.14.0 +resources: + IRC: irc://irc.perl.org/#perlrdf + bugtracker: https://github.com/kasei/attean/issues + homepage: http://search.cpan.org/dist/Attean/ + license: http://dev.perl.org/licenses/ + repository: http://github.com/kasei/attean/ - version: '0.017' ++version: '0.019' diff --cc SIGNATURE index dc53951,0000000..bb6966b mode 100644,000000..100644 --- a/SIGNATURE +++ b/SIGNATURE @@@ -1,206 -1,0 +1,204 @@@ +This file contains message digests of all files listed in MANIFEST, - signed via the Module::Signature module, version 0.79. ++signed via the Module::Signature module, version 0.81. + +To verify the content in this distribution, first make sure you have +Module::Signature installed, then type: + + % cpansign -v + +It will check each file's integrity, as well as the signature's +validity. If "==> Signature verified OK! <==" is not displayed, +the distribution may already have been compromised, and you should +not run its Makefile.PL or Build.PL. + +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + - SHA1 1c6df6e45ffab402b6dec709345b719b401e512f CONTRIBUTING - SHA1 e037ec7942696735e70075236880e78dabbeedff Changes - SHA1 349e3c3f8e1bb1bd4d3335b2ffe8e5e3539b020b LICENSE - SHA1 c02b79b17773916b6f2239a458e096510f261a5f MANIFEST - SHA1 fd56029e2a6ebbf41e6012455f8c4bbb2aa9eecf META.yml - SHA1 fd338dd1189bf41237f7209e870178b0f6646f7e Makefile.PL - SHA1 9e21560518271ecc7aa33d94e1a611321f0031a5 README.md ++SHA1 ba9ef07be472bc75f26d397d997b9003b8dc1bf3 CONTRIBUTING ++SHA1 03388627c04b2602fe48e4b11864ced4c698e970 Changes ++SHA1 555ddb27d1e3cdeb44c2f2a2b20f79d32208377d MANIFEST ++SHA1 d1eb6ac82744f093ddafc2b6663066e49a9f2066 META.yml ++SHA1 ec0329efca8c61af53c76e4f49f7457841f54319 Makefile.PL ++SHA1 c75277a0c2474f4cb79e0d25d7012e1b50f8c700 README.md +SHA1 a26c369fab6fc9fc43bd51a3d00760fccd66c13f bin/attean_parse +SHA1 5a1f67d7adb8f6109cd7cd5c08c89ab1692292a9 bin/attean_query +SHA1 94dbaba80d26bd82ced0520bb1e369b05fcff9d4 bin/canonicalize_bgp.pl - SHA1 bce3c51bb369419603298064b78e14077b93af66 inc/Module/Install.pm ++SHA1 05a17c51aceb6435a1eac17137f19911a09e5050 inc/Module/Install.pm +SHA1 d001b4b9a48395a8c4134b234a0e1789138427c5 inc/Module/Install/AuthorTests.pm - SHA1 fe220f215f645500ce8f14ff5e19d9a28692af56 inc/Module/Install/Base.pm - SHA1 b56ed8e42c600e08007d152cf0b1438a7c3b7f6e inc/Module/Install/Can.pm ++SHA1 dc73c2baf4357ad1cc884146147f557a50a29300 inc/Module/Install/Base.pm ++SHA1 c7f311a5bc5a7f96e9105d5f16a0e13fc596899d inc/Module/Install/Can.pm +SHA1 470809a1dbe03e197e74dde79c6af40b5f7f9b26 inc/Module/Install/DOAPChangeSets.pm - SHA1 99c531a17a67ce5250df2ae151cc48c80d914cde inc/Module/Install/Fetch.pm - SHA1 76efdca3603159e0ae0e18f19fe72a0211a69529 inc/Module/Install/Makefile.pm - SHA1 2e33e87882d60db3913da6284dd5295e5315e18a inc/Module/Install/Metadata.pm - SHA1 01978a56e76a58399af3bd4d022aa990b9669bee inc/Module/Install/Scripts.pm - SHA1 c830b819e61bda5eca077c6291293bba61b3b9f2 inc/Module/Install/Win32.pm - SHA1 cb52b9d6f88d512d448a6f35ed0af0d1201a134b inc/Module/Install/WriteAll.pm - SHA1 ae30d5d511862f58e0d8672753ee64d331f4ccf5 lib/Attean.pm - SHA1 198de879cd27a06c3133504658548468b67b04d7 lib/Attean/API.pm - SHA1 e097ec6c17e54a57239a40340367a841bf675650 lib/Attean/API/AbbreviatingParser.pod - SHA1 bd620250c20164d8aadfeb4263f5f25b059e56f9 lib/Attean/API/AbbreviatingSerializer.pod - SHA1 4eb7677efb9f62d6467bae0e05f7ed7e024a3af2 lib/Attean/API/AggregateExpression.pod - SHA1 d86fdc7905046a68b22e2daa00f2fde4b30eaf9d lib/Attean/API/AppendableSerializer.pod - SHA1 897b121cc83ca93706b9a080f9da62ea548d1c57 lib/Attean/API/AtOnceParser.pod - SHA1 0998fe27b3a9e7a1d00c92b6f59b29a5e6c7457b lib/Attean/API/Binding.pm - SHA1 516a1fa33d3cba4caad0e50c0632c145a4b1e6a9 lib/Attean/API/Blank.pod - SHA1 4dd65d0d791b28f2b949ff1a7c83adfccbfa0e27 lib/Attean/API/BlankOrIRI.pod - SHA1 9192724484cd48d5eec502907da8733a177bd58c lib/Attean/API/BulkUpdatableModel.pod - SHA1 69b69c98a6e7d12207c5ecb42556efede40317c4 lib/Attean/API/Expression.pm - SHA1 09c7e43297b538deb88b411e3b78528addfb097b lib/Attean/API/IRI.pod - SHA1 c16afed7c3edf99726fc74586027d8144fae801f lib/Attean/API/Iterator.pm - SHA1 7b34dd9bdf5c679648faf4565ae10b8a731a0a72 lib/Attean/API/Literal.pod - SHA1 05181d201edfc217183ed9a1319fd6cd5c026796 lib/Attean/API/MixedStatementParser.pod - SHA1 2f259d2a421b39a717418e719da182c59b65cae6 lib/Attean/API/MixedStatementSerializer.pod - SHA1 28d584c6acc27af8a4df2820293cb8eb2805c2b5 lib/Attean/API/Model.pm - SHA1 c14672d3845a26f33209da53857148b6c350f845 lib/Attean/API/MutableModel.pod - SHA1 3a8a3615aec7a82e850bb108f413631c17ac8764 lib/Attean/API/MutableTripleStore.pod - SHA1 de005782009907f53c1046486e3ca4f038f028f1 lib/Attean/API/Parser.pm - SHA1 2020f10bc7546ae18e2003a9647d531b3b93ced8 lib/Attean/API/Plan.pm - SHA1 dc74a6ab789fe11ee8084b3cd72aac50cf33a9f1 lib/Attean/API/PullParser.pod - SHA1 9f247a300efecf7d34c4e665589ff90a42531e16 lib/Attean/API/PushParser.pod - SHA1 42f0fbaf1ee5e0f36907765223fb322418bc840a lib/Attean/API/Quad.pod - SHA1 001e9b7e549bd4a3b009824608e54ff2f460a599 lib/Attean/API/QuadParser.pod - SHA1 db580c5f0641f683dc57672f90222e96d95b12a6 lib/Attean/API/QuadPattern.pod - SHA1 c8c31490df0994cbd39b72562b8757954ec886b2 lib/Attean/API/QuadSerializer.pod - SHA1 14a6c00f541521398ffdefa87810cf2530b20d8f lib/Attean/API/Query.pm - SHA1 9c8c63c826d9327f12d2e61b4eb991db213e0ecc lib/Attean/API/QueryPlanner.pm - SHA1 60c81240a2fe9d2b6b85f16d0fe8100e57254223 lib/Attean/API/RepeatableIterator.pod - SHA1 88b99e95a89a4e2e362221e7ab3499ac35f1d5c3 lib/Attean/API/Result.pod - SHA1 fc3d41b4f80281b51865212a0dcf022e83f901b9 lib/Attean/API/ResultParser.pod - SHA1 76c75b6b181ae42dfc825f952cfac82867ebe380 lib/Attean/API/ResultSerializer.pod - SHA1 138e297605c514e9a6be0e275caccbe9e23dad28 lib/Attean/API/Serializer.pm - SHA1 4521ba0efb0073157c61d8edae67a820577b16d2 lib/Attean/API/Store.pm - SHA1 ecf445107aca66b8af0157fd29297888a2360a95 lib/Attean/API/Term.pm - SHA1 afa372408183c4c50f221c3c4971204a3919000b lib/Attean/API/TermOrVariable.pod - SHA1 448b64e8938079f664cf7388e9d34334f43059c8 lib/Attean/API/TermParser.pod - SHA1 3bcc7b9f3a6965dfae3296f75b04716e57cdb4a9 lib/Attean/API/TermSerializer.pod - SHA1 c8ae08735ddefa1de498c02e4336e1f4899ad880 lib/Attean/API/Triple.pod - SHA1 11335ce41f45a8d30ac6e867919a9828118af469 lib/Attean/API/TripleOrQuad.pod - SHA1 4ddddc721236ec6d14896674c52acba09d34d67a lib/Attean/API/TripleParser.pod - SHA1 c48470e65e0639f24a407ce54c2bdd9637aea7c0 lib/Attean/API/TriplePattern.pod - SHA1 8e86acf3085380e5789a74a9e65d5d2c5162f766 lib/Attean/API/TripleSerializer.pod - SHA1 b294267623f52e9464b8972fe760b3f2fa8be029 lib/Attean/API/Variable.pod - SHA1 fc330242b961a6b9da06e35e2e9231e76fe3706f lib/Attean/AggregateExpression.pod - SHA1 a0a10900fef881ce0050396d00b77a0dab62e4a6 lib/Attean/Algebra.pm - SHA1 fa48b376f8db284eab03d513575f1a6a5697a579 lib/Attean/BindingEqualityTest.pm - SHA1 c2ad2e72895c6736885bace4f2cd446b649d5d7e lib/Attean/Blank.pm - SHA1 df160bf216bd6f500441c245ef47f1c49955b2ae lib/Attean/CodeIterator.pm - SHA1 2cc953ad567875caa734f76fe0c4973cc7c21b4a lib/Attean/Expression.pm - SHA1 423ef9b7320bf688fd8c7e2d8b343059708f66f5 lib/Attean/IDPQueryPlanner.pm - SHA1 a2b356680e283fade6b26742b0798e637d3a09fe lib/Attean/IRI.pm - SHA1 429714556d89e3fb8159328ba876d0de2e7610b9 lib/Attean/IteratorSequence.pm - SHA1 7839644dec5fa5b176ddb735fa9024b24059c1c4 lib/Attean/ListIterator.pm - SHA1 c85dba461c2dc8a7a9f2ada20ab494d9e7909774 lib/Attean/Literal.pm - SHA1 3411bbef64f45c96450e3be94d07a616c7687f8d lib/Attean/Plan.pm - SHA1 972c2800afb16774b142f714c8ad52add5101f01 lib/Attean/Quad.pm - SHA1 c78cc3e3e3dba8cf523b0d1cee585db64f76c2f6 lib/Attean/QuadModel.pm - SHA1 e5c25192c18ec4051ebbe5afe2dae68d06a5875b lib/Attean/QueryPlanner.pm - SHA1 17c1dd74b03c0a3425ff4d23f27a8df8bab2a661 lib/Attean/RDF.pm - SHA1 41043c0f954628ff5ace97736446dd76835b6d2d lib/Attean/Result.pm - SHA1 9bf478d9514968bfc580ec9fbd2a173ec834fe8c lib/Attean/SimpleQueryEvaluator.pm - SHA1 ada0a7959fe73338b1b2267ae40853c8e3feb296 lib/Attean/TermMap.pm - SHA1 6e56976d0cc6b272db965e7c630b9ae839417794 lib/Attean/TreeRewriter.pm - SHA1 7bf233fdb6ada198633a826c7eae92d7974a98f0 lib/Attean/Triple.pm - SHA1 91d0374143b179d18580ecfecddd9ca1be3e3e4b lib/Attean/TripleModel.pm - SHA1 ac2a22390f50559d7dd0201f19987ddcce31eaa6 lib/Attean/Variable.pm - SHA1 2aff1095395583b792257c16c6f490bdad0ea5ea lib/AtteanX/API/JoinRotatingPlanner.pm - SHA1 32d5e3b04a1d2bdb856d4916253cb1e1b94b3a90 lib/AtteanX/API/Lexer.pm - SHA1 412468e651a059058e56af73f25748c20972d4a0 lib/AtteanX/Parser/NQuads.pm - SHA1 7efb9971e2bd4af9b2e61715d00b61b2e96a9803 lib/AtteanX/Parser/NTriples.pm - SHA1 059835ab430b666295bd041e209bae9b17341568 lib/AtteanX/Parser/NTuples.pm - SHA1 f2c9a9a2093a1226fc46d70f47c2bacbde16526e lib/AtteanX/Parser/RDFXML.pm - SHA1 0999e638a27cd06d80b583e57cf005497f4f92e7 lib/AtteanX/Parser/SPARQL.pm - SHA1 d0336c2127f7f3c9bb8fc6e11219f2503d495e30 lib/AtteanX/Parser/SPARQLJSON.pm - SHA1 c007d3694fec4152496c5d29c2e32be2ea195c53 lib/AtteanX/Parser/SPARQLLex.pm - SHA1 0458e68c672707673fac8fdb38c3328cd4477814 lib/AtteanX/Parser/SPARQLTSV.pm - SHA1 30ece5b96a83d6385ec696ea19ee22fd4672df12 lib/AtteanX/Parser/SPARQLXML.pm - SHA1 8164faa2aac1dbca7b0c7ea3df5f55c1014d4a23 lib/AtteanX/Parser/SPARQLXML/SAXHandler.pm - SHA1 cf909de667e80024e590b5592023776500b294fa lib/AtteanX/Parser/Turtle.pm - SHA1 3887e4f537d55229517386602343feb4f97ad988 lib/AtteanX/Parser/Turtle/Constants.pm - SHA1 1c2581bd6996e81e1b27635d2bfdb51540cd503a lib/AtteanX/Parser/Turtle/Lexer.pm - SHA1 2feb117293b54bfd74b9316836019949175941a8 lib/AtteanX/Parser/Turtle/Token.pm - SHA1 d60581f401bed7f16f7344de360dcbacf22b7081 lib/AtteanX/SPARQL/Constants.pm - SHA1 e7072bfcf3381fb96302b771d1647006ced36f67 lib/AtteanX/SPARQL/Token.pm - SHA1 2ec1315cb4f6d9c962ccd98a09bafb7b1217e00f lib/AtteanX/Serializer/CanonicalNTriples.pm - SHA1 41758758683217389222c3823cb14ef2c578e0f4 lib/AtteanX/Serializer/NQuads.pm - SHA1 9400a4188ff1e1d084ba21d005f1b2c8aef6527f lib/AtteanX/Serializer/NTriples.pm - SHA1 c8db54e0198ea608ef9eb9cd42db8a3480b0ad1d lib/AtteanX/Serializer/NTuples.pm - SHA1 ae8a674085f4e78ff121d275dd66835d10c38397 lib/AtteanX/Serializer/RDFXML.pm - SHA1 c7b596540ed823cc86283b9b32ab020e2125b1e3 lib/AtteanX/Serializer/SPARQL.pm - SHA1 eaa2df00f2d64497cd3825becc159f5c7352de10 lib/AtteanX/Serializer/SPARQLCSV.pm - SHA1 da43397ebe8a67e6df9e80ae829ff5d602337abc lib/AtteanX/Serializer/SPARQLHTML.pm - SHA1 6fe76461a2b35fa177148018b23e3806168993f6 lib/AtteanX/Serializer/SPARQLJSON.pm - SHA1 01daafcaa4e1458e205a399b52b307c44a8216de lib/AtteanX/Serializer/SPARQLTSV.pm - SHA1 5431c310999617cf76dc8f9a9921d6744d68a161 lib/AtteanX/Serializer/SPARQLXML.pm - SHA1 10d0d1e8b66bdc999712a424723a52c4fd121e75 lib/AtteanX/Serializer/Turtle.pm - SHA1 34ee244a7f789a47f7299aa57d785794c9ab1c6a lib/AtteanX/Serializer/TurtleTokens.pm - SHA1 e851b34edc6d53e2bf5051073a9f7ceb97a774ec lib/AtteanX/Store/Memory.pm - SHA1 99a170418da2631011a5204c09ad84a87ce98543 lib/AtteanX/Store/Simple.pm - SHA1 6d274ea99ee2d879a0471dee99fe9c7066676286 lib/AtteanX/Store/SimpleTripleStore.pm ++SHA1 8c8f9ff5b0a536af59814e16a901ce39fbc23299 inc/Module/Install/Fetch.pm ++SHA1 4f77eb02e104324b08a047585c498146b045613b inc/Module/Install/Makefile.pm ++SHA1 2f5be6af6098acf6d786a4a7299a34d0c6c04ef9 inc/Module/Install/Metadata.pm ++SHA1 fa532ce949d1c607589aded93d5ea1d49a27e5d8 inc/Module/Install/Scripts.pm ++SHA1 aa6723cc4a8d4475026f6ceb28e1f16459e8a11b inc/Module/Install/Win32.pm ++SHA1 6661285caedfe012cb5a1ca915a422ffc292ae2b inc/Module/Install/WriteAll.pm ++SHA1 2f972d63a1a015cdd328821312def06269a973fd lib/Attean.pm ++SHA1 eb17ab5318fc19c81ca25d3f6635eae6b1681123 lib/Attean/API.pm ++SHA1 9ae72be388ec0a1ca2dd68796bc1c089eab7f956 lib/Attean/API/AbbreviatingParser.pod ++SHA1 498d3e61281da544247ad5304e0308bd8241938d lib/Attean/API/AbbreviatingSerializer.pod ++SHA1 65b911752441890c888b83933f23f78dfa5b4286 lib/Attean/API/AggregateExpression.pod ++SHA1 e141171970ae952168e9fc6c1d910d887cfe854f lib/Attean/API/AppendableSerializer.pod ++SHA1 81aba4b3c3d48726c49e2973037e4137a027fe68 lib/Attean/API/AtOnceParser.pod ++SHA1 0f16fb2f97a1675089ea14cfb1710d39ed25eacd lib/Attean/API/Binding.pm ++SHA1 d846a98ffae08cc44832d83ec1b01f117a6e0869 lib/Attean/API/Blank.pod ++SHA1 65834277411b51371c0d28ecc62faa338130dad0 lib/Attean/API/BlankOrIRI.pod ++SHA1 516d9e8529acc0a662cb017a42a3cf7647593ab9 lib/Attean/API/BulkUpdatableModel.pod ++SHA1 e640fae91c5478271b6dd6126b175b2698a9891e lib/Attean/API/Expression.pm ++SHA1 8a0ec69fb280bd00cd669faf71d78f22cfb73ba5 lib/Attean/API/IRI.pod ++SHA1 0fb01c146d04b5341acf11da53a9603be1796028 lib/Attean/API/Iterator.pm ++SHA1 2a1d5bcc43798576c3ea1c0e911b73d6bfb26775 lib/Attean/API/Literal.pod ++SHA1 50ddb3c3d770350ead832fac48c80c9e2f3bf0dd lib/Attean/API/MixedStatementParser.pod ++SHA1 b5aa26477ddf0ffb2bbed76ab5d2f30435f7791c lib/Attean/API/MixedStatementSerializer.pod ++SHA1 b1c310818c7c213ef6f5de1691e81f52d334d846 lib/Attean/API/Model.pm ++SHA1 07f3dd92c2fa2c8932ad0f8082e1df7351a882cf lib/Attean/API/MutableModel.pod ++SHA1 9facca56fd57aaea77f50c2c1816abd2127bc724 lib/Attean/API/MutableTripleStore.pod ++SHA1 37363207411a0686d51f5f19f8e1205485b2823b lib/Attean/API/Parser.pm ++SHA1 2d2d0e8192b37e5944fee9bb44695fc8e7829030 lib/Attean/API/Plan.pm ++SHA1 a2eb5065ec1b9f2243d5740f45a826938a143547 lib/Attean/API/PullParser.pod ++SHA1 cc815f1a5cb4ce87ce314136a121d4ca26f84c53 lib/Attean/API/PushParser.pod ++SHA1 83eaee5b175ebba48ae07d4c2b352ea5a3f40f10 lib/Attean/API/Quad.pod ++SHA1 daad304db72866079b7d28782f029a758c42aff6 lib/Attean/API/QuadParser.pod ++SHA1 5ae36e071509486e799e6392e2034fc8fb548647 lib/Attean/API/QuadPattern.pod ++SHA1 0639462939695aeb09bde79363bc2eac49bb14a2 lib/Attean/API/QuadSerializer.pod ++SHA1 bcef2275615782b02316a15b78151da8a29e3fe4 lib/Attean/API/Query.pm ++SHA1 ccf167566639ee4f9b4995a782826c595fa14b28 lib/Attean/API/QueryPlanner.pm ++SHA1 42d2feddc454fc48c5a7a347b14cde74f6851d97 lib/Attean/API/RepeatableIterator.pod ++SHA1 64eb1bc0891aaa8ee8176271a05fb1bcc7f2799c lib/Attean/API/Result.pod ++SHA1 74a697f439a2d0327c949e2c134b7ce778aa9324 lib/Attean/API/ResultParser.pod ++SHA1 a44812eca2364f83b61b05f85fa4cea2f12fad1c lib/Attean/API/ResultSerializer.pod ++SHA1 210bc93bffe126e5c98d73d74c337e0940b4f70c lib/Attean/API/Serializer.pm ++SHA1 0d5048031d16ae173f04bdc69d7abb02e6c9646e lib/Attean/API/Store.pm ++SHA1 6092ee5a491ed71424f8609bd6231d668f738550 lib/Attean/API/Term.pm ++SHA1 a36e9c32261e95f682fbb0df21050f7216d772fb lib/Attean/API/TermOrVariable.pod ++SHA1 19abcc8677a7cc6d77a3e04cff01b62a53d40663 lib/Attean/API/TermParser.pod ++SHA1 8b9d2467f2df1c9ac4a93201325bde5fc0d0cf69 lib/Attean/API/TermSerializer.pod ++SHA1 7c0d565357d3ce37e606c07c4b831065476ee771 lib/Attean/API/Triple.pod ++SHA1 cc657878b1cfaa0be04796407563c1ea62f255a1 lib/Attean/API/TripleOrQuad.pod ++SHA1 91990e55d8f7eaaa9660238c432c55832576dbbb lib/Attean/API/TripleParser.pod ++SHA1 0e069c3f51cf3319f9fcfe2282f1b3685f533247 lib/Attean/API/TriplePattern.pod ++SHA1 9e29eed44e09ff7fcf24cf3db79e4d855de009bd lib/Attean/API/TripleSerializer.pod ++SHA1 aad3b84c891cb08b09b1aed4f95651d627a259e8 lib/Attean/API/Variable.pod ++SHA1 7315f89195980ac289a0deb7a2d8345e46c35610 lib/Attean/AggregateExpression.pod ++SHA1 883c759575b24a9b9913c60e9062acf805098c46 lib/Attean/Algebra.pm ++SHA1 f388d07a3abc888abc9ee3ae899981befd73dea8 lib/Attean/BindingEqualityTest.pm ++SHA1 1a5f4d3fcd6e3030cd926653ff8a2d7d8b777c29 lib/Attean/Blank.pm ++SHA1 3dadd85618e28a5fe46a7f6119c5da481debce96 lib/Attean/CodeIterator.pm ++SHA1 eabab13449b8deddc6c8ec10c29b9f31d4648851 lib/Attean/Expression.pm ++SHA1 a21c729cbcfd93dcefc62df5dc28c591e9cdf680 lib/Attean/IDPQueryPlanner.pm ++SHA1 6b9d14d637d828111a96bc69e7f7c25e41d2b02e lib/Attean/IRI.pm ++SHA1 3e187b7ea9f77d7fe76e6bc58f5223772886965a lib/Attean/IteratorSequence.pm ++SHA1 d0175b00accd2ac7da67872cfd0c88e0fa5dc79e lib/Attean/ListIterator.pm ++SHA1 6b0842a702b3016f49694b9bb5849a1192dc6b92 lib/Attean/Literal.pm ++SHA1 d4984056ff7581b391e00a35f368fd658de1c0db lib/Attean/Plan.pm ++SHA1 43504647f83f1a23de91afaf749f6d540dce8adf lib/Attean/Quad.pm ++SHA1 a1374ce1e6ec3d68979c792ca64ee427079f6575 lib/Attean/QuadModel.pm ++SHA1 2447f17d48a908a479903b01e01f76087b4f79f4 lib/Attean/QueryPlanner.pm ++SHA1 e7f8d534baf6adfdae276ce579a3dceb902afc61 lib/Attean/RDF.pm ++SHA1 38e160e3a4dbe3e730971288dc9f9766f7c8a723 lib/Attean/Result.pm ++SHA1 2e6c5e079ac5420a76a9f93cf534c2c4544ab55b lib/Attean/SimpleQueryEvaluator.pm ++SHA1 ee0448831f442fb16c6be89220407548b321d2ad lib/Attean/TermMap.pm ++SHA1 608b5ad38a5184e76ea0eca7bddcb43e218a1e5b lib/Attean/TreeRewriter.pm ++SHA1 ebf20ab94c2e89e27b28d50efda3f58d3f9c383c lib/Attean/Triple.pm ++SHA1 7c861dade65a9ed3e3c22592a6f227d41f8a8e27 lib/Attean/TripleModel.pm ++SHA1 a5ed9173583dbd9b7c68987ee9dacd2baea1b66e lib/Attean/Variable.pm ++SHA1 76d6f0b6f20c78f86e70f0293a8ec5ef00dc1a74 lib/AtteanX/API/JoinRotatingPlanner.pm ++SHA1 1671c3e7e05c877613c29bfa637a53e1f6a0b3bb lib/AtteanX/API/Lexer.pm ++SHA1 2245d3061197fd602d2dfc942c4767e1db0057b4 lib/AtteanX/Parser/NQuads.pm ++SHA1 b5db5481c1734716317a2ef2651d8c8510c3d7e1 lib/AtteanX/Parser/NTriples.pm ++SHA1 4b7eafde7a3a74a8d0cab385786f9643a3f88a78 lib/AtteanX/Parser/NTuples.pm ++SHA1 cb8db96c96ab1a47c16fad43bfa52369972999a9 lib/AtteanX/Parser/RDFXML.pm ++SHA1 eec46e26b46a8f2a1bc0f1c20b5fbca13f5d9f6e lib/AtteanX/Parser/SPARQL.pm ++SHA1 527237c1fc678b875ab40102dfcd14950c625968 lib/AtteanX/Parser/SPARQLJSON.pm ++SHA1 babdf7603beb428bc49d369c9053f0581193e3f0 lib/AtteanX/Parser/SPARQLLex.pm ++SHA1 9a467f3629ecb3471a9803471bd3f3b496060871 lib/AtteanX/Parser/SPARQLTSV.pm ++SHA1 81825a67cadf66ebfc354f59f3b99768cb7917f4 lib/AtteanX/Parser/SPARQLXML.pm ++SHA1 46d133a219037001f5b3582f1b7fd0b645dc4f57 lib/AtteanX/Parser/SPARQLXML/SAXHandler.pm ++SHA1 36054689cacc2ee6da265184c76e71e73eea360d lib/AtteanX/Parser/Turtle.pm ++SHA1 875e77a7a34d0a6fa0b7daf51b0478b975540359 lib/AtteanX/Parser/Turtle/Constants.pm ++SHA1 e529607c833d314b613308458ece08f0ef65f4fc lib/AtteanX/Parser/Turtle/Lexer.pm ++SHA1 a190eb9a1b87c06c439b9e0110afc3229305de56 lib/AtteanX/Parser/Turtle/Token.pm ++SHA1 1c219791092be567df9ba6761804074495c94e3a lib/AtteanX/SPARQL/Constants.pm ++SHA1 b6ef3472784c9492d9e31fecd3a5c2f15faf82a2 lib/AtteanX/SPARQL/Token.pm ++SHA1 350b90143c07bef190a37306790a41d8e1234180 lib/AtteanX/Serializer/CanonicalNTriples.pm ++SHA1 508282709e3ef5f353daf45c9ad5053e046d6f22 lib/AtteanX/Serializer/NQuads.pm ++SHA1 506749d2152330aa2ba42b5ea519c20a0f80b8e4 lib/AtteanX/Serializer/NTriples.pm ++SHA1 e4b6e9b7b9f9c9ee7e67a16f257f34ffdccb8924 lib/AtteanX/Serializer/NTuples.pm ++SHA1 5b501f1edd46afd30e734d55646fceac988b58c2 lib/AtteanX/Serializer/RDFXML.pm ++SHA1 9f610e70413586dfe55561bf3a98798dc3739945 lib/AtteanX/Serializer/SPARQL.pm ++SHA1 b3d8edbc7aa4507a48932c343477a340dc62a1fe lib/AtteanX/Serializer/SPARQLCSV.pm ++SHA1 edd3837f9998f92aad39fc071a6b46314a55f187 lib/AtteanX/Serializer/SPARQLHTML.pm ++SHA1 63312ed8da57ee99e2a038ced0055181759d9cc2 lib/AtteanX/Serializer/SPARQLJSON.pm ++SHA1 9a005712e66d6df47d48c0ed9c86b0053a756322 lib/AtteanX/Serializer/SPARQLTSV.pm ++SHA1 3f6cccebf365fdf8c15f1e65b8b7efa8010d3028 lib/AtteanX/Serializer/SPARQLXML.pm ++SHA1 45a5429146dd68a0b335730e35b46dd36dbe44e8 lib/AtteanX/Serializer/Turtle.pm ++SHA1 586c77d9e13e3c99ae27bb1893fb58d9bce17796 lib/AtteanX/Serializer/TurtleTokens.pm ++SHA1 8e20abe864bdc83f7d52d644004ea1b3fa280701 lib/AtteanX/Store/Memory.pm ++SHA1 d324a1236215825b313584a942b32a7f1fd7321f lib/AtteanX/Store/Simple.pm ++SHA1 55c4881ccdfb59fb58e5a2187e5798ad14fa4e65 lib/AtteanX/Store/SimpleTripleStore.pm +SHA1 0334bb026d34a1053314bc36b8d1cd5fcc318ffc lib/Test/Attean/ETagCacheableQuadStore.pm +SHA1 58965664b139679a2709e44e86c14280cd4e190d lib/Test/Attean/MutableETagCacheableQuadStore.pm +SHA1 ebd50d18293aa3802f76810874f21e015d56a70d lib/Test/Attean/MutableQuadStore.pm +SHA1 2bf218676baf75ca9b0df4dbc4b157430356a7f6 lib/Test/Attean/MutableTimeCacheableQuadStore.pm +SHA1 7212724ecc4d74464385cd238c793048dcaf411c lib/Test/Attean/MutableTripleStore.pm +SHA1 25aac84349872de5010581fd1cc967b7bc26ffdc lib/Test/Attean/QuadStore.pm +SHA1 ffcbd3f3a74ebf6c28837195e575b9da180c4e42 lib/Test/Attean/SPARQLSuite.pm +SHA1 2481193de68245c3e7b154df6b8abb23ee9a4187 lib/Test/Attean/StoreCleanup.pm +SHA1 a78bffff90c3fc6a41657eb27bb03d0234d2b20d lib/Test/Attean/TimeCacheableQuadStore.pm +SHA1 a56bf6cf4d0a9c2937131ea904dbb38f3b4f6a9c lib/Test/Attean/TripleStore.pm - SHA1 ce9bb491556d94ccc18fd3ac21b1b14855d4d506 meta/changes.ttl ++SHA1 10d2b5813a5894e261297d77c318252b7d952b64 meta/changes.ttl +SHA1 2392481e08460c40fa64bb9a25a14bf9c541e4f3 t/00.load.t - SHA1 a33fc026857005f2569cd35bfcef3a9a8c03f269 t/algebra.t ++SHA1 bf9fd11d3a1e3f1da7c4ba9a32ed59f9cd1dc725 t/algebra.t +SHA1 e2c731972781ec12aa752edc4eff3ca748d92aec t/binding-equality.t +SHA1 31a18e54ef24fd71c148c0affb8d978cf819904a t/binding.t +SHA1 bdbbae0166d386a51fb810bcb307a8b7161d0751 t/cost_planner.t +SHA1 98b8f4b4378b6a91e14e7c8261027a69d4d62fc9 t/expression.t +SHA1 8f125b3ce10c54e8f7e12f81f865b1e9a334f7d5 t/http-negotiation.t +SHA1 aafe24b2de00349ae580f7d2f482e70c87549a0b t/idp_planner.t +SHA1 719d30fb16a751306d2645cf4b3e475f306d9fd5 t/iter.t +SHA1 1caa9f4782abcc75c4986f83e1f07acb981b9356 t/join_rotating_planner.t +SHA1 6faf2f951edc0d98d98978daae0d53250028de49 t/model-quad.t +SHA1 6fd7acd9c0083b9e994a1839092dba8b0b3fdd91 t/model-triple.t +SHA1 e2ff1023fbb61d83af89f8536bc9d24ecc71c247 t/naive_planner.t +SHA1 6557610bbc897addc43ce43131cdb176d97cc77e t/parser-nquads.t +SHA1 fadbbc56ad0c65989cb8babc5ec480013245bf86 t/parser-ntriples.t +SHA1 c6d25a578434f88e2c28543ab8c3024f548386cd t/parser-rdfxml.t +SHA1 c0b246f6884ddbd71dc1b9c1f5449e6f2d9484cf t/parser-sparql.t +SHA1 01390395af423f44da5eee1e1c83871dca0e54dd t/parser-sparqljson.t +SHA1 c96ec9d5b3bb8213ab169b4f5a2dc221b4d38730 t/parser-sparqltsv.t +SHA1 daee9809930c96c20f3b38d7b3f5b191a66c0a74 t/parser-sparqlxml.t - SHA1 6228b3e386e0619ca9c631c98e49bfa7c4ea9759 t/parser-turtle.t ++SHA1 20f5bc5515862906cda71a7cb560d6c9286004d4 t/parser-turtle.t +SHA1 b48aeffe131e0b3f2f1a8eff88971f470f1a72ee t/parser.t +SHA1 18a4c3a526a57e3f3481882e0896fed27c991a8f t/plan.t +SHA1 6755a7cce9c77e57afa96c4a60b2803d2522957c t/plans.t +SHA1 cb9cf4ea8682b0d2736cd2555190012d1f3ab766 t/serializer-canonicalntriples.t +SHA1 cd7b72bb7be55ce22a2b697bfbd8e7d278ef9bf9 t/serializer-nquads.t +SHA1 05d0f01969c0aab1a810c503f23128ee77fc7508 t/serializer-ntriples.t +SHA1 a4490451ec561b136b8332016414d95bd24762a9 t/serializer-rdfxml.t +SHA1 61409eb2c721a61fe9d19e8a92b30d64d51ac4c3 t/serializer-sparql.t +SHA1 abf6658b4d495114e4bd7577f425df910d859a93 t/serializer-sparqlcsv.t +SHA1 80e24e22c4f86005c723fdfa9d52bee017d93eb6 t/serializer-sparqlhtml.t +SHA1 69e480109b7fd28896b4b5fcc58df6b1cf668f14 t/serializer-sparqljson.t +SHA1 dc74d5ebf7198f0907eccd6a85bb51f0d96ce52f t/serializer-sparqltsv.t +SHA1 47a4801760ef3a6cb74c3de7c6f68a0f97243fba t/serializer-sparqlxml.t +SHA1 327b2df2f199ff75d12d79a2dffdeda2a3e7cb1a t/serializer-turtle.t +SHA1 8ce865f120fa5a9c34b27dcc42f625a5a335990f t/serializer.t +SHA1 0aef35e67e082f1171e76139843c456fd386402d t/simple-eval.t - SHA1 170eb7b90bf252de26da2b7e0d8d70c7e05ff5fd t/simple.t ++SHA1 e782108c4b5da98ceeccc3bf98d6f18eefb02677 t/simple.t +SHA1 6591f04a2f9bb05da997e374716a51bb61f4db58 t/store-memory.t +SHA1 f3a58ff137714519a0244262467b0b4f24c10790 t/store-simple.t +SHA1 a5c4fe05644ed5119e547eae31dc7029eb6f9137 t/store-simpletriple.t - SHA1 fde9fa7a76a0a2f8391b034958e9f4e893771fee t/term-map.t ++SHA1 97328b1837338b888c06b3d6487ecdd2048821db t/term-map.t +SHA1 64046d08a0606fe6cfd11561c31f1a635d4a1dbb t/term.t +SHA1 29a6b780b79d69b06ac37993ce6181d920b2e617 t/treerewrite.t +SHA1 6d4ccea67ee512af8895c8d855c5309fca0e3753 xt/dawg11-memory.t +SHA1 61bf86179ce63f1148d1fb8c7a4c57bee395f7fc xt/pod-coverage.t +SHA1 6387af7a5fde0747be5bc9ad2ec15ca9759bd95a xt/pod.t +-----BEGIN PGP SIGNATURE----- - Version: GnuPG v1 +Comment: GPGTools - http://gpgtools.org + - iEYEARECAAYFAldaI6cACgkQhPK6VMqoyC3eEgCfbqezHpgZlqEA5ph0RX4HjL4h - 8XwAoJ+TdXeRCo5elHC89xLBYCP/WRHv - =LFZ9 ++iEYEARECAAYFAlp3i14ACgkQhPK6VMqoyC1oZACfWMKZv0f5LoiR3PDQrkT21h/B ++XbAAnjffcxmPiWMNLKq71tNbmQf2I4T5 ++=K0OY +-----END PGP SIGNATURE----- diff --cc inc/Module/Install.pm index f44ab4d,0000000..dbe10ca mode 100644,000000..100644 --- a/inc/Module/Install.pm +++ b/inc/Module/Install.pm @@@ -1,474 -1,0 +1,451 @@@ +#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.006; +use strict 'vars'; +use Cwd (); +use File::Find (); +use File::Path (); + +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 = '1.16'; ++ $VERSION = '1.17'; + + # Storage for the pseudo-singleton + $MAIN = undef; + + *inc::Module::Install::VERSION = *VERSION; + @inc::Module::Install::ISA = __PACKAGE__; + +} + +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; + + #------------------------------------------------------------- + # all of the following checks should be included in import(), + # to allow "eval 'require Module::Install; 1' to test + # installation of Module::Install. (RT #51267) + #------------------------------------------------------------- + + # 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 + + # This reportedly fixes a rare Win32 UTC file time issue, but + # as this is a non-cross-platform XS module not in the core, + # we shouldn't really depend on it. See RT #24194 for detail. + # (Also, this module only supports Perl 5.6 and above). + eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; + + # 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)); + + #------------------------------------------------------------- + + unless ( -f $self->{file} ) { + foreach my $key (keys %INC) { + delete $INC{$key} if $key =~ /Module\/Install/; + } + + local $^W; + 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"}; + } + + local $^W; + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; + + # Unregister loader and worker packages so subdirs can use them again + delete $INC{'inc/Module/Install.pm'}; + delete $INC{'Module/Install.pm'}; + + # Save to the singleton + $MAIN = $self; + + return 1; +} + +sub autoload { + my $self = shift; + my $who = $self->_caller; + my $cwd = Cwd::getcwd(); + my $sym = "${who}::AUTOLOAD"; + $sym->{$cwd} = sub { + my $pwd = Cwd::getcwd(); + if ( my $code = $sym->{$pwd} ) { + # Delegate back to parent dirs + goto &$code unless $cwd eq $pwd; + } + unless ($$sym =~ s/([^:]+)$//) { + # XXX: it looks like we can't retrieve the missing function + # via $$sym (usually $main::AUTOLOAD) in this case. + # I'm still wondering if we should slurp Makefile.PL to + # get some context or not ... + my ($package, $file, $line) = caller; + die <<"EOT"; +Unknown function is found at $file line $line. +Execution of $file aborted due to runtime errors. + +If you're a contributor to a project, you may need to install +some Module::Install extensions from CPAN (or other repository). +If you're a user of a module, please contact the author. +EOT + } + 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 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 ) { + local $^W; + *{"${who}::$name"} = sub { + ${"${who}::AUTOLOAD"} = "${who}::$name"; + goto &{"${who}::AUTOLOAD"}; + }; + } +} + +sub new { + my ($class, %args) = @_; + + delete $INC{'FindBin.pm'}; + { + # to suppress the redefine warning + local $SIG{__WARN__} = sub {}; + require FindBin; + } + + # ignore the prefix on extension modules built from top level. + my $base_path = Cwd::abs_path($FindBin::Bin); + unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) { + delete $args{prefix}; + } + return $args{_self} if $args{_self}; + ++ $base_path = VMS::Filespec::unixify($base_path) if $^O eq 'VMS'; ++ + $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) = @_; + + my $should_reload = 0; + unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { + unshift @INC, $self->{prefix}; + $should_reload = 1; + } + + foreach my $rv ( $self->find_extensions($path) ) { + my ($file, $pkg) = @{$rv}; + next if $self->{pathnames}{$pkg}; + + local $@; + my $new = eval { local $^W; require $file; $pkg->can('new') }; + unless ( $new ) { + warn $@ if $@; + next; + } + $self->{pathnames}{$pkg} = + $should_reload ? delete $INC{$file} : $INC{$file}; + push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); + } + + $self->{extensions} ||= []; +} + +sub find_extensions { + my ($self, $path) = @_; + + my @found; - File::Find::find( sub { ++ File::Find::find( {no_chdir => 1, wanted => 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 $content = Module::Install::_read($File::Find::name); + my $in_pod = 0; + foreach ( split /\n/, $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; ++ }}, $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]): $!"; + binmode FH; + my $string = do { local $/; <FH> }; + close FH or die "close($_[0]): $!"; + return $string; +} - END_NEW - sub _read { - local *FH; - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; - binmode FH; - my $string = do { local $/; <FH> }; - 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]): $!"; + binmode FH; + 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]): $!"; - binmode FH; - 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($_[1]) <=> _version($_[2]); +} + +# 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 - 2012 Adam Kennedy. diff --cc inc/Module/Install/Base.pm index 5762a74,0000000..3d89918 mode 100644,000000..100644 --- a/inc/Module/Install/Base.pm +++ b/inc/Module/Install/Base.pm @@@ -1,83 -1,0 +1,83 @@@ +#line 1 +package Module::Install::Base; + +use strict 'vars'; +use vars qw{$VERSION}; +BEGIN { - $VERSION = '1.16'; ++ $VERSION = '1.17'; +} + +# 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->isa('Module::Install::Base::FakeAdmin'); +} + +sub DESTROY {} + +package Module::Install::Base::FakeAdmin; + +use vars qw{$VERSION}; +BEGIN { + $VERSION = $Module::Install::Base::VERSION; +} + +my $fake; + +sub new { + $fake ||= bless(\@_, $_[0]); +} + +sub AUTOLOAD {} + +sub DESTROY {} + +# Restore warning handler +BEGIN { + $SIG{__WARN__} = $SIG{__WARN__}->(); +} + +1; + +#line 159 diff --cc inc/Module/Install/Can.pm index d859276,0000000..fc699b3 mode 100644,000000..100644 --- a/inc/Module/Install/Can.pm +++ b/inc/Module/Install/Can.pm @@@ -1,154 -1,0 +1,163 @@@ +#line 1 +package Module::Install::Can; + +use strict; +use Config (); +use ExtUtils::MakeMaker (); +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { - $VERSION = '1.16'; ++ $VERSION = '1.17'; + @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 ''; + require File::Spec; + my $abs = File::Spec->catfile($dir, $cmd); + return $abs if (-x $abs or $abs = MM->maybe_command($abs)); + } + + return; +} + +# Can our C compiler environment build XS files +sub can_xs { + my $self = shift; + + # Ensure we have the CBuilder module + $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 ); + + # Do we have the configure_requires checker? + local $@; + eval "require ExtUtils::CBuilder;"; + if ( $@ ) { + # They don't obey configure_requires, so it is + # someone old and delicate. Try to avoid hurting + # them by falling back to an older simpler test. + return $self->can_cc(); + } + + # Do we have a working C compiler + my $builder = ExtUtils::CBuilder->new( + quiet => 1, + ); + unless ( $builder->have_compiler ) { + # No working C compiler + return 0; + } + + # Write a C file representative of what XS becomes + require File::Temp; + my ( $FH, $tmpfile ) = File::Temp::tempfile( + "compilexs-XXXXX", + SUFFIX => '.c', + ); + binmode $FH; + print $FH <<'END_C'; +#include "EXTERN.h" +#include "perl.h" +#include "XSUB.h" + +int main(int argc, char **argv) { + return 0; +} + +int boot_sanexs() { + return 1; +} + +END_C + close $FH; + + # Can the C compiler access the same headers XS does + my @libs = (); + my $object = undef; + eval { + local $^W = 0; + $object = $builder->compile( + source => $tmpfile, + ); + @libs = $builder->link( + objects => $object, + module_name => 'sanexs', + ); + }; + my $result = $@ ? 0 : 1; + + # Clean up all the build files + foreach ( $tmpfile, $object, @libs ) { + next unless defined $_; + 1 while unlink; + } + + return $result; +} + +# Can we locate a (the) C compiler +sub can_cc { + my $self = shift; ++ ++ if ($^O eq 'VMS') { ++ require ExtUtils::CBuilder; ++ my $builder = ExtUtils::CBuilder->new( ++ quiet => 1, ++ ); ++ return $builder->have_compiler; ++ } ++ + 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 236 ++#line 245 diff --cc inc/Module/Install/Fetch.pm index 41d3517,0000000..3ee0aa1 mode 100644,000000..100644 --- a/inc/Module/Install/Fetch.pm +++ b/inc/Module/Install/Fetch.pm @@@ -1,93 -1,0 +1,93 @@@ +#line 1 +package Module::Install::Fetch; + +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { - $VERSION = '1.16'; ++ $VERSION = '1.17'; + @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", 'anonym...@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 --cc inc/Module/Install/Makefile.pm index e9918d2,0000000..bc81e06 mode 100644,000000..100644 --- a/inc/Module/Install/Makefile.pm +++ b/inc/Module/Install/Makefile.pm @@@ -1,418 -1,0 +1,418 @@@ +#line 1 +package Module::Install::Makefile; + +use strict 'vars'; +use ExtUtils::MakeMaker (); +use Module::Install::Base (); +use Fcntl qw/:flock :seek/; + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { - $VERSION = '1.16'; ++ $VERSION = '1.17'; + @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 or non-interactive session, always use defaults + if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) 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 +} + +# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified +# as we only need to know here whether the attribute is an array +# or a hash or something else (which may or may not be appendable). +my %makemaker_argtype = ( + C => 'ARRAY', + CONFIG => 'ARRAY', +# CONFIGURE => 'CODE', # ignore + DIR => 'ARRAY', + DL_FUNCS => 'HASH', + DL_VARS => 'ARRAY', + EXCLUDE_EXT => 'ARRAY', + EXE_FILES => 'ARRAY', + FUNCLIST => 'ARRAY', + H => 'ARRAY', + IMPORTS => 'HASH', + INCLUDE_EXT => 'ARRAY', + LIBS => 'ARRAY', # ignore '' + MAN1PODS => 'HASH', + MAN3PODS => 'HASH', + META_ADD => 'HASH', + META_MERGE => 'HASH', + PL_FILES => 'HASH', + PM => 'HASH', + PMLIBDIRS => 'ARRAY', + PMLIBPARENTDIRS => 'ARRAY', + PREREQ_PM => 'HASH', + CONFIGURE_REQUIRES => 'HASH', + SKIP => 'ARRAY', + TYPEMAPS => 'ARRAY', + XS => 'HASH', +# VERSION => ['version',''], # ignore +# _KEEP_AFTER_FLUSH => '', + + clean => 'HASH', + depend => 'HASH', + dist => 'HASH', + dynamic_lib=> 'HASH', + linkext => 'HASH', + macro => 'HASH', + postamble => 'HASH', + realclean => 'HASH', + test => 'HASH', + tool_autosplit => 'HASH', + + # special cases where you can use makemaker_append + CCFLAGS => 'APPENDABLE', + DEFINE => 'APPENDABLE', + INC => 'APPENDABLE', + LDDLFLAGS => 'APPENDABLE', + LDFROM => 'APPENDABLE', +); + +sub makemaker_args { + my ($self, %new_args) = @_; + my $args = ( $self->{makemaker_args} ||= {} ); + foreach my $key (keys %new_args) { + if ($makemaker_argtype{$key}) { + if ($makemaker_argtype{$key} eq 'ARRAY') { + $args->{$key} = [] unless defined $args->{$key}; + unless (ref $args->{$key} eq 'ARRAY') { + $args->{$key} = [$args->{$key}] + } + push @{$args->{$key}}, + ref $new_args{$key} eq 'ARRAY' + ? @{$new_args{$key}} + : $new_args{$key}; + } + elsif ($makemaker_argtype{$key} eq 'HASH') { + $args->{$key} = {} unless defined $args->{$key}; + foreach my $skey (keys %{ $new_args{$key} }) { + $args->{$key}{$skey} = $new_args{$key}{$skey}; + } + } + elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { + $self->makemaker_append($key => $new_args{$key}); + } + } + else { + if (defined $args->{$key}) { + warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; + } + $args->{$key} = $new_args{$key}; + } + } + return $args; +} + +# For mm args that take multiple space-separated 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 ); +} + +sub _wanted_t { +} + +sub tests_recursive { + my $self = shift; + my $dir = shift || 't'; + unless ( -d $dir ) { + die "tests_recursive dir '$dir' does not exist"; + } + my %tests = map { $_ => 1 } split / /, ($self->tests || ''); + require File::Find; + File::Find::find( + sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, + $dir + ); + $self->tests( join ' ', sort keys %tests ); +} + +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 ) { + # This previous attempted to inherit the version of + # ExtUtils::MakeMaker in use by the module author, but this + # was found to be untenable as some authors build releases + # using future dev versions of EU:MM that nobody else has. + # Instead, #toolchain suggests we use 6.59 which is the most + # stable version on CPAN at time of writing and is, to quote + # ribasushi, "not terminally fucked, > and tested enough". + # TODO: We will now need to maintain this over time to push + # the version up as new versions are released. + $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 ); + } 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.36 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); + } + + # Generate the MakeMaker params + my $args = $self->makemaker_args; + $args->{DISTNAME} = $self->name; + $args->{NAME} = $self->module_name || $self->name; + $args->{NAME} =~ s/-/::/g; + $args->{VERSION} = $self->version or die <<'EOT'; +ERROR: Can't determine distribution version. Please specify it +explicitly via 'version' in Makefile.PL, or set a valid $VERSION +in a module, and provide its file path via 'version_from' (or +'all_from' if you prefer) in Makefile.PL. +EOT + + if ( $self->tests ) { + my @tests = split ' ', $self->tests; + my %seen; + $args->{test} = { + TESTS => (join ' ', grep {!$seen{$_}++} @tests), + }; + } elsif ( $Module::Install::ExtraTests::use_extratests ) { + # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. + # So, just ignore our xt tests here. + } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { + $args->{test} = { + TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), + }; + } + if ( $] >= 5.005 ) { + $args->{ABSTRACT} = $self->abstract; + $args->{AUTHOR} = join ', ', @{$self->author || []}; + } + if ( $self->makemaker(6.10) ) { + $args->{NO_META} = 1; + #$args->{NO_MYMETA} = 1; + } + if ( $self->makemaker(6.17) and $self->sign ) { + $args->{SIGN} = 1; + } + unless ( $self->is_admin ) { + delete $args->{SIGN}; + } + if ( $self->makemaker(6.31) and $self->license ) { + $args->{LICENSE} = $self->license; + } + + 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, add it to Makefile DIR + my $subdirs = ($args->{DIR} || []); + if ($self->bundles) { + my %processed; + foreach my $bundle (@{ $self->bundles }) { + my ($mod_name, $dist_dir) = @$bundle; + delete $prereq->{$mod_name}; + $dist_dir = File::Basename::basename($dist_dir); # dir for building this module + if (not exists $processed{$dist_dir}) { + if (-d $dist_dir) { + # List as sub-directory to be processed by make + push @$subdirs, $dist_dir; + } + # Else do nothing: the module is already present on the system + $processed{$dist_dir} = undef; + } + } + } + + 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; + } + } + + if ($self->installdirs) { + warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; + $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: $!"; + eval { flock MAKEFILE, LOCK_EX }; + my $makefile = do { local $/; <MAKEFILE> }; + + $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; + + seek MAKEFILE, 0, SEEK_SET; + truncate MAKEFILE, 0; + 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 544 diff --cc inc/Module/Install/Metadata.pm index 9792685,0000000..29934cf mode 100644,000000..100644 --- a/inc/Module/Install/Metadata.pm +++ b/inc/Module/Install/Metadata.pm @@@ -1,722 -1,0 +1,722 @@@ +#line 1 +package Module::Install::Metadata; + +use strict 'vars'; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { - $VERSION = '1.16'; ++ $VERSION = '1.17'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +my @boolean_keys = qw{ + sign +}; + +my @scalar_keys = qw{ + name + module_name + abstract + 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 + author +}; + +*authors = \&author; + +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; + my $value = @_ ? shift : 1; + if ( $self->{values}->{dynamic_config} ) { + # Once dynamic we never change to static, for safety + return 0; + } + $self->{values}->{dynamic_config} = $value ? 1 : 0; + return 1; +} + +# Convenience command +sub static_config { + shift->dynamic_config(0); +} + +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 really old versions + unless ( $version >= 5.005 ) { + die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; + } + + $self->{values}->{perl_version} = $version; +} + +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) ); + + # for version integrity check + $self->makemaker_args( VERSION_FROM => $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; + + # XXX: ugly but should work anyway... + if (eval "require Pod::Escapes; 1") { + # Pod::Escapes has a mapping table. + # It's in core of perl >= 5.9.3, and should be installed + # as one of the Pod::Simple's prereqs, which is a prereq + # of Pod::Text 3.x (see also below). + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $Pod::Escapes::Name2character_number{$1} + ? chr($Pod::Escapes::Name2character_number{$1}) + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { + # Pod::Text < 3.0 has yet another mapping table, + # though the table name of 2.x and 1.x are different. + # (1.x is in core of Perl < 5.6, 2.x is in core of + # Perl < 5.9.3) + my $mapping = ($Pod::Text::VERSION < 2) + ? \%Pod::Text::HTML_Escapes + : \%Pod::Text::ESCAPES; + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $mapping->{$1} + ? $mapping->{$1} + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + else { + $author =~ s{E<lt>}{<}g; + $author =~ s{E<gt>}{>}g; + } + $self->author($author); + } else { + warn "Cannot determine author info from $_[0]\n"; + } +} + +#Stolen from M::B +my %license_urls = ( + perl => 'http://dev.perl.org/licenses/', + apache => 'http://apache.org/licenses/LICENSE-2.0', + apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', + 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()' + ); + $license = __extract_license($license) || lc $license; + $self->{values}->{license} = $license; + + # Automatically fill in license URLs + if ( $license_urls{$license} ) { + $self->resources( license => $license_urls{$license} ); + } + + return 1; +} + +sub _extract_license { + my $pod = shift; + my $matched; + return __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) + (=head \d.*|=cut.*|)\z + /xms + ) || __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) + (=head \d.*|=cut.*|)\z + /xms + ); +} + +sub __extract_license { + my $license_text = shift or return; + my @phrases = ( + '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, + '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, + 'Artistic and GPL' => '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, + 'GNU Free Documentation license' => 'unrestricted', 1, + 'GNU Affero General Public License' => 'open_source', 1, + '(?:Free)?BSD license' => 'bsd', 1, + 'Artistic license 2\.0' => 'artistic_2', 1, + 'Artistic license' => 'artistic', 1, + 'Apache (?:Software )?license' => 'apache', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'Mozilla Public License' => 'mozilla', 1, + 'Q Public License' => 'open_source', 1, + 'OpenSSL License' => 'unrestricted', 1, + 'SSLeay License' => 'unrestricted', 1, + 'zlib License' => 'open_source', 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; + } + } + 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<( + https?\Q://rt.cpan.org/\E[^>]+| + https?\Q://github.com/\E[\w_]+/[\w_]+/issues| + https?\Q://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+(v?[\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; +} + +sub add_metadata { + my $self = shift; + my %hash = @_; + for my $key (keys %hash) { + warn "add_metadata: $key is not prefixed with 'x_'.\n" . + "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; + $self->{values}->{$key} = $hash{$key}; + } +} + + +###################################################################### +# 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 hashes + 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 --cc inc/Module/Install/Scripts.pm index 333d49b,0000000..c0da810 mode 100644,000000..100644 --- a/inc/Module/Install/Scripts.pm +++ b/inc/Module/Install/Scripts.pm @@@ -1,29 -1,0 +1,29 @@@ +#line 1 +package Module::Install::Scripts; + +use strict 'vars'; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { - $VERSION = '1.16'; ++ $VERSION = '1.17'; + @ISA = 'Module::Install::Base'; + $ISCORE = 1; +} + +sub install_script { + my $self = shift; + my $args = $self->makemaker_args; + my $exe = $args->{EXE_FILES} ||= []; + foreach ( @_ ) { + if ( -f $_ ) { + push @$exe, $_; + } elsif ( -d 'script' and -f "script/$_" ) { + push @$exe, "script/$_"; + } else { + die("Cannot find script '$_'"); + } + } +} + +1; diff --cc inc/Module/Install/Win32.pm index 218a66b,0000000..dba25f9 mode 100644,000000..100644 --- a/inc/Module/Install/Win32.pm +++ b/inc/Module/Install/Win32.pm @@@ -1,64 -1,0 +1,64 @@@ +#line 1 +package Module::Install::Win32; + +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { - $VERSION = '1.16'; ++ $VERSION = '1.17'; + @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 --cc inc/Module/Install/WriteAll.pm index 530749b,0000000..d553bd7 mode 100644,000000..100644 --- a/inc/Module/Install/WriteAll.pm +++ b/inc/Module/Install/WriteAll.pm @@@ -1,63 -1,0 +1,63 @@@ +#line 1 +package Module::Install::WriteAll; + +use strict; +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { - $VERSION = '1.16'; ++ $VERSION = '1.17'; + @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} ) { + # XXX: This still may be a bit over-defensive... + unless ($self->makemaker(6.25)) { + $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; + } + } + + # 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; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libattean-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits