rascal 0.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b74557df826ff38144441618c033febef78f16c3ed94f0e6cb83b0fd118b88a
-  data.tar.gz: c444bc107f91a0c09ec3129d408d30d64c0ec6b4900157e55f20e55002f0955b
+  metadata.gz: 3547e2d61b8a7dd5d5b90fa802c9c5345dfa0991765455f4c50750cf477d7ae9
+  data.tar.gz: cb4d2c0458ea759bab8607d6ec4a5320ffa63723701481f784482f2bbc912405
 SHA512:
-  metadata.gz: 74561bcdaae8dc49c4655717fde4c85c4203a917ce599301a50ae35fd06f7d15ded38ac6707d48471bb2a82312831600a11c67c00dc3adf639bb46d331178499
-  data.tar.gz: 83bd4ea1b2cbd7d19382cb068772d0cc08117763ea06f34d471c7765259d6de62088f23744fcb639ba599de36491e260070945a3208fa9d0ce2502d98049d8e1
+  metadata.gz: 51d36be1d236eed7397cc8b454e599e27812b8821f28ce591a1b11d8a08b1a720ccf6a51fa39b1dd32d40a85442342498f91c0323e01d5522bd838aa3f50ee60
+  data.tar.gz: ef6fc4a2ab0f26c660151dd83878b9ccce5a3a5504b6626e0b53718be01e03b4369491f11271ed14b6d470d5fb76efc7a01c359fe2d0c102b5e8f2b55b86e40a

data/.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: Tests
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - ruby: 2.5.8
+          gemfile: Gemfile
+    env:
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+    - name: Bundle
+      run: |
+        gem install bundler:2.1.4
+        bundle install --no-deployment
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -4,6 +4,25 @@ 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.3 (2021-12-08)
+
+- Support `command` key in services.
+
+
+## 0.3.2 (2020-10-23)
+
+- Fix broken `rascal shell` command.
+
+
+## 0.3.1 (2020-10-01)
+
+- Pass env variables to service containers.
+
+
+## 0.3.0 (2020-09-23)
+
+- Mount /repo into all service volumes
+
 
 ## 0.2.1 (2019-04-10)
 

data/Gemfile

@@ -5,7 +5,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in rascal.gemspec
 gemspec
 
-gem 'rake', '~> 10.0'
+gem 'rake', '~> 13.0'
 gem 'rspec'
 gem 'cucumber'
 gem 'aruba'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rascal (0.2.1)
+    rascal (0.3.3)
       thor (~> 0.20.3)
 
 GEM
@@ -16,8 +16,7 @@ GEM
       thor (~> 0.19)
     backports (3.12.0)
     builder (3.2.3)
-    childprocess (1.0.1)
-      rake (< 13.0)
+    childprocess (1.0.0)
     coderay (1.1.2)
     contracts (0.16.0)
     cucumber (3.1.2)
@@ -73,7 +72,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -102,9 +101,9 @@ DEPENDENCIES
   cucumber
   guard-cucumber
   guard-rspec
-  rake (~> 10.0)
+  rake (~> 13.0)
   rascal!
   rspec
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/README.md

@@ -1,4 +1,4 @@
-# Rascal [![Build Status](https://travis-ci.org/makandra/rascal.svg?branch=master)](https://travis-ci.org/makandra/rascal)
+# Rascal [![Tests](https://github.com/makandra/rascal/workflows/Tests/badge.svg)](https://github.com/makandra/rascal/actions)
 
 ### Use CI environments locally. Not quite a vagrant.
 

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: [], env: {}, command: [])
         say "Starting container for #{@name}"
-        create(network: network, network_alias: network_alias) unless exists?
+        create(network: network, network_alias: network_alias, volumes: volumes, env: env, command: command) unless exists?
         Docker.interface.run(
           'container',
           'start',
@@ -50,14 +50,17 @@ module Rascal
         )
       end
 
-      def create(network: nil, network_alias: nil)
+      def create(network: nil, network_alias: nil, volumes: [], env: {}, command: [])
         @id = Docker.interface.run(
           'container',
           'create',
           '--name', @prefixed_name,
+          *(volumes.flat_map { |v| ['-v', v.to_param] }),
+          *env_args(env),
           *(['--network', network.id] if network),
           *(['--network-alias', network_alias] if network_alias),
           @image,
+          *command,
           output: :id,
         )
       end
@@ -74,7 +77,7 @@ module Rascal
           '--tty',
           *(['-w', working_dir] if working_dir),
           *(volumes.flat_map { |v| ['-v', v.to_param] }),
-          *(env.flat_map { |key, value| ['-e', "#{key}=#{value}"] }),
+          *env_args(env),
           *(['--network', network.id] if network),
           @image,
           *command,
@@ -147,6 +150,10 @@ module Rascal
           id,
         )
       end
+
+      def env_args(env)
+        env.flat_map { |key, value| ['-e', "#{key}=#{value}"] }
+      end
     end
   end
 end

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,19 @@ 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)]
+              env_variables = (config.get('variables', {}))
               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', {}))
                 ],
+                env_variables: env_variables,
+                services: build_services(full_name, config.get('services', []), volumes: shared_volumes, env_variables: env_variables),
                 before_shell: config.get('before_shell', []),
+                after_shell: config.get('after_shell', []),
                 working_dir: docker_repo_dir,
               )
             end
@@ -109,12 +111,15 @@ module Rascal
         end
       end
 
-      def build_services(name, services)
+      def build_services(name, services, volumes: [], env_variables: {})
         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,
+            env_variables: env_variables,
+            command: service_config['command'],
           )
         end
       end

data/lib/rascal/service.rb

@@ -1,11 +1,14 @@
 module Rascal
   class Service
-    attr_reader :name, :container, :alias
+    attr_reader :name, :container, :alias, :env_variables, :command
 
-    def initialize(name, image:, alias_name:)
+    def initialize(name, env_variables: {}, image:, alias_name:, volumes: [], command: nil)
       @name = name
       @container = Docker::Container.new(name, image)
       @alias = alias_name
+      @volumes = volumes
+      @env_variables = env_variables
+      @command = [*command]
     end
 
     def download_missing
@@ -14,7 +17,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, env: @env_variables, command: @command)
       end
     end
 

data/lib/rascal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rascal
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,10 +32,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -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.2.33
 signing_key: 
 specification_version: 4
 summary: Spin up CI environments locally.

data/.travis.yml

@@ -1,16 +0,0 @@
-# yes, we use travis for open source gems
-
-language: ruby
-rvm:
-  - '2.5.4'
-gemfile:
-  - Gemfile
-script: bundle exec rake
-sudo: false
-cache: vendor/bundler
-notifications:
-  email:
-    - fail@makandra.de
-install:
-  - gem install bundler:2.0.1
-  - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}