blubber 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 457810ff6394abec0c13d9f0116d72a567cc0bf2d71e0f05aca667b4e2e35c09
-  data.tar.gz: 04b89a2313b751e77cd9c5378aa3d67d1793c4be1099c0a5b35b0355b9846750
+  metadata.gz: 2cc2529467b08e92f4e04567459d8a152b335a3797188311e45e1ba34bfd61d6
+  data.tar.gz: 68ef0d40ca4b6c3f60fcf248ab678afffb36b9fa2483d152f8fe73f991780147
 SHA512:
-  metadata.gz: 934b188004e2822626a83f393cd035188c4d2fb22c5f5b06f441ea4b004fe2a1806bff6d987423fb6c79298622f0274faf872c83557578c544dac8bb7e2cb019
-  data.tar.gz: e8b817c7d36fd1eddc2d97c9c60106784021d9b060f88ed1e24f94839c99d8cc896400aa5cc19d71b98b86e56b30250b33580bf7698c9bffad0c01c14d0dbb0a
+  metadata.gz: f0bf51318929ad63feb8cb0382339ac6290fd432d09b26077121b24b268ccb62e0dfad89a8421502cadbd4197b658f48db83cd4a98f0cd57e279bbe36a42439c
+  data.tar.gz: 1dcd4ff684e71ad4a5f03311d1e5f9d40b445b9f3b713751016342a2c69b1006f919cc75873f55c8174e36af0d98c94743895dbb3374c7df80f8bbebd33ef4e1

data/lib/blubber/builder.rb

@@ -26,12 +26,6 @@ module Blubber
 
     attr_reader :layer, :logger
 
-    def docker_registry
-      format('%<host>s/%<project>s',
-             host: ENV.fetch('DOCKER_REGISTRY'),
-             project: 'etl')
-    end
-
     def ui
       @ui ||= HighLine.new
     end
@@ -40,8 +34,8 @@ module Blubber
       @runner ||= Runner.new(logger: logger)
     end
 
-    def tags
-      @tags ||= Tagger.new(layer: layer, image_id: nil).tags
+    def tagger
+      @tagger ||= Tagger.layer(:layer, image_id: nil)
     end
 
     def build_ids
@@ -50,8 +44,8 @@ module Blubber
 
     def build(layer)
       # NOTICE : Speed up build for fresh slave
-      tags.each do |tag|
-        runner.run("docker pull #{docker_registry}/#{layer}:#{tag}")
+      tagger.tags.each do |tag|
+        runner.run("docker pull #{tagger.docker_registry}/#{layer}:#{tag}")
       end
 
       status = nil

data/lib/blubber/tagger.rb

@@ -6,6 +6,10 @@ require 'blubber/runner'
 
 module Blubber
   class Tagger
+    def self.docker_registry
+      ENV.fetch('DOCKER_REGISTRY')
+    end
+
     def initialize(layer:, image_id:, logger: nil)
       @layer = layer
       @image_id = image_id
@@ -19,7 +23,7 @@ module Blubber
     end
 
     def project
-      "#{docker_registry}/#{layer}"
+      "#{Tagger.docker_registry}/#{layer}"
     end
 
     def tags
@@ -46,10 +50,6 @@ module Blubber
       @runner ||= Runner.new(logger: logger)
     end
 
-    def docker_registry
-      ENV.fetch('DOCKER_REGISTRY')
-    end
-
     def ui
       @ui ||= HighLine.new
     end

data/lib/blubber/version.rb

@@ -1,3 +1,3 @@
 module Blubber
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blubber
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Mikko Kokkonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline