rascal 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cac8b4564154cac2c8e002da1cb8e2874509331ad381cb6b8cc60b196954ab0
-  data.tar.gz: a577bd8374a055453a3db8a73bf211d69973fcab2fe74a3117aadd56149e644a
+  metadata.gz: 4b74557df826ff38144441618c033febef78f16c3ed94f0e6cb83b0fd118b88a
+  data.tar.gz: c444bc107f91a0c09ec3129d408d30d64c0ec6b4900157e55f20e55002f0955b
 SHA512:
-  metadata.gz: 7d0770a88072f36e7848b0fb46ef11599e32759d3c1e17b0de8eebb2fd298b32a97f7aedc9ea191e4d996bddc27d12b313457a5adba7905465b03e68fd11fa87
-  data.tar.gz: 2113fab40ec414ce8d724a7cf34ef94f12246f7f93d4a6509b32292c6757b96e2993286c69ba53a155bb7a1485ab5fe3a39b5d41abcd40d9763f4c7b44b0c25b
+  metadata.gz: 74561bcdaae8dc49c4655717fde4c85c4203a917ce599301a50ae35fd06f7d15ded38ac6707d48471bb2a82312831600a11c67c00dc3adf639bb46d331178499
+  data.tar.gz: 83bd4ea1b2cbd7d19382cb068772d0cc08117763ea06f34d471c7765259d6de62088f23744fcb639ba599de36491e260070945a3208fa9d0ce2502d98049d8e1

data/CHANGELOG.md

@@ -5,6 +5,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.2.1 (2019-04-10)
+
+- Prefix names with directory name, to avoid conflicts between projects.
+
+
 ## 0.2.0 (2019-04-10)
 
 - Add `--all` flag for `rascal clean`.

data/Gemfile.lock

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

data/lib/rascal/environment.rb

@@ -2,10 +2,10 @@ module Rascal
   class Environment
     attr_reader :name, :network, :container, :env_variables, :services, :volumes, :working_dir, :before_shell
 
-    def initialize(name, image:, env_variables: {}, services: [], volumes: [], before_shell: [], working_dir: nil)
+    def initialize(full_name, name:, image:, env_variables: {}, services: [], volumes: [], before_shell: [], working_dir: nil)
       @name = name
-      @network = Docker::Network.new(name)
-      @container = Docker::Container.new(name, image)
+      @network = Docker::Network.new(full_name)
+      @container = Docker::Container.new(full_name, image)
       @env_variables = env_variables
       @services = services
       @volumes = volumes

data/lib/rascal/environments_definition/gitlab.rb

@@ -35,6 +35,7 @@ module Rascal
       def initialize(config_path)
         @info = parse_definition(config_path.read)
         @repo_dir = config_path.parent
+        @base_name = @repo_dir.basename
         @rascal_config = @info.fetch('.rascal', {})
         @rascal_environment_config = @rascal_config.delete('jobs') || {}
       end
@@ -64,15 +65,18 @@ module Rascal
           @info.collect do |key, environment_config|
             config = Config.new(deep_merge(environment_config, @rascal_config, @rascal_environment_config[key] || {}), key)
             docker_repo_dir = config.get('repo_dir', '/repo')
-            unless key.start_with?('.')
-              Environment.new(key,
+            unless key.start_with?('.') || config.get('hide', false)
+              name = config.get('name', key)
+              full_name = "#{@base_name}-#{name}"
+              Environment.new(full_name,
+                name: name,
                 image: config.get('image'),
                 env_variables: (config.get('variables', {})),
-                services: build_services(key, config.get('services', [])),
+                services: build_services(full_name, config.get('services', [])),
                 volumes: [
                   build_repo_volume(docker_repo_dir),
-                  build_builds_volume(key),
-                  *build_volumes(key, config.get('volumes', {}))
+                  build_builds_volume(full_name),
+                  *build_volumes(full_name, config.get('volumes', {}))
                 ],
                 before_shell: config.get('before_shell', []),
                 working_dir: docker_repo_dir,

data/lib/rascal/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rascal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tobias Kraze