Remove server implementation

Signed-off-by: Sascha Grunert <mail@saschagrunert.de>

.circleci/config.yml

@@ -16,22 +16,17 @@ workflows:
       - build
       - build-static
       - doc
-      # - doc-publish:
-      #     requires:
-      #       - doc
-      #     filters:
-      #       branches:
-      #         only: master
+      - doc-publish:
+          requires:
+            - doc
+          filters:
+            branches:
+              only: master
       - image:
           name: image-client
           target: client
           requires:
             - build-static
-      - image:
-          name: image-server
-          target: server
-          requires:
-            - build-static
       - lint
       - test
 

.gitignore

@@ -11,4 +11,3 @@ dist
 dist-*
 result
 static/tmp
-yesod-devel

Makefile

@@ -1,8 +1,4 @@
 BUILD_DIR := build
-GLOB_SCSS := config/bulma.scss
-BULMA_DIR := $(BUILD_DIR)/bulma
-BULMA_TAG := 0.7.5
-BULMA_URL := https://github.com/jgthms/bulma
 
 define nix-shell
 	nix-shell nix/shell.nix $(1)
@@ -54,9 +50,7 @@ build-static-with-image:
 
 .PHONY: cabal2nix
 cabal2nix:
-	$(call nix-shell-pure-run,\
-		cd nix && \
-		cabal2nix --no-haddock .. > default.nix)
+	$(call nix-shell-pure-run,cd nix && cabal2nix .. > default.nix)
 
 .PHONY: clean
 clean:
@@ -92,13 +86,8 @@ image-client:
 	$(call nix-shell-pure-run,hack/is-static result/bin/client)
 	$(call image,client)
 
-.PHONY: image-server
-image-server:
-	$(call nix-shell-pure-run,hack/is-static result/bin/server)
-	$(call image,server)
-
 .PHONY: lint
-lint: bulma cabal2nix floskell hlint
+lint: cabal2nix floskell hlint
 	$(call nix-shell-pure-run,git diff --exit-code)
 
 .PHONY: locale
@@ -110,14 +99,10 @@ nixpkgs:
 	nix-shell -p nix-prefetch-git --run "nix-prefetch-git --no-deepClone \
 		https://github.com/nixos/nixpkgs > nix/nixpkgs.json"
 
-.PHONY: repl-client
-repl-client:
+.PHONY: repl
+repl:
 	$(call nix-shell-pure-run,cabal new-repl exe:client)
 
-.PHONY: repl-server
-repl-server:
-	$(call nix-shell-run,hack/repl)
-
 .PHONY: shell
 shell:
 	$(call nix-shell-pure)
@@ -126,18 +111,3 @@ shell:
 test:
 	$(call nix-shell-pure-run,\
 		cabal new-test --enable-coverage --enable-library-coverage)
-
-.PHONY: bulma
-bulma:
-	$(call nix-shell-run,\
-		if [ ! -d $(BULMA_DIR) ]; then \
-			mkdir -p $(BUILD_DIR) &&\
-			wget -qO- $(BULMA_URL)/archive/$(BULMA_TAG).tar.gz \
-				| tar xfz - -C $(BUILD_DIR) &&\
-			mv $(BUILD_DIR)/bulma-* $(BULMA_DIR) ;\
-		fi &&\
-		sass -t compressed $(GLOB_SCSS) > static/css/bulma.min.css)
-
-.PHONY: yesod
-yesod:
-	$(call nix-shell-run,stack exec --no-nix-pure -- yesod devel)

src/cmd/client/Main.hs → app/Main.hs

@@ -9,34 +9,37 @@ import           Control.Monad       ( foldM )
 import           Data.List           ( intercalate )
 
 import           Env
-                 ( branchEnvVars, commitEnvVars, fillEnvironment
-                 , pullRequestEnvVars, tokenEnvVars )
+                 ( commitEnvVars, fillEnvironment, pullRequestEnvVars
+                 , repositoryEnvVars, tokenEnvVars )
 
 import           Log                 as L ( info )
 import           Log                 ( initLogger, notice, warn )
 
 import           Model
-                 ( Environment(Environment), environmentBranch
-                 , environmentCommit, environmentPullRequest )
+                 ( Environment(Environment), environmentCommit
+                 , environmentPullRequest, environmentRepository )
 
 import           Options.Applicative as O ( info )
 import           Options.Applicative
-                 ( (<**>), Parser, ParserInfo, ParserPrefs(..), customExecParser
-                 , flag', footer, fullDesc, header, help, helper, infoOption
-                 , internal, long, many, metavar, short, short, showDefault
-                 , strOption, switch, value )
+                 ( (<**>), Parser, ParserInfo
+                 , ParserPrefs(ParserPrefs, prefMultiSuffix, prefDisambiguate,
+            prefShowHelpOnEmpty, prefShowHelpOnError, prefBacktrack,
+            prefColumns)
+                 , customExecParser, flag', footer, fullDesc, header, help
+                 , helper, infoOption, internal, long, many, metavar, short
+                 , short, showDefault, strOption, switch, value )
 
 import           ParserResult
                  ( amount, initParserStep, parseStepIO, send )
 
 import           System.Exit         ( exitFailure )
 import           System.IO
                  ( BufferMode(LineBuffering), hSetBuffering, stdout )
-import           System.Log.Logger   ( Priority(..) )
+import           System.Log.Logger   ( Priority(INFO, DEBUG, NOTICE) )
 
 import           Text.Printf         ( printf )
 
-data Args = Args Environment  -- ^ Contains data sent to the server
+data Args = Args Environment  -- ^ Contains metadata about the current run
                  Priority     -- ^ The log level
                  String       -- ^ The API url
                  Bool         -- ^ Development mode without runtime checks
@@ -67,9 +70,11 @@ arguments :: Parser Args
 arguments = Args <$> environment <*> verbosity <*> apiUrl <*> devel
 
 environment :: Parser Environment
-environment = Environment <$> strOption (long "branch" <> short 'b'
-                                         <> envHelp "Branch name" branchEnvVars
-                                         <> metavar "BRANCH" <> value "")
+environment = Environment
+    <$> strOption (long "repository" <> short 'r'
+                   <> envHelp "GitHub repository name (owner/repo)"
+                              repositoryEnvVars <> metavar "REPOSITORY"
+                   <> value "")
     <*> strOption (long "commit" <> short 'c'
                    <> envHelp "Commit hash" commitEnvVars <> metavar "COMMIT"
                    <> value "")
@@ -118,9 +123,9 @@ run (Args e v u d) = do
 
     -- Prepare environment
     env <- fillEnvironment e d
-    L.info . printf "Using branch: %s" $ env ^. environmentBranch
     L.info . printf "Using commit: %s" $ env ^. environmentCommit
     L.info . printf "Using pull request: %s" $ env ^. environmentPullRequest
+    L.info . printf "Using repository: %s" $ env ^. environmentRepository
 
     -- Parse loop
     notice "Processing input from stdin..."

config/models.persistentmodels → config/models

@@ -5,9 +5,9 @@ Test
     deriving    Show
 
 Environment
-    branch      Text
     commit      Text
     pullRequest Text
+    repository  Text
     token       Text
     deriving    Show
 

floskell.json

@@ -1,9 +1,8 @@
 {
   "style": "cramer",
   "extensions": [
-    "CPP",
-    "DeriveGeneric",
-    "InstanceSigs",
+    "GADTs",
+    "GeneralizedNewtypeDeriving",
     "MultiParamTypeClasses",
     "OverloadedStrings",
     "TemplateHaskell",

nix/default.nix

@@ -1,15 +1,8 @@
-{ mkDerivation, aeson, ansi-terminal, base, bytestring
-, case-insensitive, classy-prelude, classy-prelude-conduit
-, classy-prelude-yesod, conduit, containers, data-default
-, directory, fast-logger, file-embed, foreign-store
-, github-webhooks, hjsmin, hpack, hslogger, http-client
-, http-client-tls, http-conduit, lens, megaparsec, monad-control
-, monad-logger, optparse-applicative, persistent, persistent-sqlite
-, persistent-template, safe, shakespeare, stdenv, tasty
-, tasty-hspec, tasty-quickcheck, template-haskell, temporary, text
-, time, unordered-containers, uuid, vector, wai, wai-extra
-, wai-logger, warp, yaml, yesod, yesod-auth, yesod-core, yesod-form
-, yesod-static, yesod-test
+{ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
+, hpack, hslogger, http-conduit, lens, megaparsec
+, optparse-applicative, persistent, persistent-sqlite
+, persistent-template, stdenv, tasty, tasty-hspec, tasty-quickcheck
+, temporary, text, time
 }:
 mkDerivation {
   pname = "performabot";
@@ -18,26 +11,17 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    aeson ansi-terminal base bytestring case-insensitive classy-prelude
-    classy-prelude-conduit classy-prelude-yesod conduit containers
-    data-default directory fast-logger file-embed foreign-store
-    github-webhooks hjsmin hslogger http-client http-client-tls
-    http-conduit lens megaparsec monad-control monad-logger persistent
-    persistent-sqlite persistent-template safe shakespeare
-    template-haskell temporary text time unordered-containers uuid
-    vector wai wai-extra wai-logger warp yaml yesod yesod-auth
-    yesod-core yesod-form yesod-static
+    aeson ansi-terminal base bytestring directory hslogger http-conduit
+    lens megaparsec persistent persistent-sqlite persistent-template
+    temporary text time
   ];
   libraryToolDepends = [ hpack ];
   executableHaskellDepends = [
     base hslogger lens optparse-applicative
   ];
   testHaskellDepends = [
-    aeson base classy-prelude directory lens megaparsec monad-logger
-    persistent persistent-sqlite tasty tasty-hspec tasty-quickcheck
-    yesod yesod-core yesod-test
+    aeson base lens megaparsec tasty tasty-hspec tasty-quickcheck
   ];
-  doHaddock = false;
   preConfigure = "hpack";
   homepage = "https://github.com/saschagrunert/performabot#readme";
   license = stdenv.lib.licenses.mit;

nix/shell.nix

@@ -18,19 +18,16 @@ pkgs.stdenv.mkDerivation {
     cabal-install
     cabal2nix
     conmon
-    expect
     file
     git
     glibcLocales
     haskellPackages.floskell
     haskellPackages.hpc-coveralls
-    haskellPackages.yesod-bin
     hlint
     iptables
     nix-prefetch-git
     podman
     runc
-    sass
     sqlite
     utillinux
     wget