rascal 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4bf3ad1b4529196db3df33c0748dcc511b334d99c02ab457c74cb821eff8a1b
-  data.tar.gz: c3c7f9f856febd21b23195621081c0f22c63336c1f8e0362b1864cd0d3e365d1
+  metadata.gz: f92bdd23479cecc48f349ccb23ce53c4c32ca33dea4e97a5cd7b7b9c58408b9d
+  data.tar.gz: 0aab44c7aa2484fd17978dae087687121e5028310e987e87cbcd1d9b973eea78
 SHA512:
-  metadata.gz: 56f02d5f64b911abde9dcc6ee44def8fec82ab78705b3879f171589f68b4aa662473e0bc8e372bb1122dc739c9762c9b3d8ba9295817410224951b226e044cfd
-  data.tar.gz: dec85393c9074c9ad305962e051e5b0dc49671d5e84a2acba653840ed11c33e60cbed83a8975ef824485c5becfeea9261e4d88a84a358ffe9bf12035b61a6f25
+  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,16 @@ 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.
+
+
 ## 0.3.4 (2022-03-16)
 
 - Activate Rubygems MFA

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/docker/container.rb

@@ -112,8 +112,6 @@ module Rascal
         @image
       end
 
-      private
-
       def id
         @id ||= Docker.interface.run(
           'container',
@@ -125,6 +123,8 @@ module Rascal
         )
       end
 
+      private
+
       def image_exists?
         Docker.interface.run(
           'image',

data/lib/rascal/docker/network.rb

@@ -14,6 +14,17 @@ module Rascal
         )
       end
 
+      def disconnect(container_id)
+        Docker.interface.run(
+          'network',
+          'disconnect',
+          id,
+          container_id,
+        )
+      rescue Interface::Error => e
+        raise unless e.message.include?('is not connected')
+      end
+
       def exists?
         !!id
       end

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/service.rb

@@ -17,6 +17,9 @@ module Rascal
 
     def start_if_stopped(network: nil)
       unless @container.running?
+        if (container_id = @container.id)
+          network.disconnect(container_id)
+        end
         @container.start(network: network, network_alias: @alias, volumes: @volumes, env: @env_variables, command: @command)
       end
     end

data/lib/rascal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rascal
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.22
 signing_key: 
 specification_version: 4
 summary: Spin up CI environments locally.