diff --git a/COPYING b/COPYING deleted file mode 100644 --- a/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU 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. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), 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 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 show them these terms so they know 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. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - 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 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 derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 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 License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary 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 - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 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 Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing 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 for copying, distributing or modifying -the Program or works based on it. - - 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. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. 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 this 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 -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. 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 - - 11. 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. - - 12. 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 - - 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 the public, 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. - - - Copyright (C) - - 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 2 of the License, 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 St, 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) year 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 is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/Codec/Archive/Zip.hs b/Codec/Archive/Zip.hs --- a/Codec/Archive/Zip.hs +++ b/Codec/Archive/Zip.hs @@ -3,7 +3,7 @@ -- | -- Module : Codec.Archive.Zip -- Copyright : John MacFarlane --- License : GPL 2 (see LICENSE) +-- License : BSD3 -- -- Maintainer : John MacFarlane < jgm at berkeley dot edu > -- Stability : unstable @@ -55,6 +55,10 @@ ) where import System.Time ( toUTCTime, addToClockTime, CalendarTime (..), ClockTime (..), TimeDiff (..) ) +#if MIN_VERSION_directory(1,2,0) +import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds ) +#else +#endif import Data.Bits ( shiftL, shiftR, (.&.) ) import Data.Binary import Data.Binary.Get @@ -199,7 +203,12 @@ contents <- if isDir then return B.empty else B.readFile path +#if MIN_VERSION_directory(1,2,0) + modEpochTime <- liftM (floor . utcTimeToPOSIXSeconds) + $ getModificationTime path +#else (TOD modEpochTime _) <- getModificationTime path +#endif let entry = toEntry path' modEpochTime contents when (OptVerbose `elem` opts) $ do let compmethod = case eCompressionMethod entry of diff --git a/Tests.hs b/Tests.hs deleted file mode 100644 --- a/Tests.hs +++ /dev/null @@ -1,92 +0,0 @@ --- Test suite for Codec.Archive.Zip --- runghc Test.hs - -import Codec.Archive.Zip -import System.Directory -import Test.HUnit.Base -import Test.HUnit.Text -import System.Time -import System.Process -import qualified Data.ByteString.Lazy as B -import Control.Applicative - --- define equality for Archives so timestamps aren't distinguished if they --- correspond to the same MSDOS datetime. -instance Eq Archive where - (==) a1 a2 = zSignature a1 == zSignature a2 - && zComment a1 == zComment a2 - && (all id $ zipWith (\x y -> x { eLastModified = eLastModified x `div` 2 } == - y { eLastModified = eLastModified y `div` 2 }) (zEntries a1) (zEntries a2)) - -main :: IO Counts -main = do - createDirectory "test-temp" - counts <- runTestTT $ TestList [ - testReadWriteArchive - , testReadExternalZip - , testFromToArchive - , testReadWriteEntry - , testAddFilesOptions - , testDeleteEntries - , testExtractFiles - ] - removeDirectoryRecursive "test-temp" - return counts - -testReadWriteArchive = TestCase $ do - archive <- addFilesToArchive [OptRecursive] emptyArchive ["LICENSE", "Codec"] - B.writeFile "test-temp/test1.zip" $ fromArchive archive - archive' <- toArchive <$> B.readFile "test-temp/test1.zip" - assertEqual "for writing and reading test1.zip" archive archive' - assertEqual "for writing and reading test1.zip" archive archive' - -testReadExternalZip = TestCase $ do - runCommand "/usr/bin/zip -q -9 test-temp/test4.zip zip-archive.cabal Codec/Archive/Zip.hs" >>= waitForProcess - archive <- toArchive <$> B.readFile "test-temp/test4.zip" - let files = filesInArchive archive - assertEqual "for results of filesInArchive" ["zip-archive.cabal", "Codec/Archive/Zip.hs"] files - cabalContents <- B.readFile "zip-archive.cabal" - case findEntryByPath "zip-archive.cabal" archive of - Nothing -> assertFailure "zip-archive.cabal not found in archive" - Just f -> assertEqual "for contents of zip-archive.cabal in archive" cabalContents (fromEntry f) - -testFromToArchive = TestCase $ do - archive <- addFilesToArchive [OptRecursive] emptyArchive ["LICENSE", "Codec"] - assertEqual "for (toArchive $ fromArchive archive)" archive (toArchive $ fromArchive archive) - -testReadWriteEntry = TestCase $ do - entry <- readEntry [] "zip-archive.cabal" - setCurrentDirectory "test-temp" - writeEntry [] entry - setCurrentDirectory ".." - entry' <- readEntry [] "test-temp/zip-archive.cabal" - let entry'' = entry' { eRelativePath = eRelativePath entry, eLastModified = eLastModified entry } - assertEqual "for readEntry -> writeEntry -> readEntry" entry entry'' - -testAddFilesOptions = TestCase $ do - archive1 <- addFilesToArchive [OptVerbose] emptyArchive ["LICENSE", "Codec"] - archive2 <- addFilesToArchive [OptRecursive, OptVerbose] archive1 ["LICENSE", "Codec"] - assertBool "for recursive and nonrecursive addFilesToArchive" - (length (filesInArchive archive1) < length (filesInArchive archive2)) - -testDeleteEntries = TestCase $ do - archive1 <- addFilesToArchive [] emptyArchive ["LICENSE", "Codec/"] - let archive2 = deleteEntryFromArchive "LICENSE" archive1 - let archive3 = deleteEntryFromArchive "Codec/" archive2 - assertEqual "for deleteFilesFromArchive" emptyArchive archive3 - -testExtractFiles = TestCase $ do - createDirectory "test-temp/dir1" - createDirectory "test-temp/dir1/dir2" - let hiMsg = "hello there" - let helloMsg = "Hello there. This file is very long. Longer than 31 characters." - writeFile "test-temp/dir1/hi" hiMsg - writeFile "test-temp/dir1/dir2/hello" helloMsg - archive <- addFilesToArchive [OptRecursive] emptyArchive ["test-temp/dir1"] - removeDirectoryRecursive "test-temp/dir1" - extractFilesFromArchive [OptVerbose] archive - hi <- readFile "test-temp/dir1/hi" - hello <- readFile "test-temp/dir1/dir2/hello" - assertEqual "contents of test-temp/dir1/hi" hiMsg hi - assertEqual "contents of test-temp/dir1/dir2/hello" helloMsg hello - diff --git a/Zip.hs b/Zip.hs --- a/Zip.hs +++ b/Zip.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- Zip.hs -- Copyright (c) 2008 John MacFarlane --- License : GPL 2 (see LICENSE) +-- License : BSD3 (see LICENSE) -- -- This is a demonstration of the use of the 'Codec.Archive.Zip' library. -- It duplicates some of the functionality of the 'zip' command-line diff --git a/tests/test-zip-archive.hs b/tests/test-zip-archive.hs new file mode 100644 --- /dev/null +++ b/tests/test-zip-archive.hs @@ -0,0 +1,104 @@ +{-# LANGUAGE CPP #-} +-- Test suite for Codec.Archive.Zip +-- runghc Test.hs + +import Codec.Archive.Zip +import System.Directory +import Test.HUnit.Base +import Test.HUnit.Text +#if MIN_VERSION_directory(1,2,0) +import System.Time +#endif +import System.Process +import qualified Data.ByteString.Lazy as B +import Control.Applicative +import System.Exit + +-- define equality for Archives so timestamps aren't distinguished if they +-- correspond to the same MSDOS datetime. +instance Eq Archive where + (==) a1 a2 = zSignature a1 == zSignature a2 + && zComment a1 == zComment a2 + && (all id $ zipWith (\x y -> x { eLastModified = eLastModified x `div` 2 } == + y { eLastModified = eLastModified y `div` 2 }) (zEntries a1) (zEntries a2)) + +main :: IO Counts +main = do + createDirectory "test-temp" + res <- runTestTT $ TestList [ testReadWriteArchive + , testReadExternalZip + , testFromToArchive + , testReadWriteEntry + , testAddFilesOptions + , testDeleteEntries + , testExtractFiles + ] + removeDirectoryRecursive "test-temp" + exitWith $ case errors res of + 0 -> ExitSuccess + n -> ExitFailure n + +testReadWriteArchive :: Test +testReadWriteArchive = TestCase $ do + archive <- addFilesToArchive [OptRecursive] emptyArchive ["LICENSE", "Codec"] + B.writeFile "test-temp/test1.zip" $ fromArchive archive + archive' <- toArchive <$> B.readFile "test-temp/test1.zip" + assertEqual "for writing and reading test1.zip" archive archive' + assertEqual "for writing and reading test1.zip" archive archive' + +testReadExternalZip :: Test +testReadExternalZip = TestCase $ do + _ <- runCommand "/usr/bin/zip -q -9 test-temp/test4.zip zip-archive.cabal Codec/Archive/Zip.hs" >>= waitForProcess + archive <- toArchive <$> B.readFile "test-temp/test4.zip" + let files = filesInArchive archive + assertEqual "for results of filesInArchive" ["zip-archive.cabal", "Codec/Archive/Zip.hs"] files + cabalContents <- B.readFile "zip-archive.cabal" + case findEntryByPath "zip-archive.cabal" archive of + Nothing -> assertFailure "zip-archive.cabal not found in archive" + Just f -> assertEqual "for contents of zip-archive.cabal in archive" cabalContents (fromEntry f) + +testFromToArchive :: Test +testFromToArchive = TestCase $ do + archive <- addFilesToArchive [OptRecursive] emptyArchive ["LICENSE", "Codec"] + assertEqual "for (toArchive $ fromArchive archive)" archive (toArchive $ fromArchive archive) + +testReadWriteEntry :: Test +testReadWriteEntry = TestCase $ do + entry <- readEntry [] "zip-archive.cabal" + setCurrentDirectory "test-temp" + writeEntry [] entry + setCurrentDirectory ".." + entry' <- readEntry [] "test-temp/zip-archive.cabal" + let entry'' = entry' { eRelativePath = eRelativePath entry, eLastModified = eLastModified entry } + assertEqual "for readEntry -> writeEntry -> readEntry" entry entry'' + +testAddFilesOptions :: Test +testAddFilesOptions = TestCase $ do + archive1 <- addFilesToArchive [OptVerbose] emptyArchive ["LICENSE", "Codec"] + archive2 <- addFilesToArchive [OptRecursive, OptVerbose] archive1 ["LICENSE", "Codec"] + assertBool "for recursive and nonrecursive addFilesToArchive" + (length (filesInArchive archive1) < length (filesInArchive archive2)) + +testDeleteEntries :: Test +testDeleteEntries = TestCase $ do + archive1 <- addFilesToArchive [] emptyArchive ["LICENSE", "Codec/"] + let archive2 = deleteEntryFromArchive "LICENSE" archive1 + let archive3 = deleteEntryFromArchive "Codec/" archive2 + assertEqual "for deleteFilesFromArchive" emptyArchive archive3 + +testExtractFiles :: Test +testExtractFiles = TestCase $ do + createDirectory "test-temp/dir1" + createDirectory "test-temp/dir1/dir2" + let hiMsg = "hello there" + let helloMsg = "Hello there. This file is very long. Longer than 31 characters." + writeFile "test-temp/dir1/hi" hiMsg + writeFile "test-temp/dir1/dir2/hello" helloMsg + archive <- addFilesToArchive [OptRecursive] emptyArchive ["test-temp/dir1"] + removeDirectoryRecursive "test-temp/dir1" + extractFilesFromArchive [OptVerbose] archive + hi <- readFile "test-temp/dir1/hi" + hello <- readFile "test-temp/dir1/dir2/hello" + assertEqual "contents of test-temp/dir1/hi" hiMsg hi + assertEqual "contents of test-temp/dir1/dir2/hello" helloMsg hello + diff --git a/zip-archive.cabal b/zip-archive.cabal --- a/zip-archive.cabal +++ b/zip-archive.cabal @@ -1,6 +1,6 @@ Name: zip-archive -Version: 0.1.1.8 -Cabal-version: >= 1.2 +Version: 0.1.2.1 +Cabal-Version: >= 1.10 Build-type: Simple Synopsis: Library for creating and modifying zip archives. Description: The zip-archive library provides functions for creating, modifying, @@ -12,8 +12,11 @@ Author: John MacFarlane Maintainer: jgm@berkeley.edu Build-Depends: base -Extra-Source-Files: Tests.hs, COPYING +Source-repository head + type: git + location: git://github.com/jgm/zip-archive.git + flag splitBase Description: Choose the new, smaller, split-up base package. Default: True @@ -21,16 +24,17 @@ Description: Build the Zip executable. Default: False -Library +Library if flag(splitBase) Build-depends: base >= 3 && < 5, pretty, containers else Build-depends: base < 3 - Build-depends: binary, zlib, filepath, directory, bytestring >= 0.9.0, array, mtl, utf8-string >= 0.3.1, old-time, digest >= 0.0.0.1 + Build-depends: binary < 0.6, zlib, filepath, bytestring >= 0.9.0, array, mtl, utf8-string >= 0.3.1, old-time, digest >= 0.0.0.1, directory, time Exposed-modules: Codec.Archive.Zip + Default-Language: Haskell98 Hs-Source-Dirs: . Ghc-Options: -Wall - Extensions: CPP + Default-Extensions: CPP if os(windows) cpp-options: -D_WINDOWS else @@ -43,3 +47,14 @@ Buildable: False Main-is: Zip.hs Ghc-Options: -Wall + Default-Language: Haskell98 + +Test-Suite test-zip-archive + Type: exitcode-stdio-1.0 + Main-Is: test-zip-archive.hs + Hs-Source-Dirs: tests + Build-Depends: base >= 4.2 && < 5, + directory, bytestring >= 0.9.0, process, time, old-time, + HUnit, zip-archive + Default-Language: Haskell98 + Ghc-Options: -Wall