This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libfile-touch-perl.
commit 902a37a2f3370909cd5a5f53dbc6e21d804d54d8 Author: gregor herrmann <gre...@debian.org> Date: Mon May 12 20:06:06 2014 +0200 Imported Upstream version 0.09 --- Changes | 49 ++++-- LICENSE | 379 ++++++++++++++++++++++++++++++++++++++++++ MANIFEST | 13 +- META.yml | 44 +++-- Makefile.PL | 71 +++++++- README | 15 ++ dist.ini | 12 ++ Touch.pm => lib/File/Touch.pm | 138 ++++++++------- t/01-require.t | 8 + t/02-basic-usage.t | 77 +++++++++ test.pl | 20 --- 11 files changed, 702 insertions(+), 124 deletions(-) diff --git a/Changes b/Changes index 56662b8..81c62a3 100644 --- a/Changes +++ b/Changes @@ -1,15 +1,38 @@ -Revision history for Perl extension File::Touch. - -0.07 Sat Jul 25 12:54 2009 - - BUGFIX last fix caused probs (thanks Reini Urban) - see https://rt.cpan.org/Ticket/Display.html?id=48183 -0.06 Tue Mar 24 11:22:13 2009 - - now works on systems lacking O_NONBLOCK - (thanks Ronald Fischer) - - BUG: no longer works adds O_NOCTTY with terminal devices -0.02 Thu Jun 1 08:48:56 2007 - - fixed bareword filehandle (thanks Tolga Ceylan) - - I changed my name -0.01 Thu Jul 5 09:35:24 2001 +Revision history for Perl module File::Touch + +0.09 2014-05-07 + - Added documention for the "time => $time" argument. RT#63233 + - Restructured dist with lib/ and t/ directories + - Added basic testsuite that tests core functionality + - Min perl version 5.6.0 + +0.08_01 2014-05-04 + - Reformatted this file according to CPAN::Changes::Spec + - Moved Touch.pm into lib/File/Touch.pm and created t/ with 01-require.t + - Added a basic proper testsuite, that tests the core functionality + - Specified min perl version 5.6.0 + - Switched to Dist::Zilla + - Got rid of tab characters + +0.08 2009-07-25 + - Don't die if trying to use O_NONBLOCK fails. + - Set O_NOCTTY if the local OS supports it. + (If O_NOCTTY is set and path identifies a terminal device, + open() shall not cause the terminal device to become the controlling + terminal for the process). + +0.07 2009-07-25 + - BUGFIX last fix caused probs (thanks Reini Urban) + see https://rt.cpan.org/Ticket/Display.html?id=48183 + +0.06 2009-03-24 + - now works on systems lacking O_NONBLOCK (thanks Ronald Fischer) + - BUG: no longer works adds O_NOCTTY with terminal devices + +0.02 2007-06-01 + - fixed bareword filehandle (thanks Tolga Ceylan) + - I changed my name + +0.01 2001-07-05 - original version; created by Nigel Wetters diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7710881 --- /dev/null +++ b/LICENSE @@ -0,0 +1,379 @@ +This software is copyright (c) 2001 by Neil Bowers. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +Terms of the Perl programming language system itself + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" + +--- The GNU General Public License, Version 1, February 1989 --- + +This software is Copyright (c) 2001 by Neil Bowers. + +This is free software, licensed under: + + The GNU General Public License, Version 1, February 1989 + + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The license agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. The +General Public License applies to the Free Software Foundation's +software and to any other program whose authors commit to using it. +You can use it for your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public License is designed to make +sure that you have the freedom to give away or sell copies of free +software, that you receive source code or can get it if you want it, +that you can change the software or use pieces of it in new free +programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of a such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any program or other work which +contains a notice placed by the copyright holder saying it may be +distributed under the terms of this General Public License. The +"Program", below, refers to any such program or work, and a "work based +on the Program" means either the Program or any work containing the +Program or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this +General Public License and to the absence of any warranty; and give any +other recipients of the Program a copy of this General Public License +along with the Program. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Program or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Program or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public License (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual way, to print or display an + announcement including an appropriate copyright notice and a notice + that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program under these + conditions, and telling the user how to view a copy of this General + Public License. + + d) You may charge a fee for the physical act of transferring a + copy, and you may at your option offer warranty protection in + exchange for a fee. + +Mere aggregation of another independent work with the Program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Program except as expressly provided under this General Public License. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Program is void, and will automatically terminate your rights to use +the Program under this License. However, parties who have received +copies, or rights to use copies, from you under this General Public +License will not have their licenses terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying the Program (or any work based +on the Program) you indicate your acceptance of this license to do so, +and all its terms and conditions. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these +terms and conditions. You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. + + 7. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of the license which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +the license, you may choose any version ever published by the Free Software +Foundation. + + 8. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to humanity, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! + + +--- The Artistic License 1.0 --- + +This software is Copyright (c) 2001 by Neil Bowers. + +This is free software, licensed under: + + The Artistic License 1.0 + +The Artistic License + +Preamble + +The intent of this document is to state the conditions under which a Package +may be copied, such that the Copyright Holder maintains some semblance of +artistic control over the development of the package, while giving the users of +the package the right to use and distribute the Package in a more-or-less +customary fashion, plus the right to make reasonable modifications. + +Definitions: + + - "Package" refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created through + textual modification. + - "Standard Version" refers to such a Package if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder. + - "Copyright Holder" is whoever is named in the copyright or copyrights for + the package. + - "You" is you, if you're thinking about copying or distributing this Package. + - "Reasonable copying fee" is whatever you can justify on the basis of media + cost, duplication charges, time of people involved, and so on. (You will + not be required to justify it to the Copyright Holder, but only to the + computing community at large as a market that must bear the fee.) + - "Freely Available" means that no fee is charged for the item itself, though + there may be fees involved in handling the item. It also means that + recipients of the item may redistribute it under the same conditions they + received it. + +1. You may make and give away verbatim copies of the source form of the +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes and other modifications derived +from the Public Domain or from the Copyright Holder. A Package modified in such +a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided that +you insert a prominent notice in each changed file stating how and when you +changed that file, and provided that you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided, and provide a separate + manual page for each non-standard executable that clearly documents how it + differs from the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or executable +form, provided that you do at least ONE of the following: + + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where to + get the Standard Version. + + b) accompany the distribution with the machine-readable source of the Package + with your modifications. + + c) accompany any non-standard executables with their corresponding Standard + Version executables, giving the non-standard executables non-standard + names, and clearly documenting the differences in manual pages (or + equivalent), together with instructions on where to get the Standard + Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this Package. You +may not charge a fee for this Package itself. However, you may distribute this +Package in aggregate with other (possibly commercial) programs as part of a +larger (possibly commercial) software distribution provided that you do not +advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as output +from the programs of this Package do not automatically fall under the copyright +of this Package, but belong to whomever generated them, and may be sold +commercially, and may be aggregated with this Package. + +7. C or perl subroutines supplied by you and linked into this Package shall not +be considered part of this Package. + +8. The name of the Copyright Holder may not be used to endorse or promote +products derived from this software without specific prior written permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +The End + diff --git a/MANIFEST b/MANIFEST index 570f1ee..8e3ace0 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,6 +1,11 @@ +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.016. Changes -Makefile.PL +LICENSE MANIFEST -test.pl -Touch.pm -META.yml Module meta-data (added by MakeMaker) +META.yml +Makefile.PL +README +dist.ini +lib/File/Touch.pm +t/01-require.t +t/02-basic-usage.t diff --git a/META.yml b/META.yml index b2acb94..11a08ea 100644 --- a/META.yml +++ b/META.yml @@ -1,20 +1,28 @@ ---- #YAML:1.0 -name: File-Touch -version: 0.08 -abstract: ~ -author: [] -license: unknown -distribution_type: module -configure_requires: - ExtUtils::MakeMaker: 0 +--- +abstract: 'update file access and modification times, optionally creating files if needed' +author: + - 'Nigel Wetters Gourlay <nwett...@cpan.org>' build_requires: - ExtUtils::MakeMaker: 0 -requires: {} -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.50 + Test::More: '0.88' +configure_requires: + ExtUtils::MakeMaker: '6.30' +dynamic_config: 0 +generated_by: 'Dist::Zilla version 5.016, CPAN::Meta::Converter version 2.133380' +license: perl meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: File-Touch +requires: + Carp: '0' + Exporter: '0' + Fcntl: '0' + File::stat: '0' + IO::File: '0' + perl: '5.006' + strict: '0' + warnings: '0' +resources: + homepage: https://github.com/neilbowers/File-Touch + repository: https://github.com/neilbowers/File-Touch.git +version: '0.09' diff --git a/Makefile.PL b/Makefile.PL index 422ae39..a41a041 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,7 +1,66 @@ -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile that is written. -WriteMakefile( - 'NAME' => 'File::Touch', - 'VERSION_FROM' => 'Touch.pm', # finds $VERSION + +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.016. +use strict; +use warnings; + +use 5.006; + +use ExtUtils::MakeMaker 6.30; + + + +my %WriteMakefileArgs = ( + "ABSTRACT" => "update file access and modification times, optionally creating files if needed", + "AUTHOR" => "Nigel Wetters Gourlay <nwetters\@cpan.org>", + "BUILD_REQUIRES" => {}, + "CONFIGURE_REQUIRES" => { + "ExtUtils::MakeMaker" => "6.30" + }, + "DISTNAME" => "File-Touch", + "EXE_FILES" => [], + "LICENSE" => "perl", + "NAME" => "File::Touch", + "PREREQ_PM" => { + "Carp" => 0, + "Exporter" => 0, + "Fcntl" => 0, + "File::stat" => 0, + "IO::File" => 0, + "strict" => 0, + "warnings" => 0 + }, + "TEST_REQUIRES" => { + "Test::More" => "0.88" + }, + "VERSION" => "0.09", + "test" => { + "TESTS" => "t/*.t" + } ); + + +my %FallbackPrereqs = ( + "Carp" => 0, + "Exporter" => 0, + "Fcntl" => 0, + "File::stat" => 0, + "IO::File" => 0, + "Test::More" => "0.88", + "strict" => 0, + "warnings" => 0 +); + + +unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { + delete $WriteMakefileArgs{TEST_REQUIRES}; + delete $WriteMakefileArgs{BUILD_REQUIRES}; + $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs; +} + +delete $WriteMakefileArgs{CONFIGURE_REQUIRES} + unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; + +WriteMakefile(%WriteMakefileArgs); + + + diff --git a/README b/README new file mode 100644 index 0000000..711c792 --- /dev/null +++ b/README @@ -0,0 +1,15 @@ + + +This archive contains the distribution File-Touch, +version 0.09: + + update file access and modification times, optionally creating files if needed + +This software is copyright (c) 2001 by Neil Bowers. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + + +This README file was generated by Dist::Zilla::Plugin::Readme v5.016. + diff --git a/dist.ini b/dist.ini new file mode 100644 index 0000000..8e06566 --- /dev/null +++ b/dist.ini @@ -0,0 +1,12 @@ +name = File-Touch +author = Nigel Wetters Gourlay <nwett...@cpan.org> +license = Perl_5 +copyright_holder = Neil Bowers +copyright_year = 2001 + +version = 0.09 + +[@Basic] +[PkgVersion] +[AutoPrereqs] +[GithubMeta] diff --git a/Touch.pm b/lib/File/Touch.pm similarity index 58% rename from Touch.pm rename to lib/File/Touch.pm index d376780..b1639d4 100644 --- a/Touch.pm +++ b/lib/File/Touch.pm @@ -1,12 +1,13 @@ package File::Touch; - -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(touch); -$VERSION = "0.08"; +$File::Touch::VERSION = '0.09'; +use 5.006; use warnings; use strict; +require Exporter; +our @ISA = qw(Exporter); +our @EXPORT = qw(touch); + use Carp; use IO::File; use File::stat; @@ -44,28 +45,30 @@ sub new my $mtime = $arg{mtime}; # If defined, use this time for modification time instead of current time. if ($atime_only && $mtime_only){ - croak("Incorrect usage: 'atime_only' and 'mtime_only' are both set - they are mutually exclusive."); + croak("Incorrect usage: 'atime_only' and 'mtime_only' are both set - they are mutually exclusive."); } - if (defined $time){ - if ((defined $atime) || (defined $mtime)){ - croak("Incorrect usage: 'time' should not be used with either 'atime' or 'mtime' - ambiguous."); - } - $atime = $time unless $mtime_only; - $mtime = $time unless $atime_only; + if (defined $time) { + if ((defined $atime) || (defined $mtime)) { + croak("Incorrect usage: 'time' should not be used with either ", + "'atime' or 'mtime' - ambiguous."); + } + $atime = $time unless $mtime_only; + $mtime = $time unless $atime_only; } - if (defined $reference){ - if ((defined $time) || (defined $atime) || (defined $mtime)){ - croak("Incorrect usage: 'reference' should not be used with 'time', 'atime' or 'mtime' - ambiguous."); - } - if (-e $reference){ - my $sb = stat($reference) or croak("Could not stat ($reference): $!"); - $atime = $sb->atime unless $mtime_only; - $mtime = $sb->mtime unless $atime_only; - } else { - croak("Reference file ($reference) does not exist"); - } + if (defined $reference) { + if ((defined $time) || (defined $atime) || (defined $mtime)) { + croak("Incorrect usage: 'reference' should not be used with 'time', 'atime' or 'mtime' - ambiguous."); + } + if (-e $reference) { + my $sb = stat($reference) or croak("Could not stat ($reference): $!"); + $atime = $sb->atime unless $mtime_only; + $mtime = $sb->mtime unless $atime_only; + } + else { + croak("Reference file ($reference) does not exist"); + } } $self->{_atime} = $atime; @@ -84,55 +87,58 @@ sub touch my $self; if ($caller_is_obj){ - $self = $caller; - } else { - unshift @files, $caller; - $self->{_atime} = undef; - $self->{_mtime} = undef; - $self->{_no_create} = 0; - $self->{_atime_only} = 0; - $self->{_mtime_only} = 0; + $self = $caller; + } + else { + unshift @files, $caller; + $self->{_atime} = undef; + $self->{_mtime} = undef; + $self->{_no_create} = 0; + $self->{_atime_only} = 0; + $self->{_mtime_only} = 0; } my $count = 0; - foreach my $file (@files){ - my $time = time(); - my ($atime,$mtime); - - if (-e $file){ - my $sb = stat($file) or croak("Could not stat ($file): $!"); - $atime = $sb->atime; - $mtime = $sb->mtime; - } else { - unless ($self->{_no_create}){ - sysopen my $fh,$file,$SYSOPEN_MODE or croak("Can't create $file : $!"); - close $fh or croak("Can't close $file : $!"); - $atime = $time; - $mtime = $time; - } - } - unless ($self->{_mtime_only}){ - $atime = $time; - $atime = $self->{_atime} if (defined $self->{_atime}); - } - unless ($self->{_atime_only}){ - $mtime = $time; - $mtime = $self->{_mtime} if (defined $self->{_mtime}); - } - if (utime($atime,$mtime,$file)){ - $count++; - } + foreach my $file (@files) { + my $time = time(); + my ($atime,$mtime); + + if (-e $file) { + my $sb = stat($file) or croak("Could not stat ($file): $!"); + $atime = $sb->atime; + $mtime = $sb->mtime; + } + else { + unless ($self->{_no_create}) { + sysopen my $fh,$file,$SYSOPEN_MODE or croak("Can't create $file : $!"); + close $fh or croak("Can't close $file : $!"); + $atime = $time; + $mtime = $time; + } + } + unless ($self->{_mtime_only}) { + $atime = $time; + $atime = $self->{_atime} if (defined $self->{_atime}); + } + unless ($self->{_atime_only}) { + $mtime = $time; + $mtime = $self->{_mtime} if (defined $self->{_mtime}); + } + if (utime($atime,$mtime,$file)) { + $count++; + } } return $count; } + 1; __END__ =head1 NAME -File::Touch - update access and modification timestamps, creating nonexistent files where necessary. +File::Touch - update file access and modification times, optionally creating files if needed =head1 SYNOPSIS @@ -143,11 +149,11 @@ File::Touch - update access and modification timestamps, creating nonexistent fi use File::Touch; $reference_file = '/etc/passwd'; $touch_obj = File::Touch->new( - reference => $reference_file, - no_create => 1 - ); + reference => $reference_file, + no_create => 1 + ); @file_list = ('one.txt','../two.doc'); - $count = $touch_obj->touch(@file_list); + $count = $touch_obj->touch(@file_list); =head1 DESCRIPTION @@ -171,6 +177,12 @@ If nonzero, do not create new files. Default is zero. If defined, use timestamps from this file instead of current time. Default is undefined. +=item time => $time + +If defined, then this value will be used for both access time and modification time, +whichever of those are set. This time is overridden by the C<atime> and C<mtime> arguments, +if you use them. + =item atime => $time If defined, use this time (in epoch seconds) instead of current time for access time. diff --git a/t/01-require.t b/t/01-require.t new file mode 100644 index 0000000..f500cfc --- /dev/null +++ b/t/01-require.t @@ -0,0 +1,8 @@ +#!perl + +use strict; +use warnings; + +use Test::More 0.88 tests => 1; + +require_ok('File::Touch'); diff --git a/t/02-basic-usage.t b/t/02-basic-usage.t new file mode 100644 index 0000000..62ab18a --- /dev/null +++ b/t/02-basic-usage.t @@ -0,0 +1,77 @@ +#! perl + +use strict; +use warnings; + +use Test::More 0.88 tests => 18; +use File::Touch; + +my $testfilename = 't/example-file.txt'; +my $new_atime = 1399242863; +my $new_mtime = 1399156463; + +if (-f $testfilename) { + unlink($testfilename) + || BAIL_OUT("test file ($testfilename) already exists and I can't delete it: $!"); +} + +foreach my $set_atime ( 0 .. 1 ) { + foreach my $set_mtime ( 0 .. 1 ) { + next unless $set_mtime || $set_atime; + + my %args; + my $toucher; + + open(my $fh, '>', $testfilename) + || BAIL_OUT("can't create test file [set_atime=$set_atime set_mtime=$set_mtime]"); + print $fh "set_atime=$set_atime set_mtime=$set_mtime\n"; + close($fh); + + my ($original_atime, $original_mtime) = (stat($testfilename))[8,9]; + + ok($original_atime > $new_atime && $original_mtime > $new_mtime, + "atime & mtime on the new file should be in the future compared to when I wrote this test"); + + if ($set_mtime) { + $args{mtime} = $new_mtime; + } + else { + $args{atime_only} = 1; + } + + if ($set_atime) { + $args{atime} = $new_atime; + } + else { + $args{mtime_only} = 1; + } + + $toucher = File::Touch->new(%args); + ok(defined($toucher), "We should get an instance of File::Touch"); + + ok($toucher->touch($testfilename) == 1, "touch() should say that it updated 1 file"); + + my ($updated_atime, $updated_mtime) = (stat($testfilename))[8,9]; + + if ($set_mtime) { + ok($updated_mtime == $new_mtime, + "stat() should return a changed mtime"); + } + else { + ok($updated_mtime == $original_mtime, + "stat() should return the same mtime as when the file was created"); + } + + if ($set_atime) { + ok($updated_atime == $new_atime, + "stat() should return a changed atime"); + } + else { + ok($updated_atime == $original_atime, + "stat() should return the same atime as when the file was created"); + } + + ok(unlink($testfilename), "delete the file after running the test"); + + } +} diff --git a/test.pl b/test.pl deleted file mode 100644 index 6a2b1e8..0000000 --- a/test.pl +++ /dev/null @@ -1,20 +0,0 @@ -# Before `make install' is performed this script should be runnable with -# `make test'. After `make install' it should work as `perl test.pl' - -######################### We start with some black magic to print on failure. - -# Change 1..1 below to 1..last_test_to_print . -# (It may become useful if the test is moved to ./t subdirectory.) - -BEGIN { $| = 1; print "1..1\n"; } -END {print "not ok 1\n" unless $loaded;} -use File::Touch; -$loaded = 1; -print "ok 1\n"; - -######################### End of black magic. - -# Insert your test code below (better if it prints "ok 13" -# (correspondingly "not ok 13") depending on the success of chunk 13 -# of the test code): - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfile-touch-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