rascal 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 190a2efecea68bc713a78cb62454529f2228af52529efd708301f0f78f1e7c87
-  data.tar.gz: 90126db4ae82863742144d82777c0a3862f927dbf5c13f08c9ae5f27be54d261
+  metadata.gz: f92bdd23479cecc48f349ccb23ce53c4c32ca33dea4e97a5cd7b7b9c58408b9d
+  data.tar.gz: 0aab44c7aa2484fd17978dae087687121e5028310e987e87cbcd1d9b973eea78
 SHA512:
-  metadata.gz: d366ae2838d464a4178df419f22ffdd08d6525f2fd6a06e830e620033fade39462c836acca86ebeaac0e562c9591dcecb1b8e304d858bc5f081edeb14098bfa1
-  data.tar.gz: 10ecd7318f88af5a2bf634d1b68c92b8a51de957f6bf16a7d3121d8d36224706a406e2a8bf188de3ba34433079c7459ae6e7b1860ee6b0452c20baa502d4a4a7
+  metadata.gz: 3051a125f2d14e157df31862e80d40a79866ed8cd696c09f11b57dc9270d4c6590683e1ec5c067c72f950696c9c49a41c48d65733c90064379df46c3c6b9c9d8
+  data.tar.gz: b599dde61ea3d335e0931405b8057069db656af5551369bc13969ab78106efb7bd3ea0f745130b75f934dd51e7d84e629c34b71624d822de5e27a5d9f944d067

data/.github/workflows/test.yml

@@ -2,10 +2,10 @@ name: Tests
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-    - master
+    - main
 jobs:
   test:
     runs-on: ubuntu-20.04

data/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented here.
 
 Rascal follows semantic versioning. This has little consequence pre 1.0, so expect breaking changes.
 
+## 0.3.6 (2023-01-27)
+
+- Handle `default:` blocks in .gitlab-ci.yml.
+
+
 ## 0.3.5 (2022-12-21)
 
 - Fix the "endpoint ... already exists in network" error.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rascal (0.3.4)
+    rascal (0.3.6)
       thor (~> 0.20.3)
 
 GEM

data/lib/rascal/environments_definition/gitlab.rb

@@ -3,6 +3,8 @@ require 'yaml'
 module Rascal
   module EnvironmentsDefinition
     class Gitlab
+      DEFAULT_KEY = 'default'.freeze
+
       class << self
         def detect(path)
           if path.directory?
@@ -62,10 +64,11 @@ module Rascal
 
       def environments
         @environments ||= begin
+          default_config = @info.fetch(DEFAULT_KEY, {})
           @info.collect do |key, environment_config|
-            config = Config.new(deep_merge(environment_config, @rascal_config, @rascal_environment_config[key] || {}), key)
+            config = Config.new(deep_merge(environment_config, default_config, @rascal_config, @rascal_environment_config[key] || {}), key)
             docker_repo_dir = config.get('repo_dir', '/repo')
-            unless key.start_with?('.') || config.get('hide', false)
+            unless key.start_with?('.') || config.get('hide', false) || key == DEFAULT_KEY
               name = config.get('name', key)
               full_name = "#{@base_name}-#{name}"
               shared_volumes = [build_repo_volume(docker_repo_dir), build_builds_volume(full_name)]

data/lib/rascal/version.rb

@@ -1,3 +1,3 @@
 module Rascal
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rascal
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor