rascal 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b74557df826ff38144441618c033febef78f16c3ed94f0e6cb83b0fd118b88a
-  data.tar.gz: c444bc107f91a0c09ec3129d408d30d64c0ec6b4900157e55f20e55002f0955b
+  metadata.gz: 410f63a35a3389098195b39badbc4e1c36f6ac9f534f8741ca92489b0bfbd083
+  data.tar.gz: 38c474e407a4217c8750de66eabbb123a6214c4f921308ea64fb7d17831b1095
 SHA512:
-  metadata.gz: 74561bcdaae8dc49c4655717fde4c85c4203a917ce599301a50ae35fd06f7d15ded38ac6707d48471bb2a82312831600a11c67c00dc3adf639bb46d331178499
-  data.tar.gz: 83bd4ea1b2cbd7d19382cb068772d0cc08117763ea06f34d471c7765259d6de62088f23744fcb639ba599de36491e260070945a3208fa9d0ce2502d98049d8e1
+  metadata.gz: da2100bea61c066b3c7c3eb72b7b321c69cb39f697de0c04cdc81ece950e10d2d60ddab0b6c7b74de6fa8e7f3ea3b767be9a74bf909dde7794fc3560c6664586
+  data.tar.gz: 404cf6adc8d6977f1946cb1e8ecbe60647c38b9683a0f411cad51731d3ff8d45d8c44556c907088d0a2aac1f3be16727751025bc80710692999534d2b9d32bbe

data/.travis.yml

@@ -12,5 +12,5 @@ notifications:
   email:
     - fail@makandra.de
 install:
-  - gem install bundler:2.0.1
+  - gem install bundler:2.1.4
   - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.0 (2020-09-23)
+
+- Mount /repo into all service volumes
+
 
 ## 0.2.1 (2019-04-10)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rascal (0.2.1)
+    rascal (0.3.0)
       thor (~> 0.20.3)
 
 GEM
@@ -107,4 +107,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/lib/rascal/docker/container.rb

@@ -40,9 +40,9 @@ module Rascal
         !!id
       end
 
-      def start(network: nil, network_alias: nil)
+      def start(network: nil, network_alias: nil, volumes: [])
         say "Starting container for #{@name}"
-        create(network: network, network_alias: network_alias) unless exists?
+        create(network: network, network_alias: network_alias, volumes: volumes) unless exists?
         Docker.interface.run(
           'container',
           'start',
@@ -50,11 +50,12 @@ module Rascal
         )
       end
 
-      def create(network: nil, network_alias: nil)
+      def create(network: nil, network_alias: nil, volumes: [])
         @id = Docker.interface.run(
           'container',
           'create',
           '--name', @prefixed_name,
+          *(volumes.flat_map { |v| ['-v', v.to_param] }),
           *(['--network', network.id] if network),
           *(['--network-alias', network_alias] if network_alias),
           @image,

data/lib/rascal/environment.rb

@@ -2,7 +2,7 @@ module Rascal
   class Environment
     attr_reader :name, :network, :container, :env_variables, :services, :volumes, :working_dir, :before_shell
 
-    def initialize(full_name, name:, image:, env_variables: {}, services: [], volumes: [], before_shell: [], working_dir: nil)
+    def initialize(full_name, name:, image:, env_variables: {}, services: [], volumes: [], before_shell: [], after_shell: [], working_dir: nil)
       @name = name
       @network = Docker::Network.new(full_name)
       @container = Docker::Container.new(full_name, image)
@@ -11,12 +11,13 @@ module Rascal
       @volumes = volumes
       @working_dir = working_dir
       @before_shell = before_shell
+      @after_shell = after_shell
     end
 
     def run_shell
       download_missing
       start_services
-      command = [*@before_shell, 'bash'].join(';')
+      command = [*@before_shell, 'bash', *@after_shell].join(';')
       @container.run_and_attach('bash', '-c', command,
         env: @env_variables,
         network: @network,

data/lib/rascal/environments_definition/gitlab.rb

@@ -68,17 +68,18 @@ module Rascal
             unless key.start_with?('.') || config.get('hide', false)
               name = config.get('name', key)
               full_name = "#{@base_name}-#{name}"
+              shared_volumes = [build_repo_volume(docker_repo_dir), build_builds_volume(full_name)]
               Environment.new(full_name,
                 name: name,
                 image: config.get('image'),
                 env_variables: (config.get('variables', {})),
-                services: build_services(full_name, config.get('services', [])),
                 volumes: [
-                  build_repo_volume(docker_repo_dir),
-                  build_builds_volume(full_name),
+                  *shared_volumes,
                   *build_volumes(full_name, config.get('volumes', {}))
                 ],
+                services: build_services(full_name, config.get('services', []), volumes: shared_volumes),
                 before_shell: config.get('before_shell', []),
+                after_shell: config.get('after_shell', []),
                 working_dir: docker_repo_dir,
               )
             end
@@ -109,12 +110,13 @@ module Rascal
         end
       end
 
-      def build_services(name, services)
+      def build_services(name, services, volumes: [])
         services.collect do |service_config|
           service_alias = service_config['alias']
           Service.new("#{name}_#{service_alias}",
             alias_name: service_config['alias'],
             image: service_config['name'],
+            volumes: volumes,
           )
         end
       end

data/lib/rascal/service.rb

@@ -2,10 +2,11 @@ module Rascal
   class Service
     attr_reader :name, :container, :alias
 
-    def initialize(name, image:, alias_name:)
+    def initialize(name, image:, alias_name:, volumes: [])
       @name = name
       @container = Docker::Container.new(name, image)
       @alias = alias_name
+      @volumes = volumes
     end
 
     def download_missing
@@ -14,7 +15,7 @@ module Rascal
 
     def start_if_stopped(network: nil)
       unless @container.running?
-        @container.start(network: network, network_alias: @alias)
+        @container.start(network: network, network_alias: @alias, volumes: @volumes)
       end
     end
 

data/lib/rascal/version.rb

@@ -1,3 +1,3 @@
 module Rascal
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rascal
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Spin up CI environments locally.