dockistrano 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158d3061ea38673eaf98d564749fc35d959d304b
-  data.tar.gz: 6c106bbf2921d25169e3c1b0c2ed8e783755fdbd
+  metadata.gz: 91762ce1db149fa71eab678c80fbc5c7e60c5cbd
+  data.tar.gz: 28d8236dcd51b0d5235fb3ef62252514064d07c2
 SHA512:
-  metadata.gz: 9d77e9bfa8f228b922b55d0e874cbd13fecd18a6a9c8ca7c80f25653981615984cd0d3c212afa4fe0ddb93b0181ecba6b2314986103dc990f23186957dbb8063
-  data.tar.gz: 6664a8a469961282bcccf1dacf140cc7e68de7b699011e324cad4d89e1fc2d825c0319ee81f66dace7f1bc1783f915c9a7f918f631006e9a28e16b51c859bcae
+  metadata.gz: eec347010dcdec6e2db6ba72799be478aa41dff197cb2360849d20ad66a1ca205af2f817ade16b7369d5fbb3f193f89005a3ff1900455e23a18c879845f66196
+  data.tar.gz: a52f46d46ef9510b6a6a8dd7c23db0a67531958dc9f9e0731c14a73d7b795a53e4a358cf016892692c28de1d642430e7847fad54ff6bf252f2cc0c1e0ec3dbd6

data/Guardfile

@@ -7,3 +7,8 @@ guard :rspec do
   watch('spec/spec_helper.rb')  { "spec" }
 end
 
+guard :shell do
+  watch %r{^lib\/(.+)\.rb$} do |m|
+    `rake install`
+  end
+end

data/dockistrano.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "guard-shell"
   spec.add_development_dependency "terminal-notifier-guard"
   spec.add_development_dependency "webmock"
 end

data/lib/dockistrano/cli.rb

@@ -3,14 +3,7 @@ require "dotenv"
 Dotenv.load(".dockistrano")
 ENV["DOCKISTRANO_ENVIRONMENT"] ||= "default"
 ENV["DOCKER_HOST_IP"] ||= "127.0.0.1"
-ENV["DOCKER_BINARY"] ||= begin
-  if RUBY_PLATFORM =~ /darwin|mac os/
-    bin_dir = File.expand_path(File.dirname(__FILE__) + "/../../bin")
-    "#{bin_dir}/docker"
-  else
-    "docker"
-  end
-end
+ENV["DOCKER_BINARY"] ||= "docker"
 
 module Dockistrano
 
@@ -145,6 +138,7 @@ module Dockistrano
     def stop(id=nil)
       if id
         Docker.stop(id)
+        Docker.remove_container(id)
         say_status("Stopped", id, :green)
       else
         current_service.stop
@@ -186,16 +180,28 @@ module Dockistrano
 
     desc "logs [NAME]", "Prints the logs for the service"
     def logs(name=nil)
-      service = name ? current_service.backing_services[name] : current_service
+      if name and current_service.backing_services[name]
+        service = current_service.backing_services[name]
+        command_name = nil
+      else
+        service = current_service
+        command_name = name
+      end
+
       if service.running?
         say "Container #{service.image_name} running, attaching to output", :blue
-        service.attach
+        service.attach(command_name)
       else
         say "Container #{service.image_name} stopped, printing logs of last run", :blue
-        service.logs
+        service.logs(command_name)
       end
     end
 
+    desc "version", "Prints version information"
+    def version
+      say "Dockistrano version: #{Dockistrano::VERSION}"
+    end
+
     def method_missing(*args)
       command = args[0]
       if command and current_service.config["aliases"] and current_service.config["aliases"][command.to_s]

data/lib/dockistrano/docker.rb

@@ -95,6 +95,10 @@ module Dockistrano
       execute(["attach", id], :stream)
     end
 
+    def self.remove_container(name)
+      execute(["rm", name])
+    end
+
     def self.clean
       Dockistrano::CommandLine.command_with_stream("#{docker_command} rmi $(#{docker_command} images -a | grep \"^<none>\" | awk '{print $3}')")
       Dockistrano::CommandLine.command_with_stream("#{docker_command} rm $(#{docker_command} ps -a -q)")

data/lib/dockistrano/service.rb

@@ -115,18 +115,13 @@ module Dockistrano
 
     # Stops the container of the current service
     def stop
-      if !host.nil?
-        hipache = Hipache.new(ENV['DOCKER_HOST_IP'])
-        if host.kind_of?(String)
-          hipache.unregister(image_name, host, ip_address, port)
-        else
-          host.each do |hostname, port|
-            hipache.unregister(image_name, hostname, ip_address, port)
-          end
-        end
+      update_hipache(false)
+      Docker.stop(image_name)
+      Docker.remove_container(image_name)
+      additional_commands.each do |name, _|
+        Docker.stop("#{image_name}_#{name}")
+        Docker.remove_container("#{image_name}_#{name}")
       end
-
-      Docker.stop_all_containers_from_image(full_image_name)
     end
 
     # Returns if this service is running
@@ -151,6 +146,19 @@ module Dockistrano
       Dockistrano::Docker.push("#{registry}/#{image_name}", tag)
     end
 
+    def update_hipache(server_up=true)
+      if !host.nil?
+        hipache = Hipache.new(ENV['DOCKER_HOST_IP'])
+        host.each do |hostname, port|
+          if server_up
+            hipache.register(image_name, hostname, ip_address_for_port(port), port)
+          else
+            hipache.unregister(image_name, hostname, ip_address_for_port(port), port)
+          end
+        end
+      end
+    end
+
     # Starts this service
     def start(options={})
       ensure_backing_services
@@ -159,39 +167,29 @@ module Dockistrano
 
       if additional_commands.any?
         additional_commands.each do |name, command|
-          Docker.run(full_image_name, e: environment, v: volumes, p: ports, d: true, command: command)
+          Docker.run(full_image_name, name: "#{image_name}_#{name}", link: link_backing_services, e: environment, v: volumes, d: true, command: command)
         end
       end
 
-      Docker.run(full_image_name, e: environment, v: volumes, p: ports, d: true)
-
-      if !host.nil?
-        hipache = Hipache.new(ENV['DOCKER_HOST_IP'])
-        if host.kind_of?(String)
-          hipache.register(image_name, host, ip_address, port)
-        else
-          host.each do |hostname, port|
-            hipache.register(image_name, hostname, ip_address, port)
-          end
-        end
-      end
+      Docker.run(full_image_name, name: image_name, link: link_backing_services, e: environment, v: volumes, p: ports, d: true)
+      update_hipache(true)
     end
 
     # Runs a command in this container
     def run(command, options={})
-      Docker.run(full_image_name_with_fallback, command: command, e: environment_variables, v: volumes, p: ports)
+      Docker.run(full_image_name_with_fallback, link: link_backing_services, command: command, e: environment_variables, v: volumes)
     end
 
     # Executes a command in this container
     def exec(command, options={})
       create_data_directories
-      Docker.exec(full_image_name_with_fallback, command: command, e: environment_variables, v: volumes, p: ports)
+      Docker.exec(full_image_name_with_fallback, link: link_backing_services, command: command, e: environment_variables, v: volumes)
     end
 
     # Starts a console in the docker container
     def console(command, options={})
       create_data_directories
-      Docker.console(full_image_name_with_fallback, command: command, e: environment_variables, v: volumes, p: ports)
+      Docker.console(full_image_name_with_fallback, link: link_backing_services, command: command, e: environment_variables, v: volumes)
     end
 
     # Lists all backing services for this service
@@ -205,6 +203,13 @@ module Dockistrano
       end
     end
 
+    # Returns an array of backing services to link
+    def link_backing_services
+      backing_services.collect { |name, service|
+        "#{service.image_name}:#{service.image_name}"
+      }
+    end
+
     # Returns an array of environment variables
     def environment_variables
       vars = {}
@@ -214,9 +219,6 @@ module Dockistrano
       end
 
       backing_services.each do |name, backing_service|
-        vars["#{name.upcase}_IP"] = backing_service.ip_address
-        vars["#{name.upcase}_PORT"] = backing_service.port
-
         backing_service.backing_service_env.each do |k,v|
           vars["#{name.upcase}_#{k.upcase}"] = v
         end
@@ -226,8 +228,10 @@ module Dockistrano
 
       vars.each do |key, value|
         vars.each do |replacement_key, replacement_value|
-          unless vars[key].nil? or replacement_value.nil?
-            vars[key] = vars[key].gsub('$'+replacement_key, replacement_value)
+          vars[key] = if vars[key].nil? or replacement_value.nil? or replacement_value.empty?
+            vars[key].gsub('$'+replacement_key, '$'+replacement_key)
+          else
+            vars[key].gsub('$'+replacement_key, replacement_value)
           end
         end
       end
@@ -244,7 +248,9 @@ module Dockistrano
       [].tap do |volumes|
         volumes << "/dockistrano/#{image_name.gsub("-", "_")}/data:/dockistrano/data"
         if mount_src and !mount_src.empty?
-          volumes << "/dockistrano/#{image_name.gsub("-", "_")}/src:#{mount_src}"
+          mount_src.each do |host_src, container_src|
+            volumes << "#{host_src}:#{container_src}"
+          end
         end
       end
     end
@@ -281,24 +287,34 @@ module Dockistrano
       end
     end
 
-    def ip_address
-      container_settings["NetworkSettings"]["IPAddress"] if running?
-    end
-
-    def port
-      container_settings["NetworkSettings"]["PortMapping"]["Tcp"].keys.first if running?
+    def ip_address_for_port(port)
+      container_settings["NetworkSettings"]["Ports"]["#{port}/tcp"].first["HostIp"] if running?
     end
 
     def ports
-      (config["ports"] || {}).collect { |k,v| "#{k}:#{v}" }
+      (config["ports"] || {}).collect { |k,v|
+        if k.to_s.include?(":")
+          "#{k}:#{v}"
+        else
+          "172.17.42.1:#{k}:#{v}"
+        end
+      }
     end
 
-    def attach
-      Docker.attach(Docker.running_container_id(full_image_name))
+    def attach(name=nil)
+      if name
+        Docker.attach("#{image_name}_#{name}")
+      else
+        Docker.attach(image_name)
+      end
     end
 
-    def logs
-      Docker.logs(Docker.last_run_container_id(full_image_name))
+    def logs(name=nil)
+      if name
+        Docker.logs("#{image_name}_#{name}")
+      else
+        Docker.logs(image_name)
+      end
     end
 
     def create_data_directories
@@ -309,7 +325,7 @@ module Dockistrano
         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_with_fallback, 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", rm: true)
       end
     end
 

data/lib/dockistrano/service_dependency.rb

@@ -76,7 +76,7 @@ module Dockistrano
     end
 
     def load_from_image
-      raw_config = Docker.run(backing_service.full_image_name, command: "cat /dockistrano.yml")
+      raw_config = Docker.run(backing_service.full_image_name, command: "cat /dockistrano.yml", rm: true)
       if raw_config.empty? or raw_config.include?("No such file or directory")
         if raw_config.include?("failed to mount")
           raise HostDirectoriesMissing

data/lib/dockistrano/version.rb

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

data/spec/dockistrano/cli_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Dockistrano::Cli do
 
   let(:service) { double(registry: "registry.provider.tld", image_name: "application", tag: "develop", volumes: [], backing_services: { "postgresql" => backing_service }, environment_variables: {}, newer_version_available?: false, stop: nil) }
-  let(:backing_service) { double(full_image_name: "registry.provider.tld/postgresql:develop", image_name: "postgresql", running?: false, newer_version_available?: false, start: nil, stop: nil) }
+  let(:backing_service) { double(:backing_service, full_image_name: "registry.provider.tld/postgresql:develop", image_name: "postgresql", running?: false, newer_version_available?: false, start: nil, stop: nil) }
   let(:hipache) { double }
   let(:output) { capture(:stdout) { described_class.start(command) } }
 
@@ -187,6 +187,7 @@ describe Dockistrano::Cli do
 
     it "stops the container with the id" do
       expect(Dockistrano::Docker).to receive(:stop).with("123456789")
+      expect(Dockistrano::Docker).to receive(:remove_container).with("123456789")
       expect(output).to include("Stopped")
     end
   end
@@ -259,33 +260,49 @@ describe Dockistrano::Cli do
 
     it "attaches to the containers output when the container is running" do
       expect(service).to receive(:running?).and_return(true)
-      expect(service).to receive(:attach)
+      expect(service).to receive(:attach).with(nil)
       expect(output).to include("Container application running, attaching to output")
     end
 
     it "prints the logs of the last run" do
       expect(service).to receive(:running?).and_return(false)
-      expect(service).to receive(:logs)
+      expect(service).to receive(:logs).with(nil)
       expect(output).to include("Container application stopped, printing logs of last run")
     end
   end
 
-  context "doc logs NAME" do
+  context "doc logs BACKING_SERVICE" do
     let(:command) { ["logs", "postgresql"] }
 
     it "attaches to the containers output when the container is running" do
       expect(backing_service).to receive(:running?).and_return(true)
-      expect(backing_service).to receive(:attach)
+      expect(backing_service).to receive(:attach).with(nil)
       expect(output).to include("Container postgresql running, attaching to output")
     end
 
     it "prints the logs of the last run" do
       expect(backing_service).to receive(:running?).and_return(false)
-      expect(backing_service).to receive(:logs)
+      expect(backing_service).to receive(:logs).with(nil)
       expect(output).to include("Container postgresql stopped, printing logs of last run")
     end
   end
 
+  context "doc logs ADDITIONAL_COMMAND" do
+    let(:command) { ["logs", "worker"] }
+
+    it "attaches to the containers output when the container is running" do
+      expect(service).to receive(:running?).and_return(true)
+      expect(service).to receive(:attach).with("worker")
+      expect(output).to include("Container application running, attaching to output")
+    end
+
+    it "prints the logs of the last run" do
+      expect(service).to receive(:running?).and_return(false)
+      expect(service).to receive(:logs).with("worker")
+      expect(output).to include("Container application stopped, printing logs of last run")
+    end
+  end
+
   context "doc ALIAS ARGUMENTS" do
     let(:command) { ["rspec", "spec/models/my_model_spec.rb"] }
 

data/spec/dockistrano/docker_spec.rb

@@ -187,6 +187,13 @@ describe Dockistrano::Docker do
     end
   end
 
+  context ".remove_container" do
+    it "removes the container" do
+      expect(subject).to receive(:execute).with(["rm", "application"])
+      subject.remove_container("application")
+    end
+  end
+
   context ".inspect_container" do
     it "returns information about the container" do
       stub_request(:get, 'http://127.0.0.1:4243/containers/123456789/json').to_return({

data/spec/dockistrano/service_dependency_spec.rb

@@ -98,7 +98,7 @@ describe Dockistrano::ServiceDependency do
     end
 
     it "reads the configuration from the image and caches the configuration" do
-      expect(Dockistrano::Docker).to receive(:run).with(backing_service.full_image_name, command: "cat /dockistrano.yml").and_return(raw_config = "---\ndefault:\n\tconfiguration: value")
+      expect(Dockistrano::Docker).to receive(:run).with(backing_service.full_image_name, command: "cat /dockistrano.yml", rm: true).and_return(raw_config = "---\ndefault:\n\tconfiguration: value")
 
       expect(FileUtils).to receive(:mkdir_p).with("tmp/configuration_cache")
       expect(File).to receive(:open).with("tmp/configuration_cache/#{backing_service.image_id}", "w+").and_return(file = double)
@@ -111,17 +111,17 @@ describe Dockistrano::ServiceDependency do
     end
 
     it "raises an error when host directories are missing" do
-      expect(Dockistrano::Docker).to receive(:run).with(backing_service.full_image_name, command: "cat /dockistrano.yml").and_return("No such file or directory: failed to mount")
+      expect(Dockistrano::Docker).to receive(:run).with(backing_service.full_image_name, command: "cat /dockistrano.yml", rm: true).and_return("No such file or directory: failed to mount")
       expect { subject.load_from_image }.to raise_error(Dockistrano::ServiceDependency::HostDirectoriesMissing)
     end
 
     it "raises an error when the configuration is not found" do
-      expect(Dockistrano::Docker).to receive(:run).with(backing_service.full_image_name, command: "cat /dockistrano.yml").and_return("No such file or directory: dockistrano.yml")
+      expect(Dockistrano::Docker).to receive(:run).with(backing_service.full_image_name, command: "cat /dockistrano.yml", rm: true).and_return("No such file or directory: dockistrano.yml")
       expect { subject.load_from_image }.to raise_error(Dockistrano::ServiceDependency::ContainerConfigurationMissing)
     end
 
     it "raises an error when the configuration is empty" do
-      expect(Dockistrano::Docker).to receive(:run).with(backing_service.full_image_name, command: "cat /dockistrano.yml").and_return("")
+      expect(Dockistrano::Docker).to receive(:run).with(backing_service.full_image_name, command: "cat /dockistrano.yml", rm: true).and_return("")
       expect { subject.load_from_image }.to raise_error(Dockistrano::ServiceDependency::ContainerConfigurationMissing)
     end
   end

data/spec/dockistrano/service_spec.rb

@@ -158,30 +158,31 @@ describe Dockistrano::Service do
   end
 
   context "#stop" do
-    let(:hipache) { double }
-
     before do
-      allow(Dockistrano::Docker).to receive(:stop_all_containers_from_image)
-      allow(Dockistrano::Hipache).to receive(:new).and_return(hipache)
+      allow(Dockistrano::Docker).to receive(:stop)
+      allow(Dockistrano::Docker).to receive(:remove_container)
+      allow(subject).to receive(:additional_commands).and_return({ "worker" => "sidekiq" })
+      allow(subject).to receive(:update_hipache)
     end
 
     it "stops the container" do
-      expect(Dockistrano::Docker).to receive(:stop_all_containers_from_image).with(subject.full_image_name)
+      expect(Dockistrano::Docker).to receive(:stop).with(subject.image_name)
       subject.stop
     end
 
-    it "unregisters a host from Hipache" do
-      allow(subject).to receive(:host).and_return("hostname.dev")
-      expect(subject).to receive(:ip_address).and_return("33.33.33.33")
-      expect(subject).to receive(:port).and_return("3000")
-      expect(hipache).to receive(:unregister).with(subject.image_name, "hostname.dev", "33.33.33.33", "3000")
+    it "removes the container from Docker" do
+      expect(Dockistrano::Docker).to receive(:remove_container).with(subject.image_name)
       subject.stop
     end
 
-    it "unregisters multiple hosts from Hipache" do
-      allow(subject).to receive(:host).and_return({ "hostname.dev" => "8000" })
-      expect(subject).to receive(:ip_address).and_return("33.33.33.33")
-      expect(hipache).to receive(:unregister).with(subject.image_name, "hostname.dev", "33.33.33.33", "8000")
+    it "stops containers running additional commands" do
+      expect(Dockistrano::Docker).to receive(:stop).with("#{subject.image_name}_worker")
+      expect(Dockistrano::Docker).to receive(:remove_container).with("#{subject.image_name}_worker")
+      subject.stop
+    end
+
+    it "updates Hipache" do
+      expect(subject).to receive(:update_hipache).with(false)
       subject.stop
     end
   end
@@ -239,19 +240,42 @@ describe Dockistrano::Service do
     end
   end
 
+  context "#update_hipache" do
+    let(:hipache) { double }
+
+    before do
+      allow(Dockistrano::Hipache).to receive(:new).and_return(hipache)
+    end
+
+    it "registers the host in Hipache when the server is up" do
+      allow(subject).to receive(:host).and_return({ "hostname.dev" => "8000" })
+      expect(subject).to receive(:ip_address_for_port).with("8000").and_return("33.33.33.33")
+      expect(hipache).to receive(:register).with(subject.image_name, "hostname.dev", "33.33.33.33", "8000")
+      subject.update_hipache(true)
+    end
+
+    it "unregisters the host in Hipache when the server is down" do
+      allow(subject).to receive(:host).and_return({ "hostname.dev" => "8000" })
+      expect(subject).to receive(:ip_address_for_port).with("8000").and_return("33.33.33.33")
+      expect(hipache).to receive(:unregister).with(subject.image_name, "hostname.dev", "33.33.33.33", "8000")
+      subject.update_hipache(false)
+    end
+  end
+
   context "#start" do
     let(:environment) { double }
     let(:volumes) { double }
     let(:ports) { double }
-    let(:hipache) { double }
+    let(:links) { double }
 
     before do
-      allow(Dockistrano::Hipache).to receive(:new).and_return(hipache)
+      allow(subject).to receive(:update_hipache)
       allow(subject).to receive(:ensure_backing_services)
       allow(subject).to receive(:create_data_directories)
       allow(subject).to receive(:checked_environment_variables).and_return(environment)
       allow(subject).to receive(:volumes).and_return(volumes)
       allow(subject).to receive(:ports).and_return(ports)
+      allow(subject).to receive(:link_backing_services).and_return(links)
       allow(Dockistrano::Docker).to receive(:run)
     end
 
@@ -267,27 +291,17 @@ describe Dockistrano::Service do
 
     it "starts additional container when additional commands are configured" do
       allow(subject).to receive(:additional_commands).and_return({ "worker" => "sidekiq start" })
-      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name, e: environment, v: volumes, p: ports, d: true, command: "sidekiq start")
+      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name, name: "#{subject.image_name}_worker", link: links, e: environment, v: volumes, d: true, command: "sidekiq start")
       subject.start
     end
 
     it "starts the container with the default command, providing env variables and volumes" do
-      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name, e: environment, v: volumes, p: ports, d: true)
-      subject.start
-    end
-
-    it "registers a host with Hipache" do
-      allow(subject).to receive(:host).and_return("hostname.dev")
-      expect(subject).to receive(:ip_address).and_return("33.33.33.33")
-      expect(subject).to receive(:port).and_return("3000")
-      expect(hipache).to receive(:register).with(subject.image_name, "hostname.dev", "33.33.33.33", "3000")
+      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name, name: subject.image_name, link: links, e: environment, v: volumes, p: ports, d: true)
       subject.start
     end
 
-    it "registers multiple hosts with Hipache" do
-      allow(subject).to receive(:host).and_return({ "hostname.dev" => "8000" })
-      expect(subject).to receive(:ip_address).and_return("33.33.33.33")
-      expect(hipache).to receive(:register).with(subject.image_name, "hostname.dev", "33.33.33.33", "8000")
+    it "updates Hipache" do
+      expect(subject).to receive(:update_hipache)
       subject.start
     end
   end
@@ -297,8 +311,8 @@ describe Dockistrano::Service 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_with_fallback, e: environment, v: volumes, p: ports, command: "foobar")
+      allow(subject).to receive(:link_backing_services).and_return(link = double)
+      expect(Dockistrano::Docker).to receive(:run).with(subject.full_image_name_with_fallback, link: link, e: environment, v: volumes, command: "foobar")
       subject.run("foobar")
     end
   end
@@ -308,9 +322,9 @@ describe Dockistrano::Service 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)
+      allow(subject).to receive(:link_backing_services).and_return(link = double)
       expect(subject).to receive(:create_data_directories)
-      expect(Dockistrano::Docker).to receive(:exec).with(subject.full_image_name_with_fallback, e: environment, v: volumes, p: ports, command: "foobar")
+      expect(Dockistrano::Docker).to receive(:exec).with(subject.full_image_name_with_fallback, link: link, e: environment, v: volumes, command: "foobar")
       subject.exec("foobar")
     end
   end
@@ -320,9 +334,9 @@ describe Dockistrano::Service 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)
+      allow(subject).to receive(:link_backing_services).and_return(link = double)
       expect(subject).to receive(:create_data_directories)
-      expect(Dockistrano::Docker).to receive(:console).with(subject.full_image_name_with_fallback, e: environment, v: volumes, p: ports, command: "foobar")
+      expect(Dockistrano::Docker).to receive(:console).with(subject.full_image_name_with_fallback, link: link, e: environment, v: volumes, command: "foobar")
       subject.console("foobar")
     end
   end
@@ -345,13 +359,23 @@ describe Dockistrano::Service do
     end
   end
 
+  context "#link_backing_services" do
+    it "returns an array with image names of backing services" do
+      allow(subject).to receive(:backing_services).and_return({
+        "postgresql" => double(image_name: "postgresql"),
+        "redis" => double(image_name: "redis")
+      })
+      expect(subject.link_backing_services).to eq(["postgresql:postgresql", "redis:redis"])
+    end
+  end
+
   context "#environment_variables" do
     let(:backing_service){
       double(
         ip_address: "172.0.0.1",
         port: "1245",
         backing_service_env: { database: "dockistrano_development" },
-        provided_environment_variables: { "DATABASE_URL" => "postgres://postgres@$POSTGRESQL_IP/$POSTGRESQL_DATABASE"}
+        provided_environment_variables: { "DATABASE_URL" => "postgres://postgres@172.0.0.1/$POSTGRESQL_DATABASE"}
       )
     }
 
@@ -365,11 +389,6 @@ describe Dockistrano::Service do
       expect(subject.environment_variables["RAILS_ENV"]).to eq("test")
     end
 
-    it "includes environment variables with the ip and port of each backing service" do
-      expect(subject.environment_variables).to include("POSTGRESQL_IP")
-      expect(subject.environment_variables).to include("POSTGRESQL_PORT")
-    end
-
     it "includes variables for the backing service provided in the local configuration" do
       expect(subject.environment_variables).to include("POSTGRESQL_DATABASE")
       expect(subject.environment_variables["POSTGRESQL_DATABASE"]).to eq("dockistrano_development")
@@ -383,6 +402,11 @@ describe Dockistrano::Service do
     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
+
+    it "leaves variables in tact that could not be replaced" do
+      subject.config = { "environment" => { "rails_env" => "test$FOOBAR" } }
+      expect(subject.environment_variables["RAILS_ENV"]).to eq("test$FOOBAR")
+    end
   end
 
   context "#provided_environment_variables" do
@@ -400,8 +424,8 @@ describe Dockistrano::Service do
     end
 
     it "includes a source mount when configured" do
-      allow(subject).to receive(:mount_src).and_return("/home/app")
-      expect(subject.volumes).to include("/dockistrano/image/src:/home/app")
+      allow(subject).to receive(:mount_src).and_return({ "/home/vagrant/src/app2" => "/home/app" })
+      expect(subject.volumes).to include("/home/vagrant/src/app2:/home/app")
     end
   end
 
@@ -453,53 +477,55 @@ describe Dockistrano::Service do
     end
   end
 
-  context "#ip_address" do
-    it "returns the ip address of the running container" do
-      allow(subject).to receive(:running?).and_return(true)
-      allow(subject).to receive(:container_settings).and_return({ "NetworkSettings" => { "IPAddress" => "33.33.33.10" }})
-      expect(subject.ip_address).to eq("33.33.33.10")
-    end
-
-    it "returns nil when the container is not running" do
-      allow(subject).to receive(:running?).and_return(false)
-      expect(subject.ip_address).to be_nil
-    end
-  end
-
-  context "#port" do
-    it "returns the ip address of the running container" do
+  context "#ip_address_for_port" do
+    it "returns the ip address at which the port is listening" do
       allow(subject).to receive(:running?).and_return(true)
-      allow(subject).to receive(:container_settings).and_return({ "NetworkSettings" => { "PortMapping" => { "Tcp" => { "8000" => "80" } } } })
-      expect(subject.port).to eq("8000")
-    end
-
-    it "returns nil when the container is not running" do
-      allow(subject).to receive(:running?).and_return(false)
-      expect(subject.port).to be_nil
+      allow(subject).to receive(:container_settings).and_return({ "NetworkSettings" => { "Ports" => {
+        "3000/tcp" => [
+          {
+            "HostIp" => "127.0.0.1",
+            "HostPort" => "3000"
+          }
+        ]
+      }}})
+      expect(subject.ip_address_for_port(3000)).to eq("127.0.0.1")
     end
   end
 
   context "#ports" do
     it "returns a string representation of the port mappings" do
       subject.config = { "ports" => { "1234" => "5678" } }
-      expect(subject.ports).to eq(["1234:5678"])
+      expect(subject.ports).to eq(["172.17.42.1:1234:5678"])
+    end
+
+    it "returns the ip address included in the configuration" do
+      subject.config = { "ports" => { "33.33.33.10:1234" => "5678" } }
+      expect(subject.ports).to eq(["33.33.33.10:1234:5678"])
     end
   end
 
   context "#attach" do
     it "attaches to the output of the container" do
-      expect(Dockistrano::Docker).to receive(:attach).with("123456")
-      expect(Dockistrano::Docker).to receive(:running_container_id).with(subject.full_image_name).and_return("123456")
+      expect(Dockistrano::Docker).to receive(:attach).with(subject.image_name)
       subject.attach
     end
+
+    it "attaches to the output of the container when additional command given" do
+      expect(Dockistrano::Docker).to receive(:attach).with("#{subject.image_name}_worker")
+      subject.attach("worker")
+    end
   end
 
   context "#logs" do
     it "returns the logs of the last run of the container" do
-      expect(Dockistrano::Docker).to receive(:logs).with("123456")
-      expect(Dockistrano::Docker).to receive(:last_run_container_id).with(subject.full_image_name).and_return("123456")
+      expect(Dockistrano::Docker).to receive(:logs).with(subject.image_name)
       subject.logs
     end
+
+    it "returns the logs of the last run of the container when additional command given" do
+      expect(Dockistrano::Docker).to receive(:logs).with("#{subject.image_name}_worker")
+      subject.logs("worker")
+    end
   end
 
   context "#create_data_directories" do
@@ -514,6 +540,7 @@ describe Dockistrano::Service do
         v: volumes,
         e: environment_variables,
         u: "root",
+        rm: true,
         command: "/bin/bash -c 'mkdir -p /dockistrano/data/logs; chown app:app /dockistrano/data/logs'"
       )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Edwin Vlieg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,6 +136,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +183,6 @@ email:
 - edwin@moneybird.com
 executables:
 - doc
-- docker
 extensions: []
 extra_rdoc_files: []
 files:
@@ -181,7 +194,6 @@ files:
 - README.md
 - Rakefile
 - bin/doc
-- bin/docker
 - dockistrano.gemspec
 - lib/dockistrano.rb
 - lib/dockistrano/cli.rb