dockistrano 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4869a713668f9a34a7ff283320a89025f37be8fc
-  data.tar.gz: 6cd46f26c5b421a8a1244ff07bc8ee13fc5c9d25
+  metadata.gz: 158d3061ea38673eaf98d564749fc35d959d304b
+  data.tar.gz: 6c106bbf2921d25169e3c1b0c2ed8e783755fdbd
 SHA512:
-  metadata.gz: e3d575c20065873bdd259cce1b1d16c76885c2c3843c7ab8bac87f84fdc901d0b9953abfbf4eff4b73fe6003d66b729aea61b588a19f15ad8397d619e4bfd04f
-  data.tar.gz: c67764b501790eb79ebf7a7a0f8e21feedef23bf9394b7b7e775c5c8a8430311ff243df252343ddbb5f8086f5780f71e20558dc25e1e4a0b9763b55f540f5f07
+  metadata.gz: 9d77e9bfa8f228b922b55d0e874cbd13fecd18a6a9c8ca7c80f25653981615984cd0d3c212afa4fe0ddb93b0181ecba6b2314986103dc990f23186957dbb8063
+  data.tar.gz: 6664a8a469961282bcccf1dacf140cc7e68de7b699011e324cad4d89e1fc2d825c0319ee81f66dace7f1bc1783f915c9a7f918f631006e9a28e16b51c859bcae

data/lib/dockistrano/cli.rb

@@ -81,7 +81,7 @@ module Dockistrano
 
     desc "pull", "Pull new versions of dependencies"
     def pull
-      current_service.backing_services.each do |name, service|
+      current_service.backing_services(initialize: false).each do |name, service|
         if service.newer_version_available?
           service.pull
           say_status "Pulled", name

data/lib/dockistrano/service.rb

@@ -77,6 +77,10 @@ module Dockistrano
       "#{registry}/#{image_name}:#{tag}"
     end
 
+    def full_image_name_with_fallback
+      "#{registry}/#{image_name}:#{tag_with_fallback}"
+    end
+
     # Builds a new image for this service
     def build
       previous_image_id = image_id
@@ -175,26 +179,28 @@ module Dockistrano
 
     # Runs a command in this container
     def run(command, options={})
-      Docker.run(full_image_name, command: command, e: environment_variables, v: volumes, p: ports)
+      Docker.run(full_image_name_with_fallback, command: command, e: environment_variables, v: volumes, p: ports)
     end
 
     # Executes a command in this container
     def exec(command, options={})
       create_data_directories
-      Docker.exec(full_image_name, command: command, e: environment_variables, v: volumes, p: ports)
+      Docker.exec(full_image_name_with_fallback, command: command, e: environment_variables, v: volumes, p: ports)
     end
 
     # Starts a console in the docker container
     def console(command, options={})
       create_data_directories
-      Docker.console(full_image_name, command: command, e: environment_variables, v: volumes, p: ports)
+      Docker.console(full_image_name_with_fallback, command: command, e: environment_variables, v: volumes, p: ports)
     end
 
     # Lists all backing services for this service
-    def backing_services
+    def backing_services(options={})
+      initialize = options.delete(:initialize)
+      initialize = true if initialize.nil?
       @backing_services ||= {}.tap do |hash|
         dependencies.collect do |name, config|
-          hash[name] = ServiceDependency.factory(self, name, config)
+          hash[name] = ServiceDependency.factory(self, name, config, initialize)
         end
       end
     end
@@ -215,10 +221,9 @@ module Dockistrano
           vars["#{name.upcase}_#{k.upcase}"] = v
         end
 
-        vars.merge!(backing_service.environment_variables)
+        vars.merge!(backing_service.provided_environment_variables)
       end
 
-      vars.merge!(provides_env)
       vars.each do |key, value|
         vars.each do |replacement_key, replacement_value|
           unless vars[key].nil? or replacement_value.nil?
@@ -230,6 +235,10 @@ module Dockistrano
       vars
     end
 
+    def provided_environment_variables
+      provides_env
+    end
+
     # Returns the mounted volumes for this service
     def volumes
       [].tap do |volumes|
@@ -247,7 +256,7 @@ module Dockistrano
     # Returns a list of available tags in the registry for the image
     def available_tags
       @available_tags ||= begin
-        registry_instance.tags_for_image(full_image_name)
+        registry_instance.tags_for_image(image_name)
       rescue Dockistrano::Registry::RepositoryNotFoundInRegistry
         []
       end
@@ -268,7 +277,7 @@ module Dockistrano
       if final_tag
         final_tag
       else
-        raise NoTagFoundForImage.new("No tag found for image #{image_name}, available tags: #{available_tags}")
+        raise NoTagFoundForImage.new("No tag found for image #{image_name}, wanted tag #{tag}, available tags: #{available_tags}")
       end
     end
 
@@ -294,18 +303,18 @@ module Dockistrano
 
     def create_data_directories
       if data_directories.any?
-        image_config = Docker.inspect_image(full_image_name)
+        image_config = Docker.inspect_image(full_image_name_with_fallback)
         image_user = image_config["container_config"]["User"]
 
         command = "mkdir -p #{data_directories.collect { |dir| "/dockistrano/data/#{dir}"}.join(" ") }; "
         command += "chown #{image_user}:#{image_user} #{data_directories.collect { |dir| "/dockistrano/data/#{dir}"}.join(" ") }"
         bash_command = "/bin/bash -c '#{command}'"
-        Docker.run(full_image_name, command: bash_command, v: volumes, e: environment_variables, u: "root")
+        Docker.run(full_image_name_with_fallback, command: bash_command, v: volumes, e: environment_variables, u: "root")
       end
     end
 
     def newer_version_available?
-      registry_image_id = registry_instance.latest_id_for_image(image_name, tag)
+      registry_image_id = registry_instance.latest_id_for_image(image_name, tag_with_fallback)
       registry_image_id and image_id != registry_image_id
     end
 

data/lib/dockistrano/service_dependency.rb

@@ -5,8 +5,15 @@ module Dockistrano
     # Creates a new service instance based on the name and configuration. When
     # configuration is not local, the configuration is fetched from Github and
     # processed.
-    def self.factory(service, name, config)
-      ServiceDependency.new(service, name, config).initialized_backing_service
+    # In some cases, you only need an uninitialized version of a dependency, for
+    # example when pulling new versions of images. Provide initialize=false to
+    # skip tag detection and configuration loading from the image.
+    def self.factory(service, name, config, initialize=true)
+      if initialize
+        ServiceDependency.new(service, name, config).initialized_backing_service
+      else
+        ServiceDependency.new(service, name, config).backing_service
+      end
     end
 
     class DefaultEnvironmentMissingInConfiguration < StandardError

data/lib/dockistrano/version.rb

@@ -1,3 +1,3 @@
 module Dockistrano
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/dockistrano/cli_spec.rb

@@ -85,24 +85,28 @@ describe Dockistrano::Cli do
     let(:command) { ["pull"] }
 
     it "pulls a backing service when newer versions are available" do
+      expect(service).to receive(:backing_services).with(initialize: false).and_return({ "postgresql" => backing_service })
       expect(backing_service).to receive(:newer_version_available?).and_return(true)
       expect(backing_service).to receive(:pull)
       expect(output).to include("Pulled")
     end
 
     it "doesn't pull a service when no new versions are available" do
+      expect(service).to receive(:backing_services).with(initialize: false).and_return({ "postgresql" => backing_service })
       expect(backing_service).to receive(:newer_version_available?).and_return(false)
       expect(backing_service).to_not receive(:pull)
       expect(output).to include("Uptodate")
     end
 
     it "pulls the application container when newer versions are available" do
+      expect(service).to receive(:backing_services).with(initialize: false).and_return({ "postgresql" => backing_service })
       expect(service).to receive(:newer_version_available?).and_return(true)
       expect(service).to receive(:pull)
       expect(output).to include("Pulled")
     end
 
     it "doesn't pull the application container when no newer versions are available" do
+      expect(service).to receive(:backing_services).with(initialize: false).and_return({ "postgresql" => backing_service })
       expect(service).to receive(:newer_version_available?).and_return(false)
       expect(service).to_not receive(:pull)
       expect(output).to include("Uptodate")

data/spec/dockistrano/service_dependency_spec.rb

@@ -12,6 +12,12 @@ describe Dockistrano::ServiceDependency do
       expect(service_dependency).to receive(:initialized_backing_service).and_return(service)
       expect(described_class.factory(service, "redis", { foo: "bar" })).to eq(service)
     end
+
+    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(described_class.factory(service, "redis", { foo: "bar" }, false)).to eq(service)
+    end
   end
 
   context "#backing_service" do

data/spec/dockistrano/service_spec.rb

@@ -294,32 +294,35 @@ describe Dockistrano::Service do
 
   context "#run" do
     it "runs the command inside the container" do
+      allow(subject).to receive(:full_image_name_with_fallback).and_return("image:develop")
       allow(subject).to receive(:environment_variables).and_return(environment = double)
       allow(subject).to receive(:volumes).and_return(volumes = double)
       allow(subject).to receive(:ports).and_return(ports = double)
-      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name, e: environment, v: volumes, p: ports, command: "foobar")
+      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name_with_fallback, e: environment, v: volumes, p: ports, command: "foobar")
       subject.run("foobar")
     end
   end
 
   context "#exec" do
     it "executes the command inside the container" do
+      allow(subject).to receive(:full_image_name_with_fallback).and_return("image:develop")
       allow(subject).to receive(:environment_variables).and_return(environment = double)
       allow(subject).to receive(:volumes).and_return(volumes = double)
       allow(subject).to receive(:ports).and_return(ports = double)
       expect(subject).to receive(:create_data_directories)
-      expect(Dockistrano::Docker).to receive(:exec).with(subject.full_image_name, e: environment, v: volumes, p: ports, command: "foobar")
+      expect(Dockistrano::Docker).to receive(:exec).with(subject.full_image_name_with_fallback, e: environment, v: volumes, p: ports, command: "foobar")
       subject.exec("foobar")
     end
   end
 
   context "#console" do
     it "runs the command inside the container" do
+      allow(subject).to receive(:full_image_name_with_fallback).and_return("image:develop")
       allow(subject).to receive(:environment_variables).and_return(environment = double)
       allow(subject).to receive(:volumes).and_return(volumes = double)
       allow(subject).to receive(:ports).and_return(ports = double)
       expect(subject).to receive(:create_data_directories)
-      expect(Dockistrano::Docker).to receive(:console).with(subject.full_image_name, e: environment, v: volumes, p: ports, command: "foobar")
+      expect(Dockistrano::Docker).to receive(:console).with(subject.full_image_name_with_fallback, e: environment, v: volumes, p: ports, command: "foobar")
       subject.console("foobar")
     end
   end
@@ -332,9 +335,14 @@ describe Dockistrano::Service do
     end
 
     it "returns a hash with backing services" do
-      expect(Dockistrano::ServiceDependency).to receive(:factory).with(subject, "postgresql", {}).and_return(service)
+      expect(Dockistrano::ServiceDependency).to receive(:factory).with(subject, "postgresql", {}, true).and_return(service)
       expect(subject.backing_services).to eq({ "postgresql" => service })
     end
+
+    it "returns a hash with uninitialized backing services" do
+      expect(Dockistrano::ServiceDependency).to receive(:factory).with(subject, "postgresql", {}, false).and_return(service)
+      expect(subject.backing_services(initialize: false)).to eq({ "postgresql" => service })
+    end
   end
 
   context "#environment_variables" do
@@ -343,7 +351,7 @@ describe Dockistrano::Service do
         ip_address: "172.0.0.1",
         port: "1245",
         backing_service_env: { database: "dockistrano_development" },
-        environment_variables: { "DATABASE_URL" => "postgres://postgres@$POSTGRESQL_IP/$POSTGRESQL_DATABASE"}
+        provided_environment_variables: { "DATABASE_URL" => "postgres://postgres@$POSTGRESQL_IP/$POSTGRESQL_DATABASE"}
       )
     }
 
@@ -368,18 +376,22 @@ describe Dockistrano::Service do
     end
 
     it "includes environment variables from each backing service" do
-      expect(backing_service).to receive(:environment_variables).and_return({ "SUB_ENV" => "some_value" })
+      expect(backing_service).to receive(:provided_environment_variables).and_return({ "SUB_ENV" => "some_value" })
       expect(subject.environment_variables["SUB_ENV"]).to eq("some_value")
     end
 
+    it "interpolates environment variables with present values" do
+      expect(subject.environment_variables["DATABASE_URL"]).to eq("postgres://postgres@172.0.0.1/dockistrano_development")
+    end
+  end
+
+  context "#provided_environment_variables" do
+
     it "includes environment variables that are provided by the service" do
       expect(subject).to receive(:provides_env).and_return({ "BUNDLE_PATH" => "/bundle" })
-      expect(subject.environment_variables["BUNDLE_PATH"]).to eq("/bundle")
+      expect(subject.provided_environment_variables["BUNDLE_PATH"]).to eq("/bundle")
     end
 
-    it "interpolates environment variables with present values" do
-      expect(subject.environment_variables["DATABASE_URL"]).to eq("postgres://postgres@172.0.0.1/dockistrano_development")
-    end
   end
 
   context "#volumes" do
@@ -398,13 +410,13 @@ describe Dockistrano::Service do
   context "#available_tags" do
     it "returns a list of available tags for the current service" do
       expect(subject).to receive(:registry_instance).and_return(registry = double)
-      expect(registry).to receive(:tags_for_image).with(subject.full_image_name).and_return(["develop", "master"])
+      expect(registry).to receive(:tags_for_image).with(subject.image_name).and_return(["develop", "master"])
       expect(subject.available_tags).to eq(["develop", "master"])
     end
 
     it "returns an empty list when the repository is not found in the registry" do
       expect(subject).to receive(:registry_instance).and_return(registry = double)
-      expect(registry).to receive(:tags_for_image).with(subject.full_image_name).and_raise(Dockistrano::Registry::RepositoryNotFoundInRegistry)
+      expect(registry).to receive(:tags_for_image).with(subject.image_name).and_raise(Dockistrano::Registry::RepositoryNotFoundInRegistry)
       expect(subject.available_tags).to eq([])
     end
   end
@@ -492,12 +504,13 @@ describe Dockistrano::Service do
 
   context "#create_data_directories" do
     it "creates directories in the mounted data folder" do
+      allow(subject).to receive(:full_image_name_with_fallback).and_return("image:develop")
       allow(subject).to receive(:data_directories).and_return(["logs"])
       allow(subject).to receive(:volumes).and_return(volumes = double)
       allow(subject).to receive(:environment_variables).and_return(environment_variables = double)
-      allow(Dockistrano::Docker).to receive(:inspect_image).with(subject.full_image_name).and_return({ "container_config" => { "User" => "app" }})
+      allow(Dockistrano::Docker).to receive(:inspect_image).with(subject.full_image_name_with_fallback).and_return({ "container_config" => { "User" => "app" }})
 
-      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name,
+      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name_with_fallback,
         v: volumes,
         e: environment_variables,
         u: "root",
@@ -513,22 +526,23 @@ describe Dockistrano::Service do
 
     before do
       allow(subject).to receive(:registry_instance).and_return(registry_instance)
+      allow(subject).to receive(:tag_with_fallback).and_return("develop")
     end
 
     it "returns true when a newer version of the image is available" do
       expect(subject).to receive(:image_id).and_return("1")
-      expect(registry_instance).to receive(:latest_id_for_image).with(subject.image_name, subject.tag).and_return("2")
+      expect(registry_instance).to receive(:latest_id_for_image).with(subject.image_name, subject.tag_with_fallback).and_return("2")
       expect(subject.newer_version_available?).to be_true
     end
 
     it "returns false when no registry image id is found" do
-      expect(registry_instance).to receive(:latest_id_for_image).with(subject.image_name, subject.tag).and_return(nil)
+      expect(registry_instance).to receive(:latest_id_for_image).with(subject.image_name, subject.tag_with_fallback).and_return(nil)
       expect(subject.newer_version_available?).to be_false
     end
 
     it "returns false when the registry image id is equal to the local id" do
       expect(subject).to receive(:image_id).and_return("1")
-      expect(registry_instance).to receive(:latest_id_for_image).with(subject.image_name, subject.tag).and_return("1")
+      expect(registry_instance).to receive(:latest_id_for_image).with(subject.image_name, subject.tag_with_fallback).and_return("1")
       expect(subject.newer_version_available?).to be_false
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Edwin Vlieg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor