Extend Package to include id

This commit
1. rename Package with PackageBaseName
2. Pacakge = (PackageBaseName, Maybe String) to save its id
3. Expose packages with id if available

test/CabalApiSpec.hs

@@ -28,7 +28,7 @@ spec = do
                         ghcOptions  = ghcOptions res
                       , includeDirs = map (toRelativeDir dir) (includeDirs res)
                       }
-                res' `shouldBe` CompilerOptions {ghcOptions = ["-no-user-package-db","-package-db","/home/me/work/ghc-mod/test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98"], includeDirs = ["test/data","test/data/dist/build","test/data/dist/build/autogen","test/data/subdir1/subdir2","test/data/test"], depPackages = ["Cabal","base","template-haskell"]}
+                res' `shouldBe` CompilerOptions {ghcOptions = ["-no-user-package-db","-package-db","/home/me/work/ghc-mod/test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98"], includeDirs = ["test/data","test/data/dist/build","test/data/dist/build/autogen","test/data/subdir1/subdir2","test/data/test"], depPackages = [("Cabal", Nothing), ("base", Nothing) , ("template-haskell", Nothing)]}
 
     describe "cabalDependPackages" $ do
         it "extracts dependent packages" $ do

test/CradleSpec.hs

@@ -22,6 +22,7 @@ spec = do
                   , cradleCabalDir      = Nothing
                   , cradleCabalFile     = Nothing
                   , cradlePackageDbOpts = []
+                  , cradlePackages      = []
                   }
         it "finds a cabal file and a sandbox" $ do
             withDirectory "test/data/subdir1/subdir2" $ \dir -> do
@@ -31,6 +32,7 @@ spec = do
                   , cradleCabalDir      = Just ("test" </> "data")
                   , cradleCabalFile     = Just ("test" </> "data" </> "cabalapi.cabal")
                   , cradlePackageDbOpts = ["-no-user-package-db", "-package-db", "test" </> "data" </> ".cabal-sandbox" </> "/home/me/work/ghc-mod/test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d"]
+                  , cradlePackages      = []
                   }
         it "works even if a sandbox config file is broken" $ do
             withDirectory "test/data/broken-sandbox" $ \dir -> do
@@ -40,6 +42,7 @@ spec = do
                   , cradleCabalDir      = Just ("test" </> "data" </> "broken-sandbox")
                   , cradleCabalFile     = Just ("test" </> "data" </> "broken-sandbox" </> "dummy.cabal")
                   , cradlePackageDbOpts = []
+                  , cradlePackages      = []
                   }
 
     describe "getPackageDbDir" $ do
@@ -51,11 +54,10 @@ spec = do
             getPackageDbDir "test/data/bad.config" `shouldThrow` anyException
 
 relativeCradle :: FilePath -> Cradle -> Cradle
-relativeCradle dir cradle = Cradle {
+relativeCradle dir cradle = cradle {
     cradleCurrentDir    = toRelativeDir dir  $  cradleCurrentDir    cradle
   , cradleCabalDir      = toRelativeDir dir <$> cradleCabalDir      cradle
   , cradleCabalFile     = toRelativeDir dir <$> cradleCabalFile     cradle
-  , cradlePackageDbOpts = cradlePackageDbOpts cradle
   }
 
 -- Work around GHC 7.2.2 where `canonicalizePath "/"` returns "/.".

test/DebugSpec.hs

@@ -7,7 +7,7 @@ import Dir
 
 checkFast :: String -> String -> IO ()
 checkFast file ans = withDirectory_ "test/data" $ do
-    let cradle = Cradle "." Nothing Nothing []
+    let cradle = Cradle "." Nothing Nothing [] []
     res <- debugInfo defaultOptions cradle file
     lines res `shouldContain` [ans]