fulmar 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c5d6b305c4ac17349546086b053794b5af24577
-  data.tar.gz: f49b3a22972ef11eba35774f478ecef2b305ef4b
+  metadata.gz: 2ce3e863c6645eee3a35494dda21e7a3551371a4
+  data.tar.gz: 7e9a4145d5ed01256cfcefe023416262d0bfa83e
 SHA512:
-  metadata.gz: 462b56df6de1a163116e2524ed90751ea53fa84870584859d95ceb116b8e9ae2220ab253925405dcb2d500f0e499f0fd0007c8a6fa48c07028333764c1251bd7
-  data.tar.gz: 33318263967cbf1bf2428e5074158cba442acb5091dd2bae74e2f9b46e5a215734135b0f487d0e2db0794491f1811a2b5b0ce165f72198fe4daf91602dea4837
+  metadata.gz: 86e8fe91f3ee252bc3d8d29d5a510d93c527ae44ee60ced123e9f5535b379ee4777434da2d2cbc0eaf6d7c8dfb020569c0612e4aab56099e86bc04fe5dc39121
+  data.tar.gz: 24e39441d9abe4843cb2185dda0c8ce11b395243ce575ccf0850256f4dc6ed00c3c23a55df4acf74299cf493a629a2f990e395b86e389f81a31755f67b03a751

data/lib/fulmar/domain/service/configuration_service.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'pp'
 
 module Fulmar
   module Domain
@@ -172,7 +173,14 @@ module Fulmar
             @config = @config.deep_merge((YAML.load_file(config_file) || {}).symbolize)
           end
 
+          prepare_environments
+          prepare_dependencies
           # Iterate over all environments and targets to prepare them
+          @config[:environments].delete(:all)
+          @config
+        end
+
+        def prepare_environments
           @config[:environments].each_key do |env|
             next if env == :all
             @config[:environments][env].each_key do |target|
@@ -180,8 +188,16 @@ module Fulmar
               check_path(env, target)
             end
           end
-          @config[:environments].delete(:all)
-          @config
+        end
+
+        def prepare_dependencies
+          @config[:dependencies].each_pair do |_env, repos|
+            repos.each_pair do |_name, repo|
+              next if repo[:path].blank?
+              full_path = File.expand_path("#{base_path}/#{repo[:path]}")
+              repo[:path] = full_path unless repo[:path][0,1] == '/'
+            end
+          end
         end
 
         def check_path(env, target)

data/lib/fulmar/domain/service/dependency_service.rb

@@ -34,7 +34,7 @@ module Fulmar
             end
 
             # Pull
-            shell = Fulmar::Infrastructure::Service::ShellService.new "#{@config[:local_path]}/#{data[:path]}"
+            shell = Fulmar::Infrastructure::Service::ShellService.new data[:path]
             unless shell.run 'git pull --rebase -q'
               fail "Cannot update repository #{data[:path]}. Please update manually."
             end

data/lib/fulmar/version.rb

@@ -1,4 +1,4 @@
 # Provides a global version number
 module Fulmar
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Jonas Siegl