licensor 0.2.0 → 0.2.1

raw patch · 5 files changed

+27/−17 lines, 5 filesdep ~Cabaldep ~basePVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: Cabal, base

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• Main.hs +4/−1
• README.md +4/−3
• licensor.cabal +6/−6
• src/Licensor.hs +9/−7

@@ -1,3 +1,7 @@+# 0.2.1 (2017-07-24)++- Allow base 4.10 and Cabal 2.0 (7bbb360)+ # 0.2.0 (2016-09-18)  ## Enhancements

@@ -64,6 +64,7 @@       }   &= program s   &= summary (unwords ["licensor", Version.showVersion version])+  &= verbosity   -- |@@ -74,6 +75,8 @@ main = do   LiArgs <- cmdArgsRun . liArgs =<< getProgName +  quiet <- fmap not isNormal+   maybePackage <- getPackage    pid <-@@ -105,7 +108,7 @@      Just dependencies -> do       (dependenciesByLicense', failed) <--        orderPackagesByLicense pid dependencies+        orderPackagesByLicense quiet pid dependencies        let dependenciesByLicense = fmap (Set.map display) dependenciesByLicense' 

@@ -5,8 +5,8 @@ [0]: https://circleci.com/gh/jpvillaisaza/licensor [1]: https://circleci.com/gh/jpvillaisaza/licensor.svg?style=svg -![][2]-![][3]+[![][2]](https://www.stackage.org/lts/package/licensor)+[![][3]](https://www.stackage.org/nightly/package/licensor)  [2]: https://www.stackage.org/package/licensor/badge/lts [3]: https://www.stackage.org/package/licensor/badge/nightly@@ -167,7 +167,8 @@  ## Additional resources -- [Choose a License](http://choosealicense.com/)+- [Choose a License](https://choosealicense.com/)+- [The Legal Side of Open Source](https://opensource.guide/legal/) - [License compatibility][ar-01] - [Understanding open source and free software licensing][ar-02]   (Andrew M. St. Laurent)

@@ -1,5 +1,5 @@ name: licensor-version: 0.2.0+version: 0.2.1  build-type: Simple cabal-version: >= 1.21@@ -21,7 +21,7 @@  category: Distribution -tested-with: GHC == 7.10.3, GHC == 8.0.1+tested-with: GHC == 7.10.3, GHC == 8.0.1, GHC == 8.0.2, GHC == 8.2.1  extra-source-files: CHANGELOG.md, README.md @@ -34,9 +34,9 @@   other-modules:       Paths_licensor   build-depends:-      base >= 4.8 && < 4.10+      base >= 4.8 && < 4.11     , bytestring-    , Cabal >= 1.22 && < 1.25+    , Cabal >= 1.22 && < 2.1     , containers     , directory     , http-conduit >= 2.1 && < 2.3@@ -51,8 +51,8 @@   main-is:       Main.hs   build-depends:-      base >= 4.8 && < 5.0-    , Cabal >= 1.22 && < 1.25+      base+    , Cabal     , cmdargs >= 0.10 && < 0.11     , containers     , directory

@@ -24,6 +24,7 @@  -- base import qualified Control.Exception as Exception+import Control.Monad (unless) import Data.Monoid ((<>)) import Data.Version (Version) import System.IO@@ -130,9 +131,9 @@ -- -- -getPackageLicense :: PackageIdentifier -> IO (Maybe LiLicense)-getPackageLicense p@PackageIdentifier{..} = do-  putStr $ display p ++ "..."+getPackageLicense :: Bool -> PackageIdentifier -> IO (Maybe LiLicense)+getPackageLicense quiet p@PackageIdentifier{..} = do+  unless quiet (putStr $ display p ++ "...")   let     url =       "GET https://hackage.haskell.org/package/"@@ -157,7 +158,7 @@       hClose handle       removeFile file -      putStrLn $ display license+      unless quiet (putStrLn $ display license)        return $ Just (LiLicense license) @@ -167,16 +168,17 @@ --  orderPackagesByLicense-  :: Maybe PackageIdentifier+  :: Bool+  -> Maybe PackageIdentifier   -> Set PackageIdentifier   -> IO (Map LiLicense (Set PackageIdentifier), Set PackageIdentifier)-orderPackagesByLicense maybeP =+orderPackagesByLicense quiet maybeP =   let     cond =       maybe (const False) (==) maybeP      insertPackage package orderedPackages' = do-      maybeLicense <- getPackageLicense package+      maybeLicense <- getPackageLicense quiet package        (orderedPackages, failed) <- orderedPackages'       return $