dockistrano 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62458175a705cb5e911f4964c7ba1e05bebf11a4
-  data.tar.gz: 457c55e88a61197d25e23913566a42590c632f80
+  metadata.gz: 7ac28b523edaa71eb85020de59988f816994362d
+  data.tar.gz: e7caed84b3299f8824b2771cb521e20a3ab6770c
 SHA512:
-  metadata.gz: 5f4ef6636154a182e4470e282d1d7a88e7f7ddc1038d2169c14bc758417c300803add8260a7cfa072e1fcc820ecf379c476a7a80345f0810fcc8299e80b313a2
-  data.tar.gz: 819e1eaac3726c507c4379760973d0b4dac1834524d4456cb0d57a050902d12df5fc5a86fe5054fdda9e9ff2f5b42df2c2e6b00ba13d6729a3cb16d23cf21da7
+  metadata.gz: a641af2fa6076e1c3e5c72c69abd54e2b43c85d8addb2c5e0e430cda3744954107ac4d495354d7e42cc72b6c765ffbd966ce0f0d0fb9f18319fe3105c0e6d6cf
+  data.tar.gz: 8ec45003411aa01abfeb7ecf4bb5a93b3841f100362f18925c5aea5c623dc09896ef77f2eb7b82dfbbdf227378e1bec4f2a42f4b413a39175a93a3a3cfe60dd6

data/lib/dockistrano/service_dependency.rb

@@ -29,7 +29,7 @@ module Dockistrano
           "backing_service_env" =>  config
         })
 
-        backing_service.tag = tag_with_fallback(service.tag)
+        backing_service.tag = tag_with_fallback(service.registry, name, service.tag)
 
         begin
           loaded_config = load_config
@@ -89,10 +89,10 @@ module Dockistrano
     class NoTagFoundForImage < StandardError
     end
 
-    def tag_with_fallback(tag)
+    def tag_with_fallback(registry, image_name, tag)
       fallback_tags = [tag, "develop", "master", "latest"]
 
-      available_tags = Docker.tags_for_image("#{backing_service.registry}/#{backing_service.image_name}")
+      available_tags = Docker.tags_for_image("#{registry}/#{image_name}")
 
       begin
         tag_suggestion = fallback_tags.shift
@@ -102,7 +102,7 @@ module Dockistrano
       if final_tag
         final_tag
       else
-        raise NoTagFoundForImage.new("No tag found for image #{backing_service.image_name}, locally available tags: #{available_tags} `doc pull` for more tags from repository.")
+        raise NoTagFoundForImage.new("No tag found for image #{image_name}, locally available tags: #{available_tags} `doc pull` for more tags from repository.")
       end
     end
 

data/lib/dockistrano/version.rb

@@ -1,3 +1,3 @@
 module Dockistrano
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dockistrano/service_dependency_spec.rb

@@ -37,7 +37,7 @@ describe Dockistrano::ServiceDependency do
     end
 
     it "sets the tag with a fallback" do
-      expect(subject).to receive(:tag_with_fallback).with("develop").and_return("latest")
+      expect(subject).to receive(:tag_with_fallback).with("my.registry.net", "postgresql", "develop").and_return("latest")
       expect(subject.backing_service.tag).to eq("latest")
     end
 
@@ -119,35 +119,29 @@ describe Dockistrano::ServiceDependency do
   end
 
   context "#tag_with_fallback" do
-    let(:backing_service) { double(registry: "registry", image_name: "postgresql") }
-
-    before do
-      allow(subject).to receive(:backing_service).and_return(backing_service)
-    end
-
     it "returns the given tag when the tag is available" do
       expect(Dockistrano::Docker).to receive(:tags_for_image).and_return(["feature-branch", "develop", "master", "latest"])
-      expect(subject.tag_with_fallback("feature-branch")).to eq("feature-branch")
+      expect(subject.tag_with_fallback("registry", "postgresql", "feature-branch")).to eq("feature-branch")
     end
 
     it "returns develop when the specific tag is not available" do
       expect(Dockistrano::Docker).to receive(:tags_for_image).and_return(["develop", "master", "latest"])
-      expect(subject.tag_with_fallback("feature-branch")).to eq("develop")
+      expect(subject.tag_with_fallback("registry", "postgresql", "feature-branch")).to eq("develop")
     end
 
     it "returns master when develop is not available" do
       expect(Dockistrano::Docker).to receive(:tags_for_image).and_return(["master", "latest"])
-      expect(subject.tag_with_fallback("feature-branch")).to eq("master")
+      expect(subject.tag_with_fallback("registry", "postgresql", "feature-branch")).to eq("master")
     end
 
     it "returns latest when master is not available" do
       expect(Dockistrano::Docker).to receive(:tags_for_image).and_return(["latest"])
-      expect(subject.tag_with_fallback("feature-branch")).to eq("latest")
+      expect(subject.tag_with_fallback("registry", "postgresql", "feature-branch")).to eq("latest")
     end
 
     it "raises an error when not appropriate tag is found" do
       expect(Dockistrano::Docker).to receive(:tags_for_image).and_return(["another-feature-branch"])
-      expect { subject.tag_with_fallback("feature-branch") }.to raise_error(Dockistrano::ServiceDependency::NoTagFoundForImage)
+      expect { subject.tag_with_fallback("registry", "postgresql", "feature-branch") }.to raise_error(Dockistrano::ServiceDependency::NoTagFoundForImage)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Edwin Vlieg