diff --git a/README.md b/README.md index 81044c3..c901ca8 100644 --- a/README.md +++ b/README.md @@ -20,58 +20,6 @@ using(_ url "http://api.rest.org/person") { implicit rb => } ``` -## The Plan - -I plan for this to be a useful resource for writing REST web service system tests. However my initial focus is learning and documenting the creation of a Scala DSL. The progress on the implementation is slow because I am documenting my understanding of DSLs as I go. - -You can follow the [progress on my blog](http://iainhull.github.io/tags.html#resttest-ref): - -* [The Builder Pattern](http://iainhull.github.io/2013/07/01/a-simple-rest-dsl-part-1/) -* [The Builder as the basis for a DSL](http://iainhull.github.io/2013/07/02/a-simple-rest-dsl-part-2/) -* [Extracting and asserting on response values](http://iainhull.github.io/2013/07/14/a-simple-rest-dsl-part-3/) -* [Grouping common request configuration with the `using` method](http://iainhull.github.io/2013/07/14/a-simple-rest-dsl-part-4/) -* [How to structure DLS projects](http://iainhull.github.io/2014/05/18/a-simple-rest-dsl-part-5/) -* [Improvements to Extractors](http://iainhull.github.io/2014/06/19/a-simple-rest-dsl-part-6/) -* Integrating RestTest with ScalaTest (planned) -* How to document a DLS (planned) -* Summary of Scala techniques and resources for creating DSLs (planned) - -## How to build - -This project has been migrated to Scala 2.11 and the build ported to [SBT](http://www.scala-sbt.org/). - -To download and build RestTest just: - -``` -git clone git@github.com:IainHull/resttest.git -cd resttest -sbt test -``` - -To create a fully configured eclipse project just: - -``` -sbt eclipse with-source=true -``` - - -### Old build using Gradle ### -This project used to be built with [gradle](http://www.gradle.org/). It still includes the gradle files and the gradle wrapper which will download gradle and build the project for you (the only prereq is Java). - -To download and build RestTest just: - -``` -git clone git@github.com:IainHull/resttest.git -cd resttest -./gradlew build -``` - -To create a fully configured eclipse project just: - -``` -./gradlew eclipse -``` - ## License RestTest is licensed under the permissive [Apache 2 Open Source License](http://www.apache.org/licenses/LICENSE-2.0.txt). diff --git a/build.gradle b/build.gradle deleted file mode 100644 index eb63cb9..0000000 --- a/build.gradle +++ /dev/null @@ -1,63 +0,0 @@ -apply plugin: 'scala' -apply plugin: 'eclipse' - -sourceCompatibility=1.7 -targetCompatibility=1.7 - -ext { - versions = [:] -} - -versions.scala = "2.10" -versions.jersey = "1.17.+" -versions.scalatest = "2.1.6" -versions.spray = "1.2.+" -versions.junit = "4.+" -versions.play = "2.+" - - -repositories { - mavenCentral() - - maven { - url "http://repo.typesafe.com/typesafe/releases/" - } - - maven { - url "http://repo.spray.io/" - } -} - -dependencies { - compile "org.scala-lang:scala-library:${versions.scala}.0" - compile "com.sun.jersey:jersey-core:${versions.jersey}" - compile "com.sun.jersey:jersey-client:${versions.jersey}" - compile "org.scalatest:scalatest_${versions.scala}:${versions.scalatest}" - compile "com.typesafe.play:play-json_${versions.scala}:${versions.play}" - - compile "io.spray:spray-can:${versions.spray}" - compile "io.spray:spray-routing:${versions.spray}" - compile "io.spray:spray-json_${versions.scala}:${versions.spray}" - compile "io.spray:spray-testkit:${versions.spray}" -// compile "com.typesafe.akka:akka-actor_${version.scala}:2.1.4" -// compile "com.typesafe.akka:akka-testkit_${version.scala}:2.1.4" - - testCompile "junit:junit:${versions.junit}" -} - -// Use the sbt compiler (not scalac ant task) -tasks.withType(ScalaCompile) { - scalaCompileOptions.useAnt = false -} - -task showCompileClasspath << { - sourceSets.main.compileClasspath.each { println it } -} - - -// Enable Scala console, Use: -// TERM=dumb gradle scalaConsole -scalaConsole.dependsOn(classes) -scalaConsole.classpath += sourceSets.main.output -scalaTestConsole.dependsOn(test) -scalaTestConsole.classpath += sourceSets.test.output diff --git a/build.sbt b/build.sbt index e7199f4..49c964d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,10 @@ +import sbtrelease.ReleasePlugin._ import Dependencies._ name := "resttest" +organization := "pl.newicom" + version := "0.1.0" scalaVersion := "2.11.5" @@ -10,9 +13,12 @@ resolvers += "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/" resolvers += "spray repo" at "http://repo.spray.io/" +publishMavenStyle := true + libraryDependencies ++= resttestDependencies dependencyOverrides += "org.slf4j" % "slf4j-api" % "1.7.2" parallelExecution in Test := false +Publish.settings ++ releaseSettings \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index b979729..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 6ee0d3f..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri May 23 17:04:05 IST 2014 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip diff --git a/gradlew b/gradlew deleted file mode 100755 index 91a7e26..0000000 --- a/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index aec9973..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/project/Publish.scala b/project/Publish.scala new file mode 100644 index 0000000..b90e20b --- /dev/null +++ b/project/Publish.scala @@ -0,0 +1,18 @@ +import sbt._ +import Keys._ +import xerial.sbt.Sonatype.sonatypeSettings + +object Publish { + lazy val settings = sonatypeSettings :+ (pomExtra := + + git@github.com:pawelkaczor/resttest.git + scm:git:git@github.com:pawelkaczor/resttest.git + scm:git:git@github.com:pawelkaczor/resttest.git + + + + newicom + Pawel Kaczor + + ) +} \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index e69de29..c9635e7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -0,0 +1,5 @@ +addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8") + +addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5") + +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1") \ No newline at end of file