rascal 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 190a2efecea68bc713a78cb62454529f2228af52529efd708301f0f78f1e7c87
4
- data.tar.gz: 90126db4ae82863742144d82777c0a3862f927dbf5c13f08c9ae5f27be54d261
3
+ metadata.gz: f92bdd23479cecc48f349ccb23ce53c4c32ca33dea4e97a5cd7b7b9c58408b9d
4
+ data.tar.gz: 0aab44c7aa2484fd17978dae087687121e5028310e987e87cbcd1d9b973eea78
5
5
  SHA512:
6
- metadata.gz: d366ae2838d464a4178df419f22ffdd08d6525f2fd6a06e830e620033fade39462c836acca86ebeaac0e562c9591dcecb1b8e304d858bc5f081edeb14098bfa1
7
- data.tar.gz: 10ecd7318f88af5a2bf634d1b68c92b8a51de957f6bf16a7d3121d8d36224706a406e2a8bf188de3ba34433079c7459ae6e7b1860ee6b0452c20baa502d4a4a7
6
+ metadata.gz: 3051a125f2d14e157df31862e80d40a79866ed8cd696c09f11b57dc9270d4c6590683e1ec5c067c72f950696c9c49a41c48d65733c90064379df46c3c6b9c9d8
7
+ data.tar.gz: b599dde61ea3d335e0931405b8057069db656af5551369bc13969ab78106efb7bd3ea0f745130b75f934dd51e7d84e629c34b71624d822de5e27a5d9f944d067
@@ -2,10 +2,10 @@ name: Tests
2
2
  on:
3
3
  push:
4
4
  branches:
5
- - master
5
+ - main
6
6
  pull_request:
7
7
  branches:
8
- - master
8
+ - main
9
9
  jobs:
10
10
  test:
11
11
  runs-on: ubuntu-20.04
data/CHANGELOG.md CHANGED
@@ -4,6 +4,11 @@ All notable changes to this project will be documented here.
4
4
 
5
5
  Rascal follows semantic versioning. This has little consequence pre 1.0, so expect breaking changes.
6
6
 
7
+ ## 0.3.6 (2023-01-27)
8
+
9
+ - Handle `default:` blocks in .gitlab-ci.yml.
10
+
11
+
7
12
  ## 0.3.5 (2022-12-21)
8
13
 
9
14
  - Fix the "endpoint ... already exists in network" error.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rascal (0.3.4)
4
+ rascal (0.3.6)
5
5
  thor (~> 0.20.3)
6
6
 
7
7
  GEM
@@ -3,6 +3,8 @@ require 'yaml'
3
3
  module Rascal
4
4
  module EnvironmentsDefinition
5
5
  class Gitlab
6
+ DEFAULT_KEY = 'default'.freeze
7
+
6
8
  class << self
7
9
  def detect(path)
8
10
  if path.directory?
@@ -62,10 +64,11 @@ module Rascal
62
64
 
63
65
  def environments
64
66
  @environments ||= begin
67
+ default_config = @info.fetch(DEFAULT_KEY, {})
65
68
  @info.collect do |key, environment_config|
66
- config = Config.new(deep_merge(environment_config, @rascal_config, @rascal_environment_config[key] || {}), key)
69
+ config = Config.new(deep_merge(environment_config, default_config, @rascal_config, @rascal_environment_config[key] || {}), key)
67
70
  docker_repo_dir = config.get('repo_dir', '/repo')
68
- unless key.start_with?('.') || config.get('hide', false)
71
+ unless key.start_with?('.') || config.get('hide', false) || key == DEFAULT_KEY
69
72
  name = config.get('name', key)
70
73
  full_name = "#{@base_name}-#{name}"
71
74
  shared_volumes = [build_repo_volume(docker_repo_dir), build_builds_volume(full_name)]
@@ -1,3 +1,3 @@
1
1
  module Rascal
2
- VERSION = "0.3.5"
2
+ VERSION = "0.3.6"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rascal
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.5
4
+ version: 0.3.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tobias Kraze
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-12-21 00:00:00.000000000 Z
11
+ date: 2023-01-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor