dockistrano 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91762ce1db149fa71eab678c80fbc5c7e60c5cbd
-  data.tar.gz: 28d8236dcd51b0d5235fb3ef62252514064d07c2
+  metadata.gz: b35d583a8fab01a67cce0aaa48b6991bf37ade7a
+  data.tar.gz: 2b732ea55ec66f519e2c1e78c111d846849f153f
 SHA512:
-  metadata.gz: eec347010dcdec6e2db6ba72799be478aa41dff197cb2360849d20ad66a1ca205af2f817ade16b7369d5fbb3f193f89005a3ff1900455e23a18c879845f66196
-  data.tar.gz: a52f46d46ef9510b6a6a8dd7c23db0a67531958dc9f9e0731c14a73d7b795a53e4a358cf016892692c28de1d642430e7847fad54ff6bf252f2cc0c1e0ec3dbd6
+  metadata.gz: 0be8f640a0a35ab5529ca25b34328fb299a98ad579f4e8510592023c3c8fb6b6d98a3d7d5d30a427040567be62cca1f29ed8e23a35c5503ef884fd4cec5fa9db
+  data.tar.gz: b8125c8ddd5c22d9e5e4922a984fbe5014316216daffb3cffb8e19cb9a75079d822fe5c3037dbd078608b6b0a97bafb38a3a6146d92952fdef4a75de2a013da2

data/lib/dockistrano/cli.rb

@@ -17,8 +17,7 @@ module Dockistrano
     desc "setup", "Sets up a host for starting the application"
     method_option "environment", aliases: "-e", default: ENV["DOCKISTRANO_ENVIRONMENT"], type: :string, desc: "Environment to start the container in"
     def setup
-      say "Please execute the following command on the host to setup", :green
-      say "\tmkdir -p #{current_service.directories_required_on_host.join(" ")}"
+      `mkdir -p #{current_service.directories_required_on_host.join(" ")}`
     end
 
     desc "status", "Status of the application"
@@ -39,17 +38,23 @@ module Dockistrano
       say ""
       say "Dependencies", :blue
       current_service.backing_services.each do |name, service|
-        say "  #{service.full_image_name}"
+        if service.running?
+          say_status "online", "#{service.full_image_name}", :green
+        else
+          say_status "offline", "#{service.full_image_name}", :red
+        end
       end
       say ""
       say "Environment", :blue
       current_service.environment_variables.each do |key, value|
         say "  #{key}=#{value}"
       end
-      say ""
-      say "Hipache", :blue
-      Hipache.new(ENV["DOCKER_HOST_IP"]).status.each do |host, ips|
-        say "  #{host}: #{ips.join(", ")}"
+      if current_service.backing_services["hipache"] and redis_url = current_service.backing_services["hipache"].ip_address
+        say ""
+        say "Hipache", :blue
+        Hipache.new("redis://#{redis_url}:6379").status.each do |host, ips|
+          say "  #{host}: #{ips.join(", ")}"
+        end
       end
       say ""
     end

data/lib/dockistrano/hipache.rb

@@ -4,8 +4,8 @@ module Dockistrano
 
   class Hipache
 
-    def initialize(hipache_ip)
-      @hipache_ip = hipache_ip
+    def initialize(hipache_url)
+      @hipache_url = hipache_url
     end
 
     def online?
@@ -55,7 +55,7 @@ module Dockistrano
     private
 
     def redis
-      @redis ||= Redis.new(host: @hipache_ip, port: 16379)
+      @redis ||= Redis.new(url: @hipache_url)
     end
 
   end

data/lib/dockistrano/service.rb

@@ -37,7 +37,7 @@ module Dockistrano
     def config=(config)
       @config = config
       @dependencies = config["dependencies"] || {}
-      @image_name ||= config["image_name"] || Git.repository_name
+      @image_name ||= (config["image_name"] || Git.repository_name).gsub(/\-/, "_").gsub(/\./, "")
       @tag ||= config["tag"] || Git.branch
       @registry ||= config["registry"]
       @host ||= config["host"]
@@ -147,13 +147,13 @@ module Dockistrano
     end
 
     def update_hipache(server_up=true)
-      if !host.nil?
-        hipache = Hipache.new(ENV['DOCKER_HOST_IP'])
+      if !host.nil? and (redis_url = backing_services["hipache"].ip_address)
+        hipache = Hipache.new("redis://#{redis_url}:6379")
         host.each do |hostname, port|
           if server_up
-            hipache.register(image_name, hostname, ip_address_for_port(port), port)
+            hipache.register(image_name, hostname, ip_address, port)
           else
-            hipache.unregister(image_name, hostname, ip_address_for_port(port), port)
+            hipache.unregister(image_name, hostname, ip_address, port)
           end
         end
       end
@@ -260,7 +260,7 @@ module Dockistrano
     end
 
     # Returns a list of available tags in the registry for the image
-    def available_tags
+    def available_tags_in_registry
       @available_tags ||= begin
         registry_instance.tags_for_image(image_name)
       rescue Dockistrano::Registry::RepositoryNotFoundInRegistry
@@ -268,6 +268,10 @@ module Dockistrano
       end
     end
 
+    def available_tags_local
+      @available_tags_local ||= Docker.tags_for_image("#{registry}/#{image_name}")
+    end
+
     class NoTagFoundForImage < StandardError
     end
 
@@ -277,28 +281,22 @@ module Dockistrano
 
       begin
         tag_suggestion = fallback_tags.shift
-        final_tag = tag_suggestion if available_tags.include?(tag_suggestion)
+        final_tag = tag_suggestion if available_tags_local.include?(tag_suggestion)
       end while !final_tag and fallback_tags.any?
 
       if final_tag
         final_tag
       else
-        raise NoTagFoundForImage.new("No tag found for image #{image_name}, wanted tag #{tag}, available tags: #{available_tags}")
+        raise NoTagFoundForImage.new("No tag found for image #{image_name}, wanted tag #{tag}, available tags: #{available_tags_local}")
       end
     end
 
-    def ip_address_for_port(port)
-      container_settings["NetworkSettings"]["Ports"]["#{port}/tcp"].first["HostIp"] if running?
+    def ip_address
+      container_settings["NetworkSettings"]["IPAddress"] if running?
     end
 
     def ports
-      (config["ports"] || {}).collect { |k,v|
-        if k.to_s.include?(":")
-          "#{k}:#{v}"
-        else
-          "172.17.42.1:#{k}:#{v}"
-        end
-      }
+      (config["ports"] || [])
     end
 
     def attach(name=nil)

data/lib/dockistrano/version.rb

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

data/spec/dockistrano/cli_spec.rb

@@ -5,6 +5,7 @@ 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(: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(:hipache_service) { double(running?: true, full_image_name: "hipache") }
   let(:output) { capture(:stdout) { described_class.start(command) } }
 
   before do
@@ -48,7 +49,9 @@ describe Dockistrano::Cli do
     end
 
     it "lists the Hipache configuration" do
-      allow(Dockistrano::Hipache).to receive(:new).with("127.0.0.1").and_return(hipache)
+      allow(service).to receive(:backing_services).and_return({ "hipache" => hipache_service })
+      allow(hipache_service).to receive(:ip_address).and_return("127.0.0.1")
+      allow(Dockistrano::Hipache).to receive(:new).with("redis://127.0.0.1:6379").and_return(hipache)
       allow(hipache).to receive(:status).and_return({ "somehostname.dev" => ["127.0.0.1:1000", "23.45.56.75:1234"] })
       expect(output).to include("somehostname.dev: 127.0.0.1:1000, 23.45.56.75:1234")
     end

data/spec/dockistrano/service_spec.rb

@@ -242,21 +242,24 @@ describe Dockistrano::Service do
 
   context "#update_hipache" do
     let(:hipache) { double }
+    let(:hipache_service) { double }
 
     before do
       allow(Dockistrano::Hipache).to receive(:new).and_return(hipache)
+      allow(subject).to receive(:backing_services).and_return({ "hipache" => hipache_service })
+      allow(hipache_service).to receive(:ip_address).and_return("172.168.1.1")
     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(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")
       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(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")
       subject.update_hipache(false)
     end
@@ -431,75 +434,79 @@ describe Dockistrano::Service do
 
   context "#directories_required_on_host"
 
-  context "#available_tags" do
+  context "#available_tags_in_registry" 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.image_name).and_return(["develop", "master"])
-      expect(subject.available_tags).to eq(["develop", "master"])
+      expect(subject.available_tags_in_registry).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.image_name).and_raise(Dockistrano::Registry::RepositoryNotFoundInRegistry)
-      expect(subject.available_tags).to eq([])
+      expect(subject.available_tags_in_registry).to eq([])
+    end
+  end
+
+  context "#available_tags_local" do
+    it "returns a list of available tags for the current service" do
+      expect(Dockistrano::Docker).to receive(:tags_for_image).with("#{subject.registry}/#{subject.image_name}").and_return(["develop", "master"])
+      expect(subject.available_tags_local).to eq(["develop", "master"])
     end
   end
 
   context "#tag_with_fallback" do
     it "uses the feature branch when available" do
       allow(subject).to receive(:tag).and_return("feature_branch")
-      allow(subject).to receive(:available_tags).and_return(["develop", "master", "feature_branch"])
+      allow(subject).to receive(:available_tags_local).and_return(["develop", "master", "feature_branch"])
       expect(subject.tag_with_fallback).to eq("feature_branch")
     end
 
     it "uses the develop branch when available" do
       allow(subject).to receive(:tag).and_return("feature_branch")
-      allow(subject).to receive(:available_tags).and_return(["develop", "master", "latest"])
+      allow(subject).to receive(:available_tags_local).and_return(["develop", "master", "latest"])
       expect(subject.tag_with_fallback).to eq("develop")
     end
 
     it "uses the master branch when available" do
       allow(subject).to receive(:tag).and_return("feature_branch")
-      allow(subject).to receive(:available_tags).and_return(["master", "latest"])
+      allow(subject).to receive(:available_tags_local).and_return(["master", "latest"])
       expect(subject.tag_with_fallback).to eq("master")
     end
 
     it "uses the latest branch when available" do
       allow(subject).to receive(:tag).and_return("feature_branch")
-      allow(subject).to receive(:available_tags).and_return(["latest"])
+      allow(subject).to receive(:available_tags_local).and_return(["latest"])
       expect(subject.tag_with_fallback).to eq("latest")
     end
 
     it "raises an error when no tags are found" do
       allow(subject).to receive(:tag).and_return("feature_branch")
-      allow(subject).to receive(:available_tags).and_return(["foobar", "test"])
+      allow(subject).to receive(:available_tags_local).and_return(["foobar", "test"])
       expect { subject.tag_with_fallback }.to raise_error(Dockistrano::Service::NoTagFoundForImage)
     end
   end
 
-  context "#ip_address_for_port" do
-    it "returns the ip address at which the port is listening" do
+  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" => { "Ports" => {
-        "3000/tcp" => [
-          {
-            "HostIp" => "127.0.0.1",
-            "HostPort" => "3000"
-          }
-        ]
-      }}})
-      expect(subject.ip_address_for_port(3000)).to eq("127.0.0.1")
+      allow(subject).to receive(:container_settings).and_return({
+        "NetworkSettings" => {
+          "IPAddress" => "172.168.1.1"
+        }
+      })
+      expect(subject.ip_address).to eq("172.168.1.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(["172.17.42.1:1234:5678"])
+      subject.config = { "ports" => [ "1234:5678" ] }
+      expect(subject.ports).to eq(["1234:5678"])
     end
 
     it "returns the ip address included in the configuration" do
-      subject.config = { "ports" => { "33.33.33.10:1234" => "5678" } }
+      subject.config = { "ports" => [ "33.33.33.10:1234:5678" ] }
       expect(subject.ports).to eq(["33.33.33.10:1234:5678"])
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Edwin Vlieg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor