Add Gitea action for CI

Reviewed-on: #5

.drone.yml

@@ -0,0 +1,9 @@
+kind: pipeline
+name: default
+
+steps:
+- name: test
+  image: ruby
+  commands:
+  - bundle install --jobs=3 --retry=3
+  - rake test

.gitea/workflows/ruby.yml

@@ -0,0 +1,33 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1']
+        redis-version: [6, 7]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Start Redis
+      uses: supercharge/redis-github-action@1.4.0
+      with:
+        redis-version: ${{ matrix.redis-version }}
+    - name: Configure
+      run: cp config.yml.erb.example config.yml.erb
+    - name: Run tests
+      run: bundle exec rake test

Dockerfile

@@ -1,8 +1,7 @@
-# FROM ruby:3.1.4
+FROM ruby:3.1.4
-FROM ruby:2.7.8
 
 WORKDIR /liquorcabinet
-ENV RACK_ENV=staging
+ENV RACK_ENV=production
 
 COPY Gemfile Gemfile.lock /liquorcabinet/
 RUN bundle install

config.yml.erb.example

@@ -2,11 +2,11 @@ development: &defaults
   maintenance: false
   redis:
     host: <%= ENV["REDIS_HOST"] || "localhost" %>
-    port: <%= ENV["REDIS_PORT"] || "6379" %>
+    port: <%= ENV["REDIS_PORT"] || 6379 %>
-    db: <%= ENV["REDIS_DB"] || 0 %>
+    db: <%= ENV["REDIS_DB"] || 1 %>
   s3: &s3_defaults
     endpoint: <%= ENV["S3_ENDPOINT"] || "http://127.0.0.1:9000" %>
-    region: <%= ENV["S3_REGION"] %>
+    region: <%= ENV["S3_REGION"] || "us-east-1" %>
     access_key_id: <%= ENV["S3_ACCESS_KEY"] || "minioadmin" %>
     secret_key_id: <%= ENV["S3_SECRET_KEY"] || "minioadmin" %>
     bucket: <%= ENV["S3_BUCKET"] || "rs-development" %>

lib/remote_storage/s3.rb

@@ -36,10 +36,6 @@ module RemoteStorage
           timestamp_for(res.headers[:date]) # S3 does not return a Last-Modified response header on PUTs
         ]
       end
-
-    rescue RestClient::Forbidden => ex
-      puts ex.response.to_s
-      raise ex
     end
 
     def do_get_request(url, &block)
@@ -53,14 +49,14 @@ module RemoteStorage
 
     def do_head_request(url, &block)
       deal_with_unauthorized_requests do
-        auth_headers = auth_headers_for("HEAD", url, {})
+        auth_headers = auth_headers_for("HEAD", url)
         RestClient.head(url, auth_headers, &block)
       end
     end
 
     def do_delete_request(url)
       deal_with_unauthorized_requests do
-        auth_headers = auth_headers_for("DELETE", url, {})
+        auth_headers = auth_headers_for("DELETE", url)
         RestClient.delete(url, auth_headers)
       end
     end
@@ -79,12 +75,10 @@ module RemoteStorage
       return found
     end
 
-    def auth_headers_for(http_method, url, headers, data = nil)
+    def auth_headers_for(http_method, url, headers = {}, data = nil)
       signature = s3_signer.sign_request(
         http_method: http_method, url: url, headers: headers, body: data
       )
-
-      puts signature.headers.inspect
       signature.headers
     end
 

liquor-cabinet.rb

@@ -64,7 +64,7 @@ class LiquorCabinet < Sinatra::Base
       headers 'Access-Control-Allow-Origin' => '*',
               'Access-Control-Allow-Methods' => 'GET, PUT, DELETE',
               'Access-Control-Allow-Headers' => 'Authorization, Content-Type, Origin, If-Match, If-None-Match, Range',
-              'Access-Control-Expose-Headers' => 'ETag, Content-Length, Content-Range',
+              'Access-Control-Expose-Headers' => 'ETag, Content-Length, Content-Range, Content-Type',
               'Accept-Ranges' => 'bytes'
       headers['Access-Control-Allow-Origin'] = env["HTTP_ORIGIN"] if env["HTTP_ORIGIN"]
       headers['Cache-Control'] = 'no-cache'

run-dev.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RACK_ENV=staging \
+RACK_ENV=development \
 REDIS_HOST=localhost \
 REDIS_PORT=6379 \
 REDIS_DB=1 \
@@ -8,4 +8,4 @@ S3_ENDPOINT='http://localhost:9000' \
 S3_ACCESS_KEY='dev-key' \
 S3_SECRET_KEY='123456789' \
 S3_BUCKET=remotestorage \
-bundle exec rainbows --listen localhost:4567
+bundle exec rackup -p 4567