dockistrano 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ac28b523edaa71eb85020de59988f816994362d
-  data.tar.gz: e7caed84b3299f8824b2771cb521e20a3ab6770c
+  metadata.gz: 4869a713668f9a34a7ff283320a89025f37be8fc
+  data.tar.gz: 6cd46f26c5b421a8a1244ff07bc8ee13fc5c9d25
 SHA512:
-  metadata.gz: a641af2fa6076e1c3e5c72c69abd54e2b43c85d8addb2c5e0e430cda3744954107ac4d495354d7e42cc72b6c765ffbd966ce0f0d0fb9f18319fe3105c0e6d6cf
-  data.tar.gz: 8ec45003411aa01abfeb7ecf4bb5a93b3841f100362f18925c5aea5c623dc09896ef77f2eb7b82dfbbdf227378e1bec4f2a42f4b413a39175a93a3a3cfe60dd6
+  metadata.gz: e3d575c20065873bdd259cce1b1d16c76885c2c3843c7ab8bac87f84fdc901d0b9953abfbf4eff4b73fe6003d66b729aea61b588a19f15ad8397d619e4bfd04f
+  data.tar.gz: c67764b501790eb79ebf7a7a0f8e21feedef23bf9394b7b7e775c5c8a8430311ff243df252343ddbb5f8086f5780f71e20558dc25e1e4a0b9763b55f540f5f07

data/lib/dockistrano/service_dependency.rb

@@ -6,7 +6,7 @@ module Dockistrano
     # configuration is not local, the configuration is fetched from Github and
     # processed.
     def self.factory(service, name, config)
-      ServiceDependency.new(service, name, config).backing_service
+      ServiceDependency.new(service, name, config).initialized_backing_service
     end
 
     class DefaultEnvironmentMissingInConfiguration < StandardError
@@ -21,32 +21,32 @@ module Dockistrano
     end
 
     def backing_service
-      @backing_service ||= begin
-        backing_service = Service.new("default" => {
-          "registry"    => service.registry,
-          "image_name"  => name,
-          "tag"         => service.tag,
-          "backing_service_env" =>  config
-        })
-
-        backing_service.tag = tag_with_fallback(service.registry, name, service.tag)
-
-        begin
-          loaded_config = load_config
-          if loaded_config and loaded_config["default"]
-            backing_service.config = loaded_config["default"]
-          else
-            raise DefaultEnvironmentMissingInConfiguration.new("No 'default' configuration found in /dockistrano.yml file in #{name} container.")
-          end
-        rescue ContainerConfigurationMissing
-          puts "Warning: no configuration file found for service #{name}."
-        rescue HostDirectoriesMissing
-          puts "Error: missing host directory configuration for #{name}. Please execute `doc setup`"
-          exit 1
-        end
+      @backing_service ||= Service.new("default" => {
+        "registry"    => service.registry,
+        "image_name"  => name,
+        "tag"         => service.tag,
+        "backing_service_env" =>  config
+      })
+    end
 
-        backing_service
+    def initialized_backing_service
+      backing_service.tag = tag_with_fallback(service.tag)
+
+      begin
+        loaded_config = load_config
+        if loaded_config and loaded_config["default"]
+          backing_service.config = loaded_config["default"]
+        else
+          raise DefaultEnvironmentMissingInConfiguration.new("No 'default' configuration found in /dockistrano.yml file in #{name} container.")
+        end
+      rescue ContainerConfigurationMissing
+        puts "Warning: no configuration file found for service #{name}."
+      rescue HostDirectoriesMissing
+        puts "Error: missing host directory configuration for #{name}. Please execute `doc setup`"
+        exit 1
       end
+
+      backing_service
     end
 
     def load_config
@@ -89,10 +89,10 @@ module Dockistrano
     class NoTagFoundForImage < StandardError
     end
 
-    def tag_with_fallback(registry, image_name, tag)
+    def tag_with_fallback(tag)
       fallback_tags = [tag, "develop", "master", "latest"]
 
-      available_tags = Docker.tags_for_image("#{registry}/#{image_name}")
+      available_tags = Docker.tags_for_image("#{backing_service.registry}/#{backing_service.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 #{image_name}, locally available tags: #{available_tags} `doc pull` for more tags from repository.")
+        raise NoTagFoundForImage.new("No tag found for image #{backing_service.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.3"
+  VERSION = "0.0.4"
 end

data/spec/dockistrano/service_dependency_spec.rb

@@ -9,17 +9,12 @@ describe Dockistrano::ServiceDependency do
   context ".factory" do
     it "creates a new service based on the name" do
       expect(described_class).to receive(:new).and_return(service_dependency)
-      expect(service_dependency).to receive(:backing_service).and_return(service)
+      expect(service_dependency).to receive(:initialized_backing_service).and_return(service)
       expect(described_class.factory(service, "redis", { foo: "bar" })).to eq(service)
     end
   end
 
-  context "#initialize" do
-    before do
-      allow(subject).to receive(:load_config).and_return({ "default" => {} })
-      allow(subject).to receive(:tag_with_fallback).and_return("develop")
-    end
-
+  context "#backing_service" do
     it "backing service has registry of the service" do
       expect(subject.backing_service.registry).to eq("my.registry.net")
     end
@@ -31,19 +26,26 @@ describe Dockistrano::ServiceDependency do
     it "backing service has the tag of the service" do
       expect(subject.backing_service.tag).to eq("develop")
     end
+  end
+
+  context "#initialized_backing_service" do
+    before do
+      allow(subject).to receive(:load_config).and_return({ "default" => {} })
+      allow(subject).to receive(:tag_with_fallback).and_return("develop")
+    end
 
     it "backing service has backing service environment variables from configuration" do
-      expect(subject.backing_service.backing_service_env).to eq({ database: "application_development" })
+      expect(subject.initialized_backing_service.backing_service_env).to eq({ database: "application_development" })
     end
 
     it "sets the tag with a fallback" do
-      expect(subject).to receive(:tag_with_fallback).with("my.registry.net", "postgresql", "develop").and_return("latest")
-      expect(subject.backing_service.tag).to eq("latest")
+      expect(subject).to receive(:tag_with_fallback).with("develop").and_return("latest")
+      expect(subject.initialized_backing_service.tag).to eq("latest")
     end
 
     it "loads the configuration" do
       expect(subject).to receive(:load_config).and_return({ "default" => { "test_command" => "foobar" }})
-      expect(subject.backing_service.test_command).to eq("foobar")
+      expect(subject.initialized_backing_service.test_command).to eq("foobar")
     end
   end
 
@@ -119,29 +121,35 @@ 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("registry", "postgresql", "feature-branch")).to eq("feature-branch")
+      expect(subject.tag_with_fallback("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("registry", "postgresql", "feature-branch")).to eq("develop")
+      expect(subject.tag_with_fallback("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("registry", "postgresql", "feature-branch")).to eq("master")
+      expect(subject.tag_with_fallback("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("registry", "postgresql", "feature-branch")).to eq("latest")
+      expect(subject.tag_with_fallback("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("registry", "postgresql", "feature-branch") }.to raise_error(Dockistrano::ServiceDependency::NoTagFoundForImage)
+      expect { subject.tag_with_fallback("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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Edwin Vlieg