Separate exercises from library.

alpacaaa · Mar 22, 2019 · f1df5d2 · f1df5d2
1 parent 477bb28
commit f1df5d2
Show file tree

Hide file tree

Showing 25 changed files with 174 additions and 87 deletions.
diff --git a/ZERO-BS.md b/ZERO-BS.md
diff --git a/Makefile → exercises/Makefile b/Makefile → exercises/Makefile
@@ -1,15 +1,14 @@
 
-run-tests:
-	./exercises/run-tests
+run-integration-tests:
+	./run-tests
 
 bundle-frontend:
-	./exercises/bundle-frontend
-	cd exercises && python -m SimpleHTTPServer 8800
+	bundle-frontend && python -m SimpleHTTPServer 8800
 
 generate-docs:
 	# stack exec -- haddock --html --hyperlinked-source src/Zero/Server.hs --odir docs
 	# cabal new-build --enable-documentation --haddock-for-hackage
 	cabal new-haddock
 
 build-pedantic:
-	stack build --fast --pedantic
+	stack build --fast --pedantic
diff --git a/exercises/index.js b/exercises/index.js
@@ -9,9 +9,9 @@ const fail = () => {
 if (!n) fail()
 
 switch (n) {
-  case "1": return require('./Ex01StaticString/static-string.js')
-  case "2": return require('./Ex02Echo/echo.js')
-  case "3": return require('./Ex03CaseMatch/case-match.js')
-  case "4": return require('./Ex04StringManipulation/string-manipulation.js')
+  case "1": return require('./src/Ex01StaticString/static-string.js')
+  case "2": return require('./src/Ex02Echo/echo.js')
+  case "3": return require('./src/Ex03CaseMatch/case-match.js')
+  case "4": return require('./src/Ex04StringManipulation/string-manipulation.js')
   default: fail()
 }
diff --git a/package.yaml → exercises/package.yaml b/package.yaml → exercises/package.yaml
@@ -1,14 +1,11 @@
-name:                zero-bs
+name:                zero-exercises
 version:             0.1.0.0
 github:              "alpacaaa/zero-haskell"
 license:             BSD3
 author:              "Marco Sampellegrini"
 maintainer:          "babbonatale@alpcaaa.net"
 copyright:           "2019 Marco Sampellegrini"
 
-extra-source-files:
-- ZERO-BS.md
-
 ghc-options:
   - -Wall
   # - -Werror
@@ -34,17 +31,13 @@ dependencies:
 - text
 - wai
 - wai-cors
-
-library:
-  source-dirs: src
+- zero-bs
 
 executables:
   exercises:
     main:                Main.hs
-    source-dirs:         exercises
+    source-dirs:         src
     ghc-options:
     - -threaded
     - -rtsopts
     - -with-rtsopts=-N
-    dependencies:
-    - zero-bs
diff --git a/exercises/run-tests b/exercises/run-tests
@@ -2,17 +2,15 @@
 
 set -ex
 
-cd exercises
-
 run-with () {
-  # $1: ex number
-  # $2: program (ie. node index.js)
+  exercise=$1
+  command=$2
 
-  echo "Running exercise $1"
-  $2 $1 &
+  echo "Running exercise $exercise"
+  $command $exercise &
   PID=$!
 
-  EXERCISE=$1 npx mocha test-runner-node.js || {
+  EXERCISE=$exercise npx mocha test-runner-node.js || {
     echo "Test failed"
     kill -9 $PID
     exit 1
@@ -42,4 +40,4 @@ stack build --fast
 run 1
 run 2
 run 3
-run 4
+run 4
diff --git a/exercises/Ex01StaticString/StaticString.hs → ...ises/src/Ex01StaticString/StaticString.hs b/exercises/Ex01StaticString/StaticString.hs → ...ises/src/Ex01StaticString/StaticString.hs
diff --git a/exercises/Ex01StaticString/static-string.js → ...ses/src/Ex01StaticString/static-string.js b/exercises/Ex01StaticString/static-string.js → ...ses/src/Ex01StaticString/static-string.js
diff --git a/exercises/Ex01StaticString/test.js → exercises/src/Ex01StaticString/test.js b/exercises/Ex01StaticString/test.js → exercises/src/Ex01StaticString/test.js
diff --git a/exercises/Ex02Echo/Echo.hs → exercises/src/Ex02Echo/Echo.hs b/exercises/Ex02Echo/Echo.hs → exercises/src/Ex02Echo/Echo.hs
diff --git a/exercises/Ex02Echo/echo.js → exercises/src/Ex02Echo/echo.js b/exercises/Ex02Echo/echo.js → exercises/src/Ex02Echo/echo.js
diff --git a/exercises/Ex02Echo/test.js → exercises/src/Ex02Echo/test.js b/exercises/Ex02Echo/test.js → exercises/src/Ex02Echo/test.js
diff --git a/exercises/Ex03CaseMatch/CaseMatch.hs → exercises/src/Ex03CaseMatch/CaseMatch.hs b/exercises/Ex03CaseMatch/CaseMatch.hs → exercises/src/Ex03CaseMatch/CaseMatch.hs
diff --git a/exercises/Ex03CaseMatch/case-match.js → exercises/src/Ex03CaseMatch/case-match.js b/exercises/Ex03CaseMatch/case-match.js → exercises/src/Ex03CaseMatch/case-match.js
diff --git a/exercises/Ex03CaseMatch/test.js → exercises/src/Ex03CaseMatch/test.js b/exercises/Ex03CaseMatch/test.js → exercises/src/Ex03CaseMatch/test.js
diff --git a/...4StringManipulation/StringManipulation.hs → ...4StringManipulation/StringManipulation.hs b/...4StringManipulation/StringManipulation.hs → ...4StringManipulation/StringManipulation.hs
diff --git a/...StringManipulation/string-manipulation.js → ...StringManipulation/string-manipulation.js b/...StringManipulation/string-manipulation.js → ...StringManipulation/string-manipulation.js
diff --git a/exercises/Ex04StringManipulation/test.js → exercises/src/Ex04StringManipulation/test.js b/exercises/Ex04StringManipulation/test.js → exercises/src/Ex04StringManipulation/test.js
diff --git a/exercises/Main.hs → exercises/src/Main.hs b/exercises/Main.hs → exercises/src/Main.hs
diff --git a/exercises/stack.yaml b/exercises/stack.yaml
@@ -0,0 +1,66 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+# resolver: ghcjs-0.1.0_ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-12.17
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+# - location:
+#    git: https://github.com/commercialhaskell/stack.git
+#    commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#  subdirs:
+#  - auto-update
+#  - wai
+packages:
+- .
+- ../library/
+# Dependency packages to be pulled from upstream that are not in the resolver
+# using the same syntax as the packages field.
+# (e.g., acme-missiles-0.3)
+# extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+# flags: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=1.7"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor
diff --git a/exercises/test-runner.js b/exercises/test-runner.js
@@ -5,10 +5,10 @@ const chaiHttp = require('chai-http')
 chai.use(chaiHttp)
 const should = chai.should()
 
-const Ex01 = require('./Ex01StaticString/test.js')
-const Ex02 = require('./Ex02Echo/test.js')
-const Ex03 = require('./Ex03CaseMatch/test.js')
-const Ex04 = require('./Ex04StringManipulation/test.js')
+const Ex01 = require('./src/Ex01StaticString/test.js')
+const Ex02 = require('./src/Ex02Echo/test.js')
+const Ex03 = require('./src/Ex03CaseMatch/test.js')
+const Ex04 = require('./src/Ex04StringManipulation/test.js')
 
 //const exercise = process.env.EXERCISE
 

diff --git a/zero-bs.cabal → exercises/zero-exercises.cabal b/zero-bs.cabal → exercises/zero-exercises.cabal
@@ -4,9 +4,9 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: ac687b4294cedadd1cb5c2b987b86f918d99b3e73dd55127f6115b8f188622c9
+-- hash: 3e51c5d5ed4a52fba4db0938a68cefb6b63103f4cea2e6e193a2367edfc9ba00
 
-name:           zero-bs
+name:           zero-exercises
 version:        0.1.0.0
 synopsis:       A simple and mildly useful webserver library.
 description:    Please see the README on GitHub at <https://github.com/alpacaaa/zero-haskell#readme>
@@ -17,47 +17,22 @@ author:         Marco Sampellegrini
 maintainer:     babbonatale@alpcaaa.net
 copyright:      2019 Marco Sampellegrini
 license:        BSD3
-license-file:   LICENSE
 build-type:     Simple
-extra-source-files:
-    ZERO-BS.md
 
 source-repository head
   type: git
   location: https://github.com/alpacaaa/zero-haskell
 
-library
-  exposed-modules:
-      Zero.Server
-  other-modules:
-      Paths_zero_bs
-  hs-source-dirs:
-      src
-  ghc-options: -Wall
-  build-depends:
-      aeson
-    , base >=4.11 && <5
-    , bytestring
-    , containers
-    , http-types
-    , random
-    , scotty
-    , stm
-    , text
-    , wai
-    , wai-cors
-  default-language: Haskell2010
-
 executable exercises
   main-is: Main.hs
   other-modules:
       Ex01StaticString.StaticString
       Ex02Echo.Echo
       Ex03CaseMatch.CaseMatch
       Ex04StringManipulation.StringManipulation
-      Paths_zero_bs
+      Paths_zero_exercises
   hs-source-dirs:
-      exercises
+      src
   ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       aeson

diff --git a/library/package.yaml b/library/package.yaml
@@ -0,0 +1,37 @@
+name:                zero-bs
+version:             0.1.0.0
+github:              "alpacaaa/zero-haskell"
+license:             BSD3
+author:              "Marco Sampellegrini"
+maintainer:          "babbonatale@alpcaaa.net"
+copyright:           "2019 Marco Sampellegrini"
+
+
+ghc-options:
+  - -Wall
+  # - -Werror
+
+# Metadata used when publishing your package
+synopsis:            A simple and mildly useful webserver library.
+category:            Web
+
+# To avoid duplicated efforts in documentation and dealing with the
+# complications of embedding Haddock markup inside cabal files, it is
+# common to point users to the README.md file.
+description:         Please see the README on GitHub at <https://github.com/alpacaaa/zero-haskell#readme>
+
+dependencies:
+- aeson
+- base >= 4.11 && < 5
+- bytestring
+- containers
+- http-types
+- random
+- scotty
+- stm
+- text
+- wai
+- wai-cors
+
+library:
+  source-dirs: src
diff --git a/src/Zero/Server.hs → library/src/Zero/Server.hs b/src/Zero/Server.hs → library/src/Zero/Server.hs
diff --git a/stack.yaml → library/stack.yaml b/stack.yaml → library/stack.yaml
diff --git a/library/zero-bs.cabal b/library/zero-bs.cabal
@@ -0,0 +1,46 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.31.1.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 9ef340270fd311f3f7eaa31a46d414271e29e0230a0e3deef28d0bae88e5a34b
+
+name:           zero-bs
+version:        0.1.0.0
+synopsis:       A simple and mildly useful webserver library.
+description:    Please see the README on GitHub at <https://github.com/alpacaaa/zero-haskell#readme>
+category:       Web
+homepage:       https://github.com/alpacaaa/zero-haskell#readme
+bug-reports:    https://github.com/alpacaaa/zero-haskell/issues
+author:         Marco Sampellegrini
+maintainer:     babbonatale@alpcaaa.net
+copyright:      2019 Marco Sampellegrini
+license:        BSD3
+build-type:     Simple
+
+source-repository head
+  type: git
+  location: https://github.com/alpacaaa/zero-haskell
+
+library
+  exposed-modules:
+      Zero.Server
+  other-modules:
+      Paths_zero_bs
+  hs-source-dirs:
+      src
+  ghc-options: -Wall
+  build-depends:
+      aeson
+    , base >=4.11 && <5
+    , bytestring
+    , containers
+    , http-types
+    , random
+    , scotty
+    , stm
+    , text
+    , wai
+    , wai-cors
+  default-language: Haskell2010