Skip to content
Open
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
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ gem 'pg'
gem 'sequel'
gem 'fog-aws'
gem 'etna'
gem 'dav4rack', git: 'https://github.com/planio-gmbh/dav4rack.git', branch: 'master'
gem 'bundler'

group :test do
gem 'rspec'
Expand All @@ -17,5 +19,7 @@ group :test do
gem 'timecop'
gem 'database_cleaner'
gem 'pry'
gem 'ruby-debug-ide'
gem 'debase'
gem 'pry-byebug'
end
24 changes: 24 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
GIT
remote: https://github.com/planio-gmbh/dav4rack.git
revision: 44ea2306904b9777c2eb09945973581947552a6c
branch: master
specs:
dav4rack (1.1.0)
addressable (>= 2.5.0)
nokogiri (>= 1.6.0)
ox (>= 2.1.0)
rack (>= 1.6)
uuidtools (~> 2.1.1)

GEM
remote: https://rubygems.org/
specs:
Expand All @@ -17,6 +29,9 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
database_cleaner (1.8.5)
debase (0.2.4.1)
debase-ruby_core_source (>= 0.10.2)
debase-ruby_core_source (0.10.9)
diff-lcs (1.3)
docile (1.3.2)
etna (0.1.12)
Expand Down Expand Up @@ -61,6 +76,7 @@ GEM
connection_pool (~> 2.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
ox (2.13.2)
pg (1.2.3)
pry (0.13.1)
coderay (~> 1.1)
Expand All @@ -72,6 +88,7 @@ GEM
rack (2.2.2)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rake (13.0.1)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
Expand All @@ -85,6 +102,8 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.3)
ruby-debug-ide (0.7.2)
rake (>= 0.8.1)
safe_yaml (1.0.5)
sequel (5.32.0)
simplecov (0.18.5)
Expand All @@ -95,6 +114,7 @@ GEM
timecop (0.9.1)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uuidtools (2.1.5)
webmock (3.8.3)
addressable (>= 2.3.6)
crack (>= 0.3.2)
Expand All @@ -105,7 +125,10 @@ PLATFORMS
ruby

DEPENDENCIES
bundler
database_cleaner
dav4rack!
debase
etna
factory_bot
fog-aws
Expand All @@ -115,6 +138,7 @@ DEPENDENCIES
rack
rack-test
rspec
ruby-debug-ide
sequel
simplecov
timecop
Expand Down
2 changes: 1 addition & 1 deletion config.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

:development:
:log_file: log/error.log
:auth_redirect: https://janus.etna-development.local
:auth_redirect: https://janus.development.local
:token_name: JANUS_DEV_TOKEN
:token_algo: RS256
:metis_uid_name: METIS_DEV_UID
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ x-metis_base: &metis_base
COVERAGE: 'true'
DATABASE_HOST: 'db'
METIS_ENV: 'development'
entrypoint: docker/app/docker-entrypoint.sh

services:
metis_app:
Expand Down
3 changes: 1 addition & 2 deletions docker/app/Dockerfile.development
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ RUN gem install bundler --default -v "=$BUNDLER_VERSION"
RUN gem update --system

# We also the GEM_PATH to be this BUNDLE_PATH so that ides (Rubymine) will find gems easier.
ENV GEM_HOME="$BUNDLE_PATH"
ENV GEM_PATH="/root/.gem/ruby/2.5.0:/usr/local/lib/ruby/gems/2.5.0:/usr/local/bundle:$BUNDLE_PATH"
ENV GEM_PATH="/root/.gem/ruby/2.5.0:/usr/local/lib/ruby/gems/2.5.0:/usr/local/bundle:$BUNDLE_PATH/ruby/2.5.0"

# bash improvements for developer environment
RUN git clone --depth=1 https://github.com/Bash-it/bash-it.git ~/.bash_it && \
Expand Down
1 change: 1 addition & 0 deletions lib/metis.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
require 'fileutils'
require_relative 'archiver'
require_relative 'assimilation'
require_relative 'web_dav_resource'

# This class handles the http request and routing
class Metis
Expand Down
Loading