quaker 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ce3293ce8c169eedc97c4a6433fcdf865542e3
-  data.tar.gz: 085a92c69d42eaa6455c61e9edbcced63597343e
+  metadata.gz: 758feb9a3fef5b99db3c41f1ca8ae35cff00fc65
+  data.tar.gz: a5338bfc13ea7b7b9086a92e4522589f5577716c
 SHA512:
-  metadata.gz: 5ff78b67637e14828190df6f2e627a50813a7d0d884290aeb5e7a706701503939549f9afb94fda62e4a5a796d974e3e8282550b54a7d7301fc45e8f435a221c4
-  data.tar.gz: dd0f33de4a2c3830ab34385c69111d9bbcef8f9d4c80e1d98873f6500fed1a86b5bc80e1e33b1e4d6100ce6ed8fb7711c068280181f885e4ad17453a056178d5
+  metadata.gz: 26eef5aeeee9d0cefa705bfeca306fe380bec996f8473d4ebca04edb2e1f6e46b5757e1d2bd56b94ab273bbb8402ffd65f3b3d77cabdae2950d13edcad96320c
+  data.tar.gz: 29c402e3478bfb33f0f92b34bde650c65ebd95cd4fe8faf3ddafe56be6012f6ddf4b2f1ed747617d7f843e21006bb448ab250f58880f10b3f258019188ebe447

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 gem 'clamp'
 gem 'git_clone_url'
+gem 'deep_merge'
 
 group :test do
   gem "codeclimate-test-reporter", group: :test, require: nil

data/lib/quaker/errors.rb

@@ -0,0 +1,4 @@
+module Quaker
+  class MissingServiceError < StandardError
+  end
+end

data/lib/quaker/tag_filter.rb

@@ -1,19 +1,30 @@
+require 'quaker/tag_matcher'
+require 'quaker/errors'
+
 module Quaker
+  class DependencyResolveError < StandardError
+  end
+
   class TagFilter
     def dependencies services_map, name
       spec = services_map[name]
+      raise MissingServiceError, name unless spec
+
       depends_on = spec["depends_on"] || []
       links = (spec["links"] || []).map{|l| l.split(':')[0]}
       deps = links + depends_on
-      deps + deps.map{|d| dependencies(services_map, d)}.flatten
+      begin
+        deps + deps.map{|d| dependencies(services_map, d)}.flatten
+      rescue MissingServiceError => ex
+        msg = "Error resolving dependency #{ex.message} " +
+          "for service #{name}"
+        raise DependencyResolveError, msg
+      end
     end
 
     def is_tagged_service spec, tags_list
-      svc_tags = spec.delete("tags") || []
-
-      # Skip service if no common tags
-      common = svc_tags & tags_list
-      common && !common.empty?
+      svc_tags = spec.delete('tags') || []
+      TagMatcher.match svc_tags, tags_list
     end
 
     def filter services_map, tags_list

data/lib/quaker/templates.rb

@@ -1,4 +1,5 @@
 require 'quaker/tag_matcher'
+require 'deep_merge'
 
 module Quaker
   class Templates
@@ -7,17 +8,17 @@ module Quaker
       services
         .reject {|name, v| template?(name)}
         .inject({}) {|acc, (name, spec)|
-          acc.update(name => extend_with_matchine_templates(spec, templates))
+          acc.update(name => extend_with_matching_templates(spec, templates))
         }
     end
 
-    def extend_with_matchine_templates service, templates
+    def extend_with_matching_templates service, templates
       templates
         .select {|name, spec| Quaker::TagMatcher::match(service["tags"], spec["tags"])}
         .inject(service) {|svc, (_, spec)|
           filtered_template_content = spec
             .select{|name, spec| name != 'tags' }
-          svc.merge(filtered_template_content)
+          svc.deep_merge(filtered_template_content)
         }
     end
 

data/lib/quaker/version.rb

@@ -1,3 +1,3 @@
 module Quaker
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quaker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Igor Shapiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - exe/quaker
 - lib/quaker.rb
 - lib/quaker/compose_file.rb
+- lib/quaker/errors.rb
 - lib/quaker/git_resolver.rb
 - lib/quaker/include.rb
 - lib/quaker/path_extensions.rb