Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ _yardoc
doc/
bin/

db/*.sqlite
.DS_Store
.localeapp
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ before_install:
- gem update bundler
- 'echo "RUBY_VERSION: $RUBY_VERSION"'
before_script:
- bundle exec rake db:create db:schema:load
- npm install -g mocha-phantomjs@4.1.0
- bundle exec rake test_js &> /dev/null &
- sleep 5
Expand All @@ -10,6 +11,8 @@ language: ruby
rvm:
- 2.7.2
- ruby-head
services:
- postgresql
matrix:
allow_failures:
- rvm: ruby-head
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ group :development do
gem "rubocop-rails", require: false
gem "rubocop-rake", require: false
gem "rubocop-rspec", require: false
gem "sqlite3"
end

group :development, :test do
Expand Down
2 changes: 0 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ GEM
rack (> 1, < 3)
sprockets-helpers (1.4.0)
sprockets (>= 2.2)
sqlite3 (1.4.2)
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
Expand Down Expand Up @@ -241,7 +240,6 @@ DEPENDENCIES
sinatra-flash
sprockets
sprockets-helpers
sqlite3
thread
timecop
uglifier
Expand Down
6 changes: 4 additions & 2 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ development:
pool: 5

test:
adapter: sqlite3
database: db/stringer_test.sqlite
adapter: postgresql
database: stringer_test
encoding: unicode
pool: 5

production:
url: <%= ENV["DATABASE_URL"] %>
Expand Down
Binary file added db/stringer_test.sqlite
Binary file not shown.
3 changes: 0 additions & 3 deletions docker/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
if [ -z "$DATABASE_URL" ]; then
cat <<-EOF
$(tput setaf 1)Error: no DATABASE_URL was specified.

For a quick start use DATABASE_URL="sqlite3:':memory:'"
(not recommended for production).
EOF

exit 1
Expand Down
6 changes: 3 additions & 3 deletions docs/VPS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ The first step is installing some essential dependencies from your VPS's package

#### Ubuntu/Debian

sudo apt-get install git libxml2-dev libxslt-dev libcurl4-openssl-dev libpq-dev libsqlite3-dev build-essential postgresql libreadline-dev
sudo apt-get install git libxml2-dev libxslt-dev libcurl4-openssl-dev libpq-dev build-essential postgresql libreadline-dev

#### CentOS/Fedora

sudo yum install git libxml2-devel libxslt-devel curl-devel postgresql-devel sqlite-devel make automake gcc gcc-c++ postgresql-server readline-devel openssl-devel
sudo yum install git libxml2-devel libxslt-devel curl-devel postgresql-devel make automake gcc gcc-c++ postgresql-server readline-devel openssl-devel

On CentOS after installing Postgres, I needed to run these commands, Fedora likely the same.

service postgresql initdb && service postgresql start

#### Arch Linux

pacman -S git postgresql base-devel libxml2 libxslt curl sqlite readline postgresql-libs
pacman -S git postgresql base-devel libxml2 libxslt curl readline postgresql-libs

Here are some Arch specific instructions for setting up postgres

Expand Down
13 changes: 0 additions & 13 deletions docs/docker.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
# Stringer on Docker

## Quick test setup

To quickly try out Stringer on your local machine run the following one liner:

```sh
docker run --rm -it -e DATABASE_URL="sqlite3:':memory:'" -p 8080:8080 mdswanson/stringer
```

Visit `http://localhost:8080` and enjoy Stringer!

**One caveat**: Stringer was not designed to be used with sqlite so you might run into some issues if you
have Stringer fetch many feeds. See [this issue](https://github.com/swanson/stringer/issues/164) for details.

## Production ready setup using docker-compose

Download [docker-compose.yml](../docker-compose.yml) and in the corresponding foler, run `docker-compose up -d`, give it a second and visit `localhost`
Expand Down