better fix for absolute path fails

Kit/Contents.hs

@@ -8,6 +8,7 @@ module Kit.Contents (
 import Kit.Spec
 import Kit.Util
 import Kit.Xcode.XCConfig
+import Kit.FilePath
 
 import qualified Data.Traversable as T
 
@@ -30,9 +31,10 @@ instance Packageable KitContents where
 namedPrefix :: KitContents -> Maybe String
 namedPrefix kc = fmap (\s -> "//" ++ (packageFileName kc) ++ "\n" ++ s) $ contentPrefix kc
 
-readKitContents :: (Applicative m, MonadIO m) => FilePath -> KitSpec -> m KitContents
-readKitContents kitDir spec =
-  let find dir tpe = liftIO $ inDirectory kitDir $ do
+readKitContents :: (Applicative m, MonadIO m) => AbsolutePath -> KitSpec -> m KitContents
+readKitContents absKitDir spec =
+  let kitDir = filePath absKitDir 
+      find dir tpe = liftIO $ inDirectory kitDir $ do
         files <- glob (dir </> "**/*" ++ tpe)
         mapM canonicalizePath files
       findSrc = find $ specSourceDirectory spec

Kit/FilePath.hs

@@ -0,0 +1,15 @@
+module Kit.FilePath (
+    AbsolutePath,
+    filePath,
+    absolutePath
+    ) where
+
+import System.Directory (canonicalizePath)
+
+data AbsolutePath = AbsolutePath FilePath deriving (Eq, Show)
+
+filePath :: AbsolutePath -> FilePath
+filePath (AbsolutePath fp) = fp
+
+absolutePath :: FilePath -> IO AbsolutePath
+absolutePath path = fmap AbsolutePath $ canonicalizePath path

Kit/Main.hs

@@ -17,6 +17,7 @@ module Kit.Main where
   import Data.Function (on)
   import Kit.Repository (KitRepository, unpackKit, packagesDirectory, publishLocally)
   import Control.Monad.State
+  import Kit.FilePath
 
   kitMain :: IO ()
   kitMain = do
@@ -74,7 +75,7 @@ module Kit.Main where
   dependencyContents repo dep = readKitContents' baseDir (depSpec dep) where
     baseDir = dependency ((packagesDirectory repo </>) . packageFileName) (\fp spec -> devKitDir </> fp) dep
     readKitContents' base spec = do
-      absoluteBase <- liftIO $ canonicalizePath base
+      absoluteBase <- liftIO $ absolutePath base
       readKitContents absoluteBase spec
 
   doPackageKit :: Command ()