Commit 109647e3 authored by Nish Tahir's avatar Nish Tahir

Merge branch 'develop'

* develop:
  Spring server is now functional. Remove boot strap
  Minor bug fixes. Fix auto versioning
  Fixed bug where snack food reacts when users mention themselves.
  Fix bug where usernames with . weren't parsed correctly

* master:
  Dirty hack to properly server tagged releases.
parents ba95c24b 386b4b25
Pipeline #4657266 canceled with stages
......@@ -259,4 +259,5 @@ data/
plugins/
repo/
*.sqlite
config.yml
\ No newline at end of file
config.yml
.version
\ No newline at end of file
......@@ -24,6 +24,7 @@ build:
script:
- ./gradlew -g $GRADLE_USER_HOME clean assemble
- ./gradlew -g $GRADLE_USER_HOME createDockerfile
- ./gradlew -g $GRADLE_USER_HOME cacheVersion
allow_failure: false
test:
......@@ -38,9 +39,9 @@ release:
- docker:dind
stage: release
script:
- export BUILD_VER=$(git describe --tags)
- docker build -t registry.gitlab.com/nishtahir/linkbait:$BUILD_VER $BUILD_DIR/linkbait/docker/
- docker build -t registry.gitlab.com/nishtahir/linkbait:latest $BUILD_DIR/linkbait/docker/
- export BUILD_VER=$(cat .version)
- docker build -t registry.gitlab.com/nishtahir/linkbait:$BUILD_VER $BUILD_DIR/linkbait-server/docker/
- docker build -t registry.gitlab.com/nishtahir/linkbait:latest $BUILD_DIR/linkbait-server/docker/
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com
- docker push registry.gitlab.com/nishtahir/linkbait:$BUILD_VER
- docker push registry.gitlab.com/nishtahir/linkbait:latest
......
/**
* Script to include kotlin
*/
buildscript {
ext.kotlin_version = '1.0.2'
ext.dokka_version = '0.9.9'
......@@ -52,70 +49,3 @@ subprojects {
task wrapper(type: Wrapper) {
gradleVersion = '2.14.1'
}
apply plugin: 'kotlin'
apply plugin: 'application'
apply plugin: 'com.bmuschko.docker-java-application'
import com.bmuschko.gradle.docker.tasks.image.Dockerfile
mainClassName = 'com.nishtahir.linkbait.Application'
version = getVersion()
task copyDockerArchiveResources(type: Copy) {
dependsOn distTar
from { distTar.archivePath }
into { createDockerfile.destFile.parentFile }
}
task createDockerfile(type: Dockerfile) {
dependsOn copyDockerArchiveResources
destFile = project.file("$project.buildDir/docker/Dockerfile")
from 'nishtahir/openjfx:8-jre'
maintainer 'Nish Tahir <nishtahir@outlook.com>'
addFile({ distTar.archivePath.name }, { '/' })
entryPoint { getEntryPoint() }
exposePort 8080
}
def getEntryPoint() {
String installDir = distTar.archiveName - ".${distTar.extension}"
"/$installDir/bin/$project.applicationName".toString()
}
def getVersion() {
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'describe', '--tags'
standardOutput = stdout
}
def matcher = stdout.toString().trim() =~ /^(\d+)\.(\d+)-(\d+)-g([a-zA-z0-9]+)$/
if (matcher.matches()) {
def major = matcher.group(1)
def minor = matcher.group(2)
def patch = matcher.group(3)
def preRelease = matcher.group(4)
return "${major}.${minor}.${patch}-${preRelease}"
}
}
task printVersion() {
println version
}
dependencies {
compile project(':linkbait-core')
compile project(':linkbait-server')
compile 'org.slf4j:slf4j-simple:1.7.21'
compile 'com.beust:jcommander:1.48'
compile 'com.brsanthu:google-analytics-java:1.1.2'
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:1.0.2"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
testCompile "org.jetbrains.spek:spek:$spek_version"
}
......@@ -183,5 +183,4 @@ class SlackBot extends AbstractBot {
}
return message
}
}
package com.nishtahir.linkbait.plugin.common
package com.nishtahir.linkbait.commons
import org.openqa.selenium.WebDriver
interface BrowserAction {
......
package com.nishtahir.linkbait.plugin.common
package com.nishtahir.linkbait.commons
import com.machinepublishers.jbrowserdriver.JBrowserDriver
import com.machinepublishers.jbrowserdriver.Settings
......
package com.nishtahir.linkbait.plugin.common
package com.nishtahir.linkbait.commons
import com.machinepublishers.jbrowserdriver.JBrowserDriver
import org.apache.commons.pool2.PooledObjectFactory
......
package com.nishtahir.linkbait.plugin.common
package com.nishtahir.linkbait.commons
import com.machinepublishers.jbrowserdriver.JBrowserDriver
import org.apache.commons.pool2.impl.GenericObjectPoolConfig
......
able
abnormal
absent
absolute
abstract
abundant
academic
acceptable
accessible
accurate
active
acute
addicted
adequate
aesthetic
afraid
aggressive
agile
agricultural
alert
alive
aloof
amber
ambiguous
ambitious
ample
angry
annual
anonymous
applied
appropriate
arbitrary
archaeological
arrogant
artificial
artistic
ashamed
asleep
assertive
astonishing
attractive
automatic
available
awake
aware
awful
awkward
bad
balanced
bald
bare
basic
beautiful
bitter
black
bland
blank
blind
blonde
bloody
bold
brave
broken
brown
bureaucratic
busy
capable
careful
cautious
central
certain
characteristic
charismatic
cheap
cheerful
childish
chronic
civic
civilian
classical
clean
clear
close
closed
cold
color-blind
colourful
comfortable
commercial
common
comparable
compatible
competent
competitive
complete
complex
comprehensive
concrete
confident
conscious
conservative
considerable
consistent
constant
constitutional
constructive
content
continental
continuous
controversial
convenient
conventional
cool
cooperative
corporate
critical
crude
cruel
cultural
curious
current
cute
daily
dangerous
dark
dead
deadly
deaf
decisive
decorative
deep
definite
delicate
democratic
dependent
desirable
different
difficult
digital
diplomatic
direct
dirty
discreet
distant
distinct
domestic
dominant
dramatic
dry
due
dull
dynamic
eager
early
easy
economic
educational
effective
efficient
electronic
elegant
eligible
eloquent
emotional
empirical
empty
encouraging
enjoyable
enthusiastic
environmental
equal
essential
established
eternal
ethical
ethnic
even
exact
excited
exciting
exclusive
exotic
expected
expensive
experienced
experimental
explicit
express
external
extinct
extraordinary
fair
faithful
false
familiar
far
fashionable
fast
fastidious
fat
favorable
federal
feminine
financial
fine
finished
first
firsthand
flat
flawed
flexible
foolish
formal
forward
fragrant
frank
free
frequent
fresh
friendly
frozen
full
full-time
functional
funny
general
generous
genetic
genuine
geological
glad
glorious
good
gradual
grand
graphic
grateful
great
green
gregarious
handy
happy
hard
harmful
harsh
healthy
heavy
helpful
helpless
high
hilarious
historical
holy
homosexual
honest
honorable
horizontal
hostile
hot
huge
human
hungry
ignorant
illegal
immune
imperial
implicit
important
impossible
impressive
inadequate
inappropriate
incapable
incongruous
incredible
independent
indigenous
indirect
indoor
industrial
inevitable
infinite
influential
informal
inner
innocent
insufficient
integrated
intellectual
intense
interactive
interesting
intermediate
internal
international
invisible
irrelevant
jealous
joint
judicial
junior
just
kind
large
last
late
latest
lazy
left
legal
legislative
liberal
light
likely
limited
linear
liquid
literary
live
lively
logical
lonely
long
loose
lost
loud
low
loyal
lucky
magnetic
main
major
manual
marine
married
mathematical
mature
maximum
meaningful
mechanical
medieval
memorable
mental
middle-class
mild
military
minimum
minor
miserable
mobile
modern
modest
molecular
monstrous
monthly
moral
moving
multiple
municipal
musical
mutual
narrow
national
native
necessary
negative
nervous
neutral
new
nice
noble
noisy
normal
notorious
nuclear
obese
objective
obscure
obvious
occupational
odd
offensive
official
old
open
operational
opposed
optimistic
optional
oral
ordinary
organic
original
orthodox
other
outer
outside
painful
parallel
paralyzed
parental
particular
part-time
passionate
passive
past
patient
peaceful
perfect
permanent
persistent
personal
petty
philosophical
physical
plain
pleasant
polite
political
poor
popular
portable
positive
possible
powerful
practical
precise
predictable
pregnant
premature
present
presidential
primary
private
privileged
productive
professional
profound
progressive
prolonged
proper
proportional
proud
provincial
public
pure
qualified
quantitative
quiet
racial
random
rare
rational
raw
ready
real
realistic
reasonable
reckless
regional
regular
related
relative
relevant
reliable
religious
representative
resident
residential
respectable
responsible
restless
restricted
retired
revolutionary
rich
right
romantic
rotten
rough
round
rural
sacred
sad
safe
satisfactory
satisfied
scientific
seasonal
secondary
secular
secure
senior
sensitive
separate
serious
sexual
shallow
sharp
short
shy
sick
similar
single
skilled
slippery
slow
small
smart
smooth
social
socialist
soft
solar
solid
sophisticated
sound
sour
spatial
specified
spontaneous
square
stable
standard
statistical
steady
steep
sticky
still
straight
strange
strategic
strict
strong
structural
stubborn
stunning
stupid
subjective
subsequent
successful
sudden
sufficient
superior
supplementary
surprised
surprising
sweet
sympathetic
systematic
talented
talkative
tall
tasty
technical
temporary
tender
tense
terminal
thick
thin
thirsty
thoughtful
tidy
tight
tired
tolerant
tough
toxic
traditional
transparent
trivial
tropical
true
typical
ugly
ultimate
unanimous
unaware
uncomfortable
uneasy
unemployed
unexpected
unfair
unfortunate
uniform
unique
universal
unlawful
unlike
unlikely
unpleasant
urban
useful
useless