build-labels 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece715acff32709330b757daf3bde7df56b686cfdb48ae95274fde1cea6c629f
-  data.tar.gz: 92de637e65532323c3ffb810c2eb1c5c4dba08724dde1c18f593b6c97a07933b
+  metadata.gz: 50511bc850b411617f1d5c516593dbfe886de1d4230e76b3036c70ac9e7fa91e
+  data.tar.gz: 6f1d316b6941a45bd0451e17b322854172d9e1a5eb55eca39bb7039e2bcf1120
 SHA512:
-  metadata.gz: bd5e5a24c460f2bb57f41a9206c45d99b4cf97dc2088f34ad760e287be95b611554d02fb3f6a728b2533b8f12e70da0e763464c3fb711cafea84530a15cdf2ba
-  data.tar.gz: 0a5b06118df2116a5e76d15393a0c55ae34bddfd5ede44d4fda9c09e19d714dc346c598b23d594c6be2953cdb01d387c82ad25b12129174b935d6be3f3b66bba
+  metadata.gz: c3e4df0698922db01f4526405a9ce7c694a6fea149e86d4fbd90142ca6e1781cf8d2a22cb534049da6853b8fb3662cb65695c470fe099000fa4d06f15d3f30b2
+  data.tar.gz: 4afcd88dcf92dcf78f9c938a0902e486db8f10981f42b4a659877c4b5b2ae52f2c76ef5e3167713b48e424727424eb667ff16a640c586311f826df8438205d89

data/lib/build-labels/builder.rb

@@ -55,21 +55,23 @@ module BuildLabels
       end
     end
     def extend_compose(compose)
-      compose['services'].transform_values! do |service|
+      compose['services'].each do |name, service|
+        service.delete_if {|k, v| !%w[image build].include? k }
         next unless service['build']
-        service.slice!('image', 'build')
-        service['build'] = { 'context' => service['build'] } if service['build'].is_a?(String)
+        if service['build'].class == String
+          service['build'] = { 'context' => service['build'] }
+        end
         service['build']['labels'] ||= []
-        add_namespace(:dc, 'docker.service')
-        self.dc.name = service['name']
+        add_namespace :dc, 'docker.service'
+        self.dc.name = name
 
         each_labels do |ns, values|
-          values.each do |k, v|
+          values.each_pair do |k,v|
             service['build']['labels'] << "#{ns}.#{k}=#{v}" unless v.to_s.empty?
           end
         end
-        service
-      end.compact!
+      end
+      compose['services'].delete_if do |name, svc| ! svc.key?('build') end
 
       puts compose.to_yaml
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.21'
+    VERSION = '0.0.22'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Artyom B