docker-compose-api 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf18202df3237d79dc3ef72446eec4f226d12ec0
-  data.tar.gz: 1810eb1c15212070d375d6bf626cd8b94ab7bd81
+  metadata.gz: fc1811fa3ec42d62fb9fc334cff9f884794c5335
+  data.tar.gz: 096cdf0b16e04b3c8b6f8ec72da9673df16e1945
 SHA512:
-  metadata.gz: 4108355ffb6c39c9424b98ce271b83f1e992d3bfd9bbc067c5d570ba1996ec946af63de1babecb8640dfa84452eb930654060c551ecee2e23025a7bfdd6cbb75
-  data.tar.gz: da6d88fe21804f589edcbdb5287518c0b8d9f8a9e7cbec06c701b9c43c4347a6c999ec979086bfd169b4cd5cefc0c85b622c0a04dd3269f8e7fa2829e320d8ab
+  metadata.gz: cec2d7eb5e7b4dcf094399fb86d5693edbe738461bab5b3e1df4ae4212560d20412c8e69522008950ac67a4ad549e939f621710e846968fd0033276885206013
+  data.tar.gz: 388f155bbb9ca0321f43952ae214d3b304bda303dabf52f45214539b3307a025580005d1257f195ca8ab045a19bc6b6e0d334c0a3f73a2c96f08cbf588443025

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,26 @@
+## Description
+
+[Add feature/bug description here]
+
+## How to reproduce
+
+[Add steps on how to reproduce this issue]
+
+## What do you expect
+
+[Describe what do you expect to happen]
+
+## What happened instead
+
+[Describe the actual results]
+
+## Software:
+
+- Ruby version: [Add ruby version here]
+- Docker-compose-api gem version: [Add docker-compose-api gem version here]
+
+## Full backtrace
+
+```text
+[Paste full backtrace here]
+```

data/lib/docker-compose-api.rb

@@ -0,0 +1 @@
+require 'docker-compose'

data/lib/docker-compose.rb

@@ -1,6 +1,7 @@
 require_relative 'docker-compose/models/compose'
 require_relative 'docker-compose/models/compose_container'
 require_relative 'version'
+require_relative 'docker_compose_config'
 
 require 'yaml'
 require 'docker'
@@ -22,25 +23,17 @@ module DockerCompose
       raise ArgumentError, 'Compose file doesn\'t exists'
     end
 
-    compose = Compose.new
+    # Parse the docker-compose config
+    config = DockerComposeConfig.new(filepath)
 
-    # Create containers from compose file
-    _compose_entries = YAML.load_file(filepath)
+    compose = Compose.new
 
-    if _compose_entries
-      _compose_entries.each do |entry|
-        compose.add_container(create_container(entry))
-      end
-    end
+    # Load new containers
+    load_containers_from_config(config, compose)
 
     # Load running containers
     if do_load_running_containers
-      Docker::Container
-        .all(all: true)
-        .select {|c| c.info['Names'].last.match(/\A\/#{ComposeUtils.dir_name}\w*/) }
-        .each do |container|
-          compose.add_container(load_running_container(container))
-      end
+      load_running_containers(compose)
     end
 
     # Perform containers linkage
@@ -49,6 +42,25 @@ module DockerCompose
     compose
   end
 
+  def self.load_containers_from_config(config, compose)
+    compose_entries = config.services
+
+    if compose_entries
+      compose_entries.each do |entry|
+        compose.add_container(create_container(entry))
+      end
+    end
+  end
+
+  def self.load_running_containers(compose)
+    Docker::Container
+      .all(all: true)
+      .select {|c| c.info['Names'].last.match(/\A\/#{ComposeUtils.dir_name}\w*/) }
+      .each do |container|
+        compose.add_container(load_running_container(container))
+    end
+  end
+
   def self.create_container(attributes)
     ComposeContainer.new({
       label: attributes[0],
@@ -83,5 +95,8 @@ module DockerCompose
     ComposeContainer.new(container_args, container)
   end
 
-  private_class_method :create_container, :load_running_container
+  private_class_method :load_containers_from_config,
+                       :create_container,
+                       :load_running_containers,
+                       :load_running_container
 end

data/lib/docker-compose/utils/compose_utils.rb

@@ -98,8 +98,15 @@ module ComposeUtils
 
     port_entry.each do |key, value|
       container_port = key.gsub(/\D/, '').to_i
-      host_ip = value.first['HostIp']
-      host_port = value.first['HostPort']
+      # Ports that are EXPOSEd but not published won't have a Host IP/Port,
+      # only a Container Port.
+      if value.nil?
+        host_ip = ''
+        host_port = ''
+      else
+        host_ip = value.first['HostIp']
+        host_port = value.first['HostPort']
+      end
 
       entries << "#{container_port}:#{host_ip}:#{host_port}"
     end

data/lib/docker_compose_config.rb

@@ -0,0 +1,39 @@
+# Support multiple versions for docker-compose configs.
+class DockerComposeConfig
+  attr_reader :version, :services, :volumes, :networks
+
+  def initialize(filepath)
+    parse_docker_compose_config(filepath)
+  end
+
+  # Parse the docker-compose config
+  def parse_docker_compose_config(filepath)
+    config = YAML.load_file(filepath)
+
+    unless config
+      STDERR.puts "Empty YAML file: #{filepath}"
+      config = YAML.load('{}')
+    end
+
+    case (config['version'])
+    when 2,'2'
+      parse_version_2(config)
+    else
+      parse_version_1(config)
+    end
+  end
+
+  def parse_version_2(config)
+    @version = 2
+    @services = config['services']
+    @volumes = config['volumes']
+    @networks = config['networks']
+  end
+
+  def parse_version_1(config)
+    @version = 1
+    @services = config
+    @volumes = nil
+    @networks = nil
+  end
+end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module DockerCompose
   def self.version
-    "1.1.0"
+    "1.1.1"
   end
 end

data/spec/docker-compose/docker_compose_config_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+RSpec.shared_examples 'a docker config' do
+  it 'should have the correct version info' do
+    expect(config.version).to eq config_version
+  end
+
+  it 'should read a YAML file correctly' do
+    expect(config.services.length).to eq(num_services)
+  end
+end
+
+describe DockerComposeConfig do
+  context 'Handles version 2 config' do
+    config_file = File.expand_path('spec/docker-compose/fixtures/compose_2.yaml')
+
+    it_behaves_like 'a docker config' do
+      let(:config_version) { 2 }
+      let(:num_services) { 3 }
+      let(:config) { DockerComposeConfig.new(config_file) }
+    end
+  end
+
+  context 'Handles version 1 config' do
+    config_file = File.expand_path('spec/docker-compose/fixtures/compose_1.yaml')
+
+    it_behaves_like 'a docker config' do
+      let(:config_version) { 1 }
+      let(:num_services) { 3 }
+      let(:config) { DockerComposeConfig.new(config_file) }
+    end
+  end
+
+  context 'Handles empty files' do
+    config_file = File.expand_path('spec/docker-compose/fixtures/empty_compose.yml')
+
+    it_behaves_like 'a docker config' do
+      let(:config_version) { 1 }
+      let(:num_services) { 0 }
+      let(:config) { DockerComposeConfig.new(config_file) }
+    end
+  end
+end

data/spec/docker-compose/fixtures/compose_2.yaml

@@ -0,0 +1,37 @@
+version: 2
+
+services:
+  busybox1:
+    image: busybox
+    container_name: busybox-container
+    ports:
+      - "3000"
+      - "8000:8000"
+      - "127.0.0.1:8001:8001"
+    expose:
+      - "5000"
+    links:
+      - busybox2
+    command: ping busybox2
+    environment:
+      - MYENV1=variable1
+    volumes:
+      - "/tmp/test:/tmp:ro"
+    labels:
+      - com.example.foo=bar
+
+  busybox2:
+    image: busybox
+    expose:
+      - "6000"
+    command: ping localhost
+    environment:
+      MYENV2: variable2
+    labels:
+      com.example.foo: bar
+
+  busybox3:
+    image: busybox
+    links:
+      - busybox2:bb2
+    command: ping localhost

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mauricio S. Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -80,15 +81,19 @@ files:
 - LICENSE.txt
 - README.md
 - docker-compose-api.gemspec
+- lib/docker-compose-api.rb
 - lib/docker-compose.rb
 - lib/docker-compose/models/compose.rb
 - lib/docker-compose/models/compose_container.rb
 - lib/docker-compose/models/compose_port.rb
 - lib/docker-compose/utils/compose_utils.rb
+- lib/docker_compose_config.rb
 - lib/version.rb
+- spec/docker-compose/docker_compose_config_spec.rb
 - spec/docker-compose/docker_compose_spec.rb
 - spec/docker-compose/fixtures/Dockerfile
 - spec/docker-compose/fixtures/compose_1.yaml
+- spec/docker-compose/fixtures/compose_2.yaml
 - spec/docker-compose/fixtures/empty_compose.yml
 - spec/docker-compose/models/compose_container_spec.rb
 - spec/docker-compose/models/compose_spec.rb
@@ -119,9 +124,11 @@ signing_key:
 specification_version: 4
 summary: A simple ruby client for docker-compose api
 test_files:
+- spec/docker-compose/docker_compose_config_spec.rb
 - spec/docker-compose/docker_compose_spec.rb
 - spec/docker-compose/fixtures/Dockerfile
 - spec/docker-compose/fixtures/compose_1.yaml
+- spec/docker-compose/fixtures/compose_2.yaml
 - spec/docker-compose/fixtures/empty_compose.yml
 - spec/docker-compose/models/compose_container_spec.rb
 - spec/docker-compose/models/compose_spec.rb