fosskers · fosskers · Jun 26, 2018 · May 22, 2018 · May 23, 2018 · May 23, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ addons:
 # The different configurations we want to test. You could also do things like
 # change flags or use --stack-yaml to point to a different file.
 env:
-- ARGS="--resolver nightly-2017-01-17"
+- ARGS="--resolver lts-11.10"
 
 before_install:
 # Download and unpack the stack executable

diff --git a/arel/arel.cabal b/arel/arel.cabal
diff --git a/arel/arel.hs b/arel/arel.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
 
@@ -13,7 +12,7 @@ import           Shelly
 
 ---
 
-data Env = Env { release :: T.Text } deriving (Generic, ParseRecord)
+newtype Env = Env { release :: T.Text } deriving (Generic, ParseRecord)
 
 projectDir :: FilePath
 projectDir = "/home/colin/code/haskell/aura/"
@@ -39,8 +38,9 @@ makeNewPkgFile (Env v) = do
 
 -- | The location of a built release tarball, the output of `stack sdist`.
 -- Beware: the `cabal` version is not static.
+-- See: https://github.com/commercialhaskell/stack/issues/3568
 tarballPath :: Text -> FilePath
-tarballPath v = fromText $ "aura/.stack-work/dist/x86_64-linux-nopie/Cabal-1.24.2.0/aura-" <> v <> ".tar.gz"
+tarballPath v = fromText $ "aura/.stack-work/dist/x86_64-linux-tinfo6/Cabal-2.0.1.0/aura-" <> v <> ".tar.gz"
 
 alterPKGBUILD :: Sh ()
 alterPKGBUILD = do

diff --git a/arel/package.yaml b/arel/package.yaml
@@ -0,0 +1,28 @@
+name:        arel
+version:     '1.1.0'
+synopsis:    Create an Aura release.
+description: Create an Aura release.
+category:    System
+author:      Colin Woodbury
+maintainer:  colin@fosskers.ca
+license:     GPL-3
+
+ghc-options:
+  - -fwarn-unused-imports
+  - -fwarn-unused-binds
+  - -fwarn-name-shadowing
+  - -fwarn-unused-matches
+  - -fwarn-incomplete-patterns
+  - -fwarn-incomplete-uni-patterns
+
+dependencies:
+  - base >= 4.8 && < 4.12
+  - optparse-generic >= 1.1 && < 1.4
+  - shelly >= 1.6 && < 1.9
+  - text >= 1.2 && < 1.3
+
+executables:
+  arel:
+    source-dirs: .
+    main: arel.hs
+    other-modules: []
diff --git a/aur/Linux/Arch/Aur/Rpc.hs b/aur/Linux/Arch/Aur/Rpc.hs
@@ -4,9 +4,9 @@
 
 -- |
 -- Module    : Linux.Arch.Aur.Rpc
--- Copyright : (c) Colin Woodbury, 2014, 2015, 2016
+-- Copyright : (c) Colin Woodbury, 2014 - 2018
 -- License   : GPL3
--- Maintainer: Colin Woodbury <colingw@gmail.com>
+-- Maintainer: Colin Woodbury <colin@fosskers.ca>
 --
 -- See https://aur.archlinux.org/rpc for details.
 
@@ -53,4 +53,4 @@ search :: MonadIO m => Manager -> Text -> m [AurInfo]
 search m p = unwrap m $ rpcS (Just "5") (Just "search") (Just p)
 
 unwrap :: MonadIO m => Manager -> ClientM RPCResp -> m [AurInfo]
-unwrap m r = liftIO . fmap (either (const []) _results) $ runClientM r (ClientEnv m url)
+unwrap m r = liftIO . fmap (either (const []) _results) $ runClientM r (ClientEnv m url Nothing)
diff --git a/aur/Linux/Arch/Aur/Types.hs b/aur/Linux/Arch/Aur/Types.hs
@@ -2,9 +2,9 @@
 
 -- |
 -- Module    : Linux.Arch.Aur.Types
--- Copyright : (c) Colin Woodbury, 2014, 2015, 2016
+-- Copyright : (c) Colin Woodbury, 2014 - 2018
 -- License   : GPL3
--- Maintainer: Colin Woodbury <colingw@gmail.com>
+-- Maintainer: Colin Woodbury <colin@fosskers.ca>
 
 module Linux.Arch.Aur.Types
     ( RPCResp(..)
@@ -79,3 +79,27 @@ instance FromJSON AurInfo where
                            v .:? "Keywords"    .!= []
 
     parseJSON _ = mzero
+
+instance ToJSON AurInfo where
+  toJSON ai = object
+    [ "ID" .= aurIdOf ai
+    , "Name" .= aurNameOf ai
+    , "PackageBaseID" .= pkgBaseIdOf ai
+    , "PackageBase" .= pkgBaseOf ai
+    , "Version" .= aurVersionOf ai
+    , "Description" .= aurDescriptionOf ai
+    , "URL" .= urlOf ai
+    , "NumVotes" .= aurVotesOf ai
+    , "Popularity" .= popularityOf ai
+    , "OutOfDate" .= dateObsoleteOf ai
+    , "Maintainer" .= aurMaintainerOf ai
+    , "FirstSubmitted" .= submissionDateOf ai
+    , "LastModified" .= modifiedDateOf ai
+    , "URLPath" .= urlPathOf ai
+    , "Depends" .= dependsOf ai
+    , "MakeDepends" .= makeDepsOf ai
+    , "OptDepends" .= optDepsOf ai
+    , "Conflicts" .= conflictsOf ai
+    , "Provides" .= providesOf ai
+    , "License" .= licenseOf ai
+    , "Keywords" .= keywordsOf ai ]
diff --git a/aur/aur.cabal b/aur/aur.cabal
diff --git a/aur/package.yaml b/aur/package.yaml
@@ -0,0 +1,54 @@
+name:                aur
+version:             6.0.1
+synopsis:            Access metadata from the Arch Linux User Repository.
+description:         Access package information from Arch Linux\'s AUR via its
+                     RPC interface. The main exposed functions reflect those of the RPC.
+
+                     `info` gets metadata for one package.
+                     `search` gets limited metadata for packages that match a given regex.
+
+                     By default this library supports version 5 of the RPC,
+                     and hence version 4.2+ of the AUR.
+
+homepage:            https://github.com/aurapm/aura
+license:             GPL-3
+author:              Colin Woodbury
+maintainer:          colin@fosskers.ca
+copyright:           2018 Colin Woodbury
+category:            Linux
+
+ghc-options:
+  - -fwarn-unused-imports
+  - -fwarn-unused-binds
+  - -fwarn-name-shadowing
+  - -fwarn-unused-matches
+  - -fwarn-incomplete-patterns
+  - -fwarn-redundant-constraints
+  - -Wincomplete-uni-patterns
+
+dependencies:
+  - base >= 4.10 && < 4.12
+  - http-client >= 0.5 && < 0.6
+
+library:
+  source-dirs: .
+  other-modules: []
+  dependencies:
+    - aeson >= 0.9 && < 1.4
+    - servant >= 0.9 && < 0.14
+    - servant-client >= 0.13 && < 0.14
+    - text
+
+tests:
+  aur-test:
+    main: Test.hs
+    source-dirs: tests
+    other-modules: []
+    ghc-options:
+      - -threaded
+      - -with-rtsopts=-N
+    dependencies:
+      - aur
+      - tasty >= 0.11 && < 2.0
+      - tasty-hunit >= 0.9 && < 0.11
+      - http-client-tls >= 0.3 && < 0.4
diff --git a/aur/tests/Test.hs b/aur/tests/Test.hs
@@ -18,13 +18,13 @@ suite m = testGroup "RPC Calls"
   ]
 
 infoTest :: Manager -> Assertion
-infoTest m = info m ["aura"] >>= assert . not . null
+infoTest m = info m ["aura"] >>= assertBool "Good package" . not . null
 
 infoTest' :: Manager -> Assertion
-infoTest' m = info m ["aura1234567"] >>= assert . null
+infoTest' m = info m ["aura1234567"] >>= assertBool "Bad package" . null
 
 searchTest :: Manager -> Assertion
-searchTest m = search m "aura" >>= assert . not . null
+searchTest m = search m "aura" >>= assertBool "Good search" . not . null
 
 main :: IO ()
 main = do