Merge pull request #518 from AmpersandTarski/development

Release 3.7.0

.travis.yml

@@ -68,6 +68,8 @@ install:
        cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0;;
    esac
 
+before_script: composer install
+
 script:
  - case "$BUILD" in 
      stack)

ReleaseNotes.md

@@ -1,5 +1,13 @@
 # Release notes of Ampersand
 
+## v3.7.0 (2 september 2016)
+  * [Issue #506](https://github.com/AmpersandTarski/Ampersand/issues/506) Bugfix in chapter diagnosis of Func. spec. 
+  * [Issue #483](https://github.com/AmpersandTarski/Ampersand/issues/483) Introduction of proper way to produce exit codes of Ampersand
+  * [Issue #502](https://github.com/AmpersandTarski/Ampersand/issues/502) More stable way to generate .pdf file (LaTeX output)
+  * [Issue  #72](https://github.com/AmpersandTarski/Ampersand/issues/72) Symmetry of relations will be checked by a generated application
+  * [Issue #256](https://github.com/AmpersandTarski/Ampersand/issues/256) Surjectivity of relations will be checked by a generated application
+  * [Issue #345](https://github.com/AmpersandTarski/Ampersand/issues/345) Surjectivity of relations will be checked by a generated application
+
 ## v3.6.1 (5 august 2016)
   * [Issue #488](https://github.com/AmpersandTarski/Ampersand/issues/488) Performance enhancement: Added indexes on table columns when possible
   * [Issue #486](https://github.com/AmpersandTarski/Ampersand/issues/486) Performance enhancement: Removed DISTINCT in subqueries

Setup.hs

@@ -45,7 +45,7 @@ generateBuildInfoHook pd  lbi uh bf =
     }
 
 buildInfoModuleName :: String
-buildInfoModuleName = "Database.Design.Ampersand.Basics.BuildInfo_Generated"
+buildInfoModuleName = "Ampersand.Basics.BuildInfo_Generated"
 
 buildInfoModule :: String -> String -> String -> String
 buildInfoModule cabalVersion gitInfo time = unlines
@@ -118,7 +118,7 @@ warnNoCommitInfo =
 -}
 
 staticFileModuleName :: String
-staticFileModuleName = "Database.Design.Ampersand.Prototype.StaticFiles_Generated"
+staticFileModuleName = "Ampersand.Prototype.StaticFiles_Generated"
 
 generateStaticFileModule :: IO ()
 generateStaticFileModule =

app/Main.hs

@@ -0,0 +1,17 @@
+module Main where
+
+import Data.List
+import Prelude hiding (putStr)
+import Ampersand
+
+main :: IO ()
+main =
+ do opts <- getOptions
+    if showVersion opts || showHelp opts
+    then mapM_ putStr (helpNVersionTexts ampersandVersionStr opts)
+    else do gFSpec <- createFSpec opts
+            case gFSpec of
+              Errors err    -> exitWith . NoValidFSpec . intersperse  (replicate 30 '=') . map showErr $ err
+              Checked fSpec -> generateAmpersandOutput fSpec
+
+

src/RegressionTest.hs → app/RegressionTest.hs

@@ -1,17 +1,12 @@
 module Main (main) where
 
 import Conduit
---import qualified Data.Conduit.List as CL
---import qualified Data.Conduit.Binary as CB
-
 import System.FilePath ((</>))
 import Control.Monad --(filterM, forM_, foldM,when)
 import System.IO.Error (tryIOError)
 import System.Directory (getDirectoryContents, doesFileExist, doesDirectoryExist)
---import Control.Monad.Trans.Class (lift)
---import Data.Conduit
 import System.Exit --(ExitCode, exitFailure, exitSuccess)
-import Database.Design.Ampersand.Test.Regression
+import Ampersand.Test.Regression(DirContent(..),DirData(..),process)
 
 main :: IO ExitCode
 main = do 

src/Test.hs → app/Test.hs

@@ -1,10 +1,12 @@
 module Main (main) where
 
-import Database.Design.Ampersand.Misc.Options(getOptions,Options)
-import Database.Design.Ampersand.Test.TestScripts (getTestScripts,testAmpersandScripts)
-import Database.Design.Ampersand.Test.Parser.ParserTest (parseScripts)
-import Database.Design.Ampersand.Test.Parser.QuickChecks (parserQuickChecks)
+--import Ampersand.Misc.Options(getOptions,Options)
+--import Ampersand.Test.TestScripts (getTestScripts,testAmpersandScripts)
+--import Ampersand.Test.Parser.ParserTest (parseScripts)
+--import Ampersand.Test.Parser.QuickChecks (parserQuickChecks)
 import System.Exit (ExitCode, exitFailure, exitSuccess)
+import Ampersand
+import Prelude hiding (putStrLn)
 
 testFunctions :: Options -> IO [([String], IO Bool)]
 testFunctions opts =
@@ -28,9 +30,9 @@ main = do opts <- getOptions
           tests funcs
     where tests :: [([String], IO Bool)] -> IO ExitCode
           tests [] = exitSuccess
-          tests ((msg,test):xs) =
+          tests ((msg,tst):xs) =
             do mapM_ putStrLn msg
-               success <- test
+               success <- tst
                if success then tests xs
                else do putStrLn "*** Something went wrong here***" 
                        exitFailure

appveyor.yml

@@ -46,6 +46,7 @@ artifacts:
 # Auto-deploy
 # specify that, for each build that completes, AppVeyor should push
 # a release with the right tag to the GitHub releases page! 
+# We only release when the branch == master.
 # (Note: probably we would want to be a bit more 
 # elaborate about when we push to the releases page; making sure 
 # that we include proper release notes, etc.)
@@ -56,6 +57,7 @@ deploy:
     auth_token:
       secure: B9wxH2Me3jIbEn9xlvIY9SEWdELRgKMtEZeQZmJQm5wMGjp4YF4wQmAHCy3ofTJG
     artifact: Windows binary
-
+    on:
+      branch: master  
 
 

composer.json

@@ -0,0 +1,5 @@
+{
+    "autoload": {
+        "psr-4": { "": "src/" }
+    }
+}