docker-compose-api 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc1811fa3ec42d62fb9fc334cff9f884794c5335
-  data.tar.gz: 096cdf0b16e04b3c8b6f8ec72da9673df16e1945
+  metadata.gz: 8cebb75c2cb0cf0603887ddbbce8ccb0f3093591
+  data.tar.gz: ff991c3a6144e7cf4f9c8de8dad49c6bb823ba27
 SHA512:
-  metadata.gz: cec2d7eb5e7b4dcf094399fb86d5693edbe738461bab5b3e1df4ae4212560d20412c8e69522008950ac67a4ad549e939f621710e846968fd0033276885206013
-  data.tar.gz: 388f155bbb9ca0321f43952ae214d3b304bda303dabf52f45214539b3307a025580005d1257f195ca8ab045a19bc6b6e0d334c0a3f73a2c96f08cbf588443025
+  metadata.gz: 80c07bfaa7c3dbe956150baf4be1c6b6b860fd751946808f77b42aee9ce5e98ee61d4c14455f60426e33c9fd9edb2e2e33d93236ca3a17b0ca2d1e306a83e8e0
+  data.tar.gz: 5bfbf79737a2ee0a8bd8146556f9640a3b6c400cfd8ed6a23ce59632eda567917a3cbb2498bca6ea71aad8abc948973bf11ee687791cb1507926c0bd442aef21

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.byebug_history

data/README.md

@@ -2,6 +2,7 @@
 [![Code Climate](https://codeclimate.com/github/mauricioklein/docker-compose-api/badges/gpa.svg)](https://codeclimate.com/github/mauricioklein/docker-compose-api)
 [![Test Coverage](https://codeclimate.com/github/mauricioklein/docker-compose-api/badges/coverage.svg)](https://codeclimate.com/github/mauricioklein/docker-compose-api/coverage)
 [![Gem Version](https://badge.fury.io/rb/docker-compose-api.svg)](https://badge.fury.io/rb/docker-compose-api)
+[![Dependency Status](https://gemnasium.com/badges/github.com/mauricioklein/docker-compose-api.svg)](https://gemnasium.com/github.com/mauricioklein/docker-compose-api)
 
 # Docker Compose Api
 

data/docker-compose-api.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "simplecov", "~> 0.10"
+  spec.add_development_dependency "byebug", "~> 8.2"
 end

data/lib/docker-compose.rb

@@ -89,7 +89,9 @@ module DockerCompose
       volumes:     info['Config']['Volumes'],
       command:     info['Config']['Cmd'].join(' '),
       environment: info['Config']['Env'],
-      labels:      info['Config']['Labels']
+      labels:      info['Config']['Labels'],
+
+      loaded_from_environment: true
     }
 
     ComposeContainer.new(container_args, container)

data/lib/docker-compose/models/compose.rb

@@ -50,7 +50,7 @@ class Compose
     @containers.each_value do |container|
       links = container.attributes[:links]
 
-      next if links.nil?
+      next if (container.loaded_from_environment? or links.nil?)
 
       links.each do |service, label|
         dependency_container = @containers[service]
@@ -101,6 +101,7 @@ class Compose
   #
   def delete(labels = [])
     call_container_method(:delete, labels)
+    delete_containers_entries(labels)
   end
 
   private
@@ -118,4 +119,14 @@ class Compose
 
     true
   end
+
+  def delete_containers_entries(labels = [])
+    labels = @containers.keys if labels.empty?
+
+    labels.each do |label|
+      @containers.delete(label)
+    end
+
+    true
+  end
 end

data/lib/docker-compose/models/compose_container.rb

@@ -9,6 +9,7 @@ class ComposeContainer
   def initialize(hash_attributes, docker_container = nil)
     @attributes = {
       label: hash_attributes[:label],
+      loaded_from_environment: hash_attributes[:loaded_from_environment] || false,
       name: hash_attributes[:full_name] || ComposeUtils.generate_container_name(hash_attributes[:name], hash_attributes[:label]),
       image: ComposeUtils.format_image(hash_attributes[:image]),
       build: hash_attributes[:build],
@@ -26,6 +27,14 @@ class ComposeContainer
     @dependencies = []
   end
 
+  #
+  # Returns true if is a container loaded from
+  # environment instead compose file (i.e. a running container)
+  #
+  def loaded_from_environment?
+    attributes[:loaded_from_environment]
+  end
+
   private
 
   #

data/lib/docker_compose_config.rb

@@ -11,7 +11,6 @@ class DockerComposeConfig
     config = YAML.load_file(filepath)
 
     unless config
-      STDERR.puts "Empty YAML file: #{filepath}"
       config = YAML.load('{}')
     end
 

data/lib/version.rb

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

data/spec/docker-compose/docker_compose_spec.rb

@@ -2,8 +2,12 @@ require 'spec_helper'
 
 describe DockerCompose do
   context 'Without memory' do
-    before(:all) do
+    before(:each) {
       @compose = DockerCompose.load(File.expand_path('spec/docker-compose/fixtures/compose_1.yaml'))
+    }
+
+    after(:each) do
+      @compose.delete
     end
 
     it 'should be able to access gem version' do
@@ -60,9 +64,7 @@ describe DockerCompose do
 
         # Delete containers
         @compose.delete
-        @compose.containers.values.each do |container|
-          expect(container.exist?).to be false
-        end
+        expect(@compose.containers.empty?).to be true
       end
     end
 
@@ -297,17 +299,12 @@ describe DockerCompose do
           @compose.containers['busybox3']
       ])
     end
-
-    after(:all) do
-      @compose.delete
-    end
   end
 
   context 'With memory' do
     before(:all) do
       @compose1 = DockerCompose.load(File.expand_path('spec/docker-compose/fixtures/compose_1.yaml'), false)
       @compose1.start
-
       @compose2 = DockerCompose.load(File.expand_path('spec/docker-compose/fixtures/empty_compose.yml'), true)
     end
 
@@ -319,12 +316,16 @@ describe DockerCompose do
       docker_containers_compose1 = @compose1.containers.values.select { |c| c.container }
       docker_containers_compose2 = @compose2.containers.values.select { |c| c.container }
 
-      # Check that both composes have the same containers (based on its names)
+      # Check that both @composes have the same containers (based on its names)
       docker_containers_compose2.each_index do |index|
         expect(docker_containers_compose2[index].attributes['Name']).to eq(docker_containers_compose1[index].attributes['Name'])
       end
     end
 
+    it 'expect last container from @compose2 to be assigned as loaded from environment' do
+      expect(@compose2.containers.values.last.loaded_from_environment?).to be true
+    end
+
     after(:all) do
       @compose1.delete
     end

data/spec/docker-compose/models/compose_container_spec.rb

@@ -122,15 +122,20 @@ describe ComposeContainer do
   end
 
   context 'From Dockerfile' do
-    before(:all) do
-      attributes = {
+    before(:all) {
+      @attributes = {
         label: 'foobar',
         build: File.expand_path('spec/docker-compose/fixtures/'),
         links: ['links:links'],
         volumes: ['/tmp']
       }
 
-      @entry = ComposeContainer.new(attributes)
+      @entry = ComposeContainer.new(@attributes)
+    }
+
+    after(:all) do
+      Docker::Image.get(@entry.internal_image).remove(force: true)
+      @entry.delete
     end
 
     it 'should start/stop a container' do
@@ -154,11 +159,6 @@ describe ComposeContainer do
       @entry.stop
       expect(@entry.running?).to be false
     end
-
-    after(:all) do
-      Docker::Image.get(@entry.internal_image).remove(force: true)
-      @entry.delete
-    end
   end
 
   context 'Without image or Dockerfile' do

data/spec/docker-compose/models/compose_spec.rb

@@ -31,6 +31,14 @@ describe Compose do
         image: 'busybox:latest',
         command: 'ping -c 3 localhost'
       }
+
+      @attributes_container_from_environment = {
+        label: 'container_from_environment',
+        image: 'busybox:latest',
+        links: ['container3'],
+        command: 'ping -c 3 localhost',
+        loaded_from_environment: true
+      }
     end
 
     context 'Without dependencies' do
@@ -57,11 +65,12 @@ describe Compose do
         @compose = Compose.new
         @compose.add_container(ComposeContainer.new(@attributes_container2))
         @compose.add_container(ComposeContainer.new(@attributes_container3))
+        @compose.add_container(ComposeContainer.new(@attributes_container_from_environment))
         @compose.link_containers
       end
 
       it 'should have 2 containers' do
-        expect(@compose.containers.length).to eq(2)
+        expect(@compose.containers.length).to eq(3)
       end
 
       it 'container2 should depend on container3' do
@@ -71,6 +80,11 @@ describe Compose do
         expect(container2.dependencies.include?(container3)).to be true
         expect(container3.dependencies.empty?).to be true
       end
+
+      it 'container loaded from environment should not have dependencies' do
+        container_from_environment = @compose.containers[@attributes_container_from_environment[:label]]
+        expect(container_from_environment.dependencies.empty?).to be true
+      end
     end
 
     it 'should increment label when already exists' do

data/spec/docker-compose/utils/compose_utils_spec.rb

@@ -53,22 +53,35 @@ describe ComposeUtils do
   end
 
   context 'Format ports from running containers' do
-    before(:all) do
-      @hash_attr = {
-        '8000/tcp' => [{
-          'HostIp' => '0.0.0.0',
-          'HostPort' => '4444'
-        }]
+    context 'filled port attributes' do
+      let(:hash_attr) {
+        {
+          '8000/tcp' => [{
+            'HostIp' => '0.0.0.0',
+            'HostPort' => '4444'
+          }]
+        }
       }
-      @expected_format = ['8000:0.0.0.0:4444']
+      let(:expected_format) { ['8000:0.0.0.0:4444'] }
+
+      it 'should format ports correctly' do
+        expect(ComposeUtils.format_ports_from_running_container(hash_attr)).to eq(expected_format)
+      end
     end
 
-    it 'should format ports correctly' do
-      expect(ComposeUtils.format_ports_from_running_container(@hash_attr)).to eq(@expected_format)
+    context 'port without value' do
+      let(:hash_attr) { {'8000/tcp' => nil} }
+      let(:expected_format) { ['8000::'] }
+
+      it 'should format ports correctly' do
+        expect(ComposeUtils.format_ports_from_running_container(hash_attr)).to eq(expected_format)
+      end
     end
 
-    it 'should return an empty array when ports are nil' do
-      expect(ComposeUtils.format_ports_from_running_container(nil)).to eq([])
+    context 'nil port' do
+      it 'should return an empty array when ports are nil' do
+        expect(ComposeUtils.format_ports_from_running_container(nil)).to eq([])
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
+require 'byebug'
 require 'simplecov'
 require 'codeclimate-test-reporter'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose-api
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mauricio S. Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.2'
 description: A simple ruby client for docker-compose api
 email:
 - mauricio.klein.msk@gmail.com
@@ -119,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A simple ruby client for docker-compose api