feat!: remove webpack from dependencies (#1304)

* fix: remove webpack from dependencies

This change removes webpack from the dependencies. It also upgrades
bootstrap to 5.0 using cdn links.

* fix: linting issue

* fix: specs

* fix: rollback default database

* fix: specs

* refactor: minor adjustments

* refactor: cleanup more tests

* fix: base64 spec

* refactor: avoid around_each for all specs

* fix: broken wrapper

* fix: fix REDIS_URL

* fix: make github action match docker compose

* fix: remove old crystal version file

* fix: update missing template changes

* fix: forcefully add public assets

* fix: remove cli from .gitignore

* fix: use latest images

* fix: remove nodejs from Dockerfile

* fix: remove node dependency

* fix: restore filter

* fix: missed in slang template

* fix: needs to be type module for ES6 support

* Remove garnet spec (#1306)

* fix: remove garnet_spec shard as dependency

* fix: specs

* 1227 fix layout equals false (#1307)

* fix: check for false

* fix: #1227 support LAYOUT=false

Author: drujensen

.crystal-version

@@ -0,0 +1,26 @@
+name: Docker CI
+
+on:
+  push:
+
+jobs:
+  docker:
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Start containers
+      run: docker-compose up -d redis postgres
+
+    - name: Build image
+      run: docker-compose build
+
+    - name: Run tests
+      run: docker-compose run spec
+
+    - name: Stop containers
+      if: always()
+      run: docker-compose down

.github/workflows/ci.yml

@@ -12,5 +12,4 @@ shard.lock
 package-lock.json
 node_modules
 /myapp
-cli
-cli.dwarf
+cli.dwarf

.github/workflows/docker-ci.yml

@@ -2,17 +2,13 @@ FROM crystallang/crystal:latest
 
 # Install Dependencies
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -qq && apt-get install -y --no-install-recommends libpq-dev libsqlite3-dev libmysqlclient-dev libreadline-dev git curl vim netcat
-
-# Install Node
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install -y nodejs
+RUN apt-get update -qq && apt-get install -y libpq-dev libsqlite3-dev libmysqlclient-dev libreadline-dev curl vim
 
 WORKDIR /opt/amber
 
 # Build Amber
 ENV PATH /opt/amber/bin:$PATH
 COPY . /opt/amber
-RUN shards build amber --ignore-crystal-version
+RUN shards build amber
 
 CMD ["crystal", "spec"]

.gitignore

@@ -3,8 +3,11 @@
 echo "Running './bin/ameba':"
 ./bin/ameba
 
-echo "\nRunning 'crystal tool --format --check':"
+echo "\nRunning 'crystal tool format --check':"
 crystal tool format --check
 
 echo "\nRunning 'crystal spec':"
 crystal spec
+
+echo "\nRunning 'crystal spec ./spec/build_spec_granite.cr':"
+crystal spec ./spec/build_spec_granite.cr

.travis.yml

@@ -1,22 +1,27 @@
 version: '2'
 services:
-  db:
-    image: postgres:10.2
+  postgres:
+    image: postgres
+    ports:
+      - 5432:5432
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: password
       POSTGRES_DB: test_app
+
   redis:
-    image: redis:5.0-alpine
+    image: redis
     command: redis-server
+    ports:
+      - 6379:6379
+
   spec:
     build: .
-    working_dir: /opt/amber
+    command: bin/amber_spec
     environment:
-      DATABASE_URL: 'postgres://postgres:password@db:5432/test_app'
+      DATABASE_URL: 'postgres://postgres:password@postgres:5432/test_app'
       REDIS_URL: 'redis://redis:6379'
       AMBER_ENV: test
-      CI: "true"
     depends_on:
       - redis
-      - db
+      - postgres

Dockerfile

@@ -30,6 +30,10 @@ dependencies:
     github: jeromegn/kilt
     version: ~> 0.6.0
 
+  slang:
+    github: jeromegn/slang
+    version: ~> 1.7.1
+
   liquid:
     github: dare892/liquid.cr
     branch: chore/bump-version-crystal1.0.0
@@ -58,10 +62,6 @@ dependencies:
     github: luckyframework/shell-table.cr
     version: ~> 0.9.3
 
-  slang:
-    github: jeromegn/slang
-    version: ~> 1.7.1
-
   inflector:
     github: phoffer/inflector.cr
     version: ~> 1.0.0

assets/js/amber.min.js

@@ -7,58 +7,66 @@ include CLIFixtures
 
 module Amber::CLI
   describe "database" do
-    ENV["AMBER_ENV"] = "test"
-
     describe "sqlite" do
-      context ENV["AMBER_ENV"] do
-        it "has connection settings in config/environments/env.yml" do
-          env_yml = prepare_test_app
-          env_yml["database_url"].should eq expected_db_url("sqlite3", env)
-          cleanup
-        end
+      it "has connection settings in config/environments/env.yml" do
+        db_url = ENV["DATABASE_URL"]?
 
-        it "does not create the database when db create" do
-          env_yml = prepare_test_app
-          db_filename = env_yml["database_url"].to_s.gsub("sqlite3:", "")
-          File.exists?(db_filename).should be_false
-          cleanup
+        if ENV["DATABASE_URL"]?
+          ENV.delete("DATABASE_URL")
         end
+        env_yml = prepare_test_app
+        env_yml["database_url"].should eq expected_db_url("sqlite3", env)
+        cleanup
 
-        it "creates the database when db migrate" do
-          env_yml = prepare_test_app
-          CLI.settings.database_url = env_yml["database_url"].to_s
+        unless ENV["DATABASE_URL"]?
+          ENV["DATABASE_URL"] = db_url
+        end
+      end
 
-          MainCommand.run ["generate", "model", "-y", "Post"]
-          MainCommand.run ["db", "migrate"]
+      it "creates and deletes the database when db migrate and drop" do
+        db_url = ENV["DATABASE_URL"]?
 
-          db_filename = CLI.settings.database_url.to_s.gsub("sqlite3:", "")
-          File.exists?(db_filename).should be_true
-          File.info(db_filename).size.should_not eq 0
-          cleanup
+        if ENV["DATABASE_URL"]?
+          ENV.delete("DATABASE_URL")
         end
 
-        it "deletes the database when db drop" do
-          env_yml = prepare_test_app
-          CLI.settings.database_url = env_yml["database_url"].to_s
+        env_yml = prepare_test_app
+        CLI.settings.database_url = env_yml["database_url"].to_s
+
+        MainCommand.run ["generate", "model", "-y", "Post"]
+        MainCommand.run ["db", "migrate"]
+
+        db_filename = CLI.settings.database_url.to_s.gsub("sqlite3:", "")
+        File.exists?(db_filename).should be_true
+        File.info(db_filename).size.should_not eq 0
 
-          MainCommand.run ["generate", "model", "-y", "Post"]
-          MainCommand.run ["db", "migrate"]
-          MainCommand.run ["db", "drop"]
+        MainCommand.run ["db", "drop"]
 
-          db_filename = CLI.settings.database_url.gsub("sqlite3:", "")
-          File.exists?(db_filename).should be_false
-          cleanup
+        db_filename = CLI.settings.database_url.gsub("sqlite3:", "")
+        File.exists?(db_filename).should be_false
+        cleanup
+
+        unless ENV["DATABASE_URL"]?
+          ENV["DATABASE_URL"] = db_url
         end
       end
     end
 
     describe "postgres" do
-      context ENV["AMBER_ENV"] do
-        it "has #{ENV["AMBER_ENV"]}  connection settings" do
-          scaffold_app("#{TESTING_APP}", "-d", "pg")
-          env_yml = environment_yml(ENV["AMBER_ENV"], "#{Dir.current}/config/environments/")
-          env_yml["database_url"].should eq expected_db_url("pg", env)
-          cleanup
+      it "has test connection settings" do
+        db_url = ENV["DATABASE_URL"]?
+
+        if ENV["DATABASE_URL"]?
+          ENV.delete("DATABASE_URL")
+        end
+
+        scaffold_app("#{TESTING_APP}", "-d", "pg")
+        env_yml = environment_yml("test", "#{Dir.current}/config/environments/")
+        env_yml["database_url"].should eq expected_db_url("pg", env)
+        cleanup
+
+        unless ENV["DATABASE_URL"]?
+          ENV["DATABASE_URL"] = db_url
         end
       end
     end

assets/js/webpack.config.js

@@ -39,9 +39,9 @@ module Amber::CLI
       it "executes a .cr file from the first command-line argument" do
         File.write "amber_exec_spec_test.cr", "puts([:a] + [:b])"
         MainCommand.run(["exec", "amber_exec_spec_test.cr", "-e", "tail"])
+        File.delete("amber_exec_spec_test.cr")
         logs = `ls tmp/*_console_result.log`.strip.split(/\s/).sort
         File.read(logs.last?.to_s).should eq "[:a, :b]\n"
-        File.delete("amber_exec_spec_test.cr")
       end
 
       it "opens editor and executes .cr file on close" do