Update to latest LTS and ShellCheck-0.7.0 (wfleming#65)

* Update to latest LTS and ShellCheck-0.7.0

* Fix for removed env values

If we have an existing value in the old env, but it's not in the updated
env, this line would fail. It's been replaced by a no-op. Since we only
write new-env, those will be removed by the process.

* Update env.yml

* Fixup! Update

* Address -Wall errors

Author: pbrisbin

Diff for: app/CLI.hs

@@ -1,6 +1,5 @@
 module CLI where
 
-import Data.Monoid
 import Options.Applicative
 
 --------------------------------------------------------------------------------

Diff for: codeclimate-shellcheck.cabal

@@ -39,7 +39,7 @@ library
     , filepath
     , Glob
     , pureMD5
-    , ShellCheck
+    , ShellCheck == 0.7.0
     , text
     , yaml
   hs-source-dirs: src

Diff for: data/env.yml

@@ -39,7 +39,9 @@
 
 # IO ()
 old_env.each do |key, val|
-  new_env[key]['remediation_points'] = val['remediation_points']
+  if (new_val = new_env[key])
+    new_val['remediation_points'] = val['remediation_points']
+  end
 end
 
 # String

Diff for: data/prepare.rb

@@ -1,4 +1,4 @@
-FROM fpco/stack-build:lts-3.18
+FROM fpco/stack-build:lts-14.1
 MAINTAINER Philip Cunningham <hello@filib.io>
 
 ADD . /home/app

Diff for: docker/Build.plan

@@ -13,7 +13,6 @@ import           CC.Types
 import           Data.Aeson
 import qualified Data.ByteString.Lazy as BSL
 import           Data.Maybe
-import           Data.Monoid
 import           System.Directory
 
 --------------------------------------------------------------------------------

Diff for: src/CC.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards #-}
 
 module CC.ShellCheck.Analyze where
 
@@ -8,7 +7,6 @@ import           CC.ShellCheck.Types as CC
 import           CC.Types as CC
 import           Control.Exception.Base
 import qualified Data.Map.Strict as DM
-import           Data.Monoid
 import qualified Data.Text as T
 import           ShellCheck.Checker
 import           ShellCheck.Interface
@@ -26,7 +24,11 @@ analyze env path = do
     checkSpec x = emptyCheckSpec { csFilename = path, csScript = x }
 
     interface :: SystemInterface IO
-    interface = SystemInterface { siReadFile = defaultInterface }
+    interface = SystemInterface
+        { siReadFile = defaultInterface
+        , siFindSource = error "TODO"
+        , siGetConfig = error "TODO"
+        }
 
 --------------------------------------------------------------------------------
 
@@ -60,13 +62,13 @@ fromSeverity WarningC = BugRisk
 
 -- | Maps CheckResult into issues.
 fromCheckResult :: Env -> CheckResult -> String -> [Issue]
-fromCheckResult env CheckResult{..} shellScript = fmap (fromPositionedComment env shellScript) crComments
+fromCheckResult env cr shellScript = fromPositionedComment env shellScript <$> crComments cr
 
 --------------------------------------------------------------------------------
 
 -- | Maps from a PositionedComment to an Issue.
 fromPositionedComment :: Env -> String -> PositionedComment -> Issue
-fromPositionedComment env shellScript p@(PositionedComment Position{..} _ (Comment severity code desc)) =
+fromPositionedComment env shellScript p =
   Issue { _check_name         = checkName
         , _description        = description
         , _categories         = categories
@@ -87,10 +89,10 @@ fromPositionedComment env shellScript p@(PositionedComment Position{..} _ (Comme
     categories = [fromSeverity severity]
 
     coords :: CC.Position
-    coords = Coords (LineColumn (fromIntegral posLine) (fromIntegral posColumn))
+    coords = Coords (LineColumn (fromIntegral $ posLine pos) (fromIntegral $ posColumn pos))
 
     location :: Location
-    location = Location posFile $! PositionBased coords coords
+    location = Location (posFile pos) $! PositionBased coords coords
 
     mapping :: Maybe Mapping
     mapping = DM.lookup checkName env
@@ -106,3 +108,9 @@ fromPositionedComment env shellScript p@(PositionedComment Position{..} _ (Comme
 
     content :: Maybe Content
     content = fmap (\(Mapping _ x) -> x) mapping
+
+    pos = pcStartPos p
+    comment = pcComment p
+    code = cCode comment
+    severity = cSeverity comment
+    desc = cMessage comment

Diff for: src/CC/ShellCheck/Analyze.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module CC.ShellCheck.Env where
 
 import           CC.ShellCheck.Types
@@ -15,6 +13,6 @@ loadEnv :: FilePath -> IO Env
 loadEnv path = do
   fileExists <- doesFileExist path
   config <- if fileExists
-              then YML.decodeFile path
+              then either (const Nothing) Just <$> YML.decodeFileEither path
               else return Nothing
   return $! fromMaybe DM.empty config

Diff for: src/CC/ShellCheck/Env.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE RecordWildCards #-}
 
 module CC.ShellCheck.Fingerprint
     ( issueFingerprint
@@ -22,12 +21,16 @@ import qualified Data.Text as T
 -- | Given a positioned comment and the file's contents, generate a fingerprint
 --   unique to that issue
 issueFingerprint :: PositionedComment -> Text -> Text
-issueFingerprint (PositionedComment Position{..} _ (Comment _ code _)) script =
+issueFingerprint pc script =
     md5 $ T.intercalate "|"
-        [ T.pack $ posFile
+        [ T.pack $ posFile pos
         , T.pack $ show code
-        , T.filter (not . isSpace) $ fetchLine (fromIntegral posLine) script
+        , T.filter (not . isSpace) $ fetchLine (fromIntegral $ posLine pos) script
         ]
+  where
+    pos = pcStartPos pc
+    comment = pcComment pc
+    code = cCode comment
 
 md5 :: Text -> Text
 md5 = T.pack . show . MD5.md5 . encodeUtf8 . fromStrict

Diff for: src/CC/ShellCheck/Fingerprint.hs

@@ -13,7 +13,6 @@ import           Control.Monad.Extra
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as Char8
 import           Data.List
-import           Data.Monoid
 import           Data.Shebang (Shebang(..), Interpretter(..), Argument(..))
 import qualified Data.Shebang as Shebang
 import           System.Directory
@@ -70,7 +69,7 @@ isShellScript path =
 -- | Retrieve shell scripts for a list of paths.
 findShellScripts :: [FilePath] -> IO [FilePath]
 findShellScripts paths = do
-  dotShFiles <- concat . fst <$> globDir patterns "."
+  dotShFiles <- concat <$> globDir patterns "."
   allScripts <- filterM validateScript $! dotShFiles ++ otherFiles
   return $ fmap clean allScripts
   where

Diff for: src/CC/ShellCheck/ShellScript.hs

@@ -1,10 +1,3 @@
-resolver: lts-3.18
+resolver: lts-14.1
 system-ghc: false
 install-ghc: true
-packages:
-- '.'
-extra-deps:
-  - aeson-0.10.0.0
-  - attoparsec-0.13.0.1
-  - ShellCheck-0.4.6
-  - string-qq-0.0.2

Diff for: stack.yaml

@@ -0,0 +1,12 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages: []
+snapshots:
+- completed:
+    size: 523448
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/1.yaml
+    sha256: 0045b9bae36c3bb2dd374c29b586389845af1557eea0423958d152fc500d4fbf
+  original: lts-14.1

Diff for: stack.yaml.lock

@@ -11,8 +11,11 @@ import Data.Text (Text)
 import ShellCheck.Interface
     ( Code
     , Comment(..)
+    , newComment
     , Position(..)
+    , newPosition
     , PositionedComment(..)
+    , newPositionedComment
     , Severity(..)
     )
 import Test.Hspec
@@ -72,17 +75,25 @@ fingerprintSpecs = describe "issueFingerprint" $ do
 
 fingerprint :: Integer -> Code -> Text -> Text
 fingerprint ln code =
-  issueFingerprint $ PositionedComment (position ln) unused (comment code)
+  issueFingerprint $ newPositionedComment
+    { pcStartPos = position ln
+    , pcEndPos = unused
+    , pcComment = comment code
+    }
   where
     unused :: a
     unused = error "end position comment not implemented"
 
 position :: Integer -> Position
-position ln = Position
+position ln = newPosition
     { posFile = "foo.sh"
     , posLine = ln
     , posColumn = 0
     }
 
 comment :: Code -> Comment
-comment code = Comment ErrorC code ""
+comment code = newComment
+    { cSeverity = ErrorC
+    , cCode = code
+    , cMessage = ""
+    }