docker-compose-api 1.0.0 → 1.0.1

data/README.md

@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/mauricioklein/docker-compose-api.svg?branch=develop)](https://travis-ci.org/mauricioklein/docker-compose-api)
 [![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)
 
 # Docker Compose Api
 
@@ -8,6 +9,14 @@ Docker Compose API provides an easy way to parse docker compose files and lift t
 
 ## Instalation
 
+Install the gem in whole environment
+
+```ruby
+gem install docker-compose-api
+```
+
+... or using Bundler
+
 ```ruby
 # Add the line below on your Gemfile...
 gem 'docker-compose-api', git: 'https://github.com/mauricioklein/docker-compose-api'

data/docker-compose-api.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
 end

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

@@ -30,7 +30,7 @@ class Compose
 
       links.each do |link|
         dependency_container = @containers[link]
-        container.dependencies << dependency_container
+        container.add_dependency(dependency_container)
       end
     end
   end

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

@@ -3,7 +3,7 @@ require_relative 'compose_port'
 require_relative '../utils/compose_utils'
 
 class ComposeContainer
-  attr_reader :attributes, :dependencies
+  attr_reader :attributes
 
   def initialize(hash_attributes)
     @attributes = {
@@ -18,6 +18,7 @@ class ComposeContainer
     }.reject{ |key, value| value.nil? }
 
     # Docker client variables
+    @internal_image = nil
     @container = nil
     @dependencies = []
   end
@@ -34,13 +35,14 @@ class ComposeContainer
 
     # Build or pull image
     if @attributes.key?(:image)
-      if image_exists
-        Docker::Image.get(@attributes[:image])
-      else
-        Docker::Image.create('fromImage' => @attributes[:image])
+      @internal_image = @attributes[:image]
+
+      unless image_exists(@internal_image)
+        Docker::Image.create('fromImage' => @internal_image)
       end
     elsif @attributes.key?(:build)
-      Docker::Image.build_from_dir(@attributes[:build])
+      @internal_image = SecureRandom.hex # Random name for image
+      Docker::Image.build_from_dir(@attributes[:build], {t: @internal_image})
     end
   end
 
@@ -70,7 +72,7 @@ class ComposeContainer
     end
 
     container_config = {
-      Image: @attributes[:image],
+      Image: @internal_image,
       Cmd: @attributes[:command],
       Env: @attributes[:environment],
       Volumes: @attributes[:volumes],
@@ -105,8 +107,8 @@ class ComposeContainer
   #
   # Check if a given image already exists in host
   #
-  def image_exists
-    Docker::Image.exist?(@attributes[:image])
+  def image_exists(image_name)
+    Docker::Image.exist?(image_name)
   end
 
   public

data/lib/version.rb

@@ -1,5 +1,5 @@
 module DockerCompose
   def self.version
-    "1.0.0"
+    "1.0.1"
   end
 end

data/spec/docker-compose/fixtures/Dockerfile

@@ -0,0 +1,2 @@
+FROM ubuntu
+CMD ["sleep", "1000"]

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

@@ -44,7 +44,7 @@ describe ComposeContainer do
   end
 
   context 'Start container' do
-    it 'should start/stop a container' do
+    it 'should start/stop a container from image' do
       attributes = {
         image: 'ubuntu:latest',
         links: ['links:links'],
@@ -64,6 +64,24 @@ describe ComposeContainer do
       expect(entry.running?).to be false
     end
 
+    it 'should start/stop a container from build' do
+      attributes = {
+        build: File.expand_path('spec/docker-compose/fixtures/'),
+        links: ['links:links'],
+        volumes: {'/tmp' => {}}
+      }
+
+      entry = ComposeContainer.new(attributes)
+
+      #Start container
+      entry.start
+      expect(entry.running?).to be true
+
+      # Stop container
+      entry.stop
+      expect(entry.running?).to be false
+    end
+
     it 'should not start a container without either image and build commands' do
       attributes = {
         links: ['links:links'],

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
+require 'simplecov'
 require 'codeclimate-test-reporter'
+
+SimpleCov.start
 CodeClimate::TestReporter.start
 
 require 'docker-compose'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose-api
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple ruby client for docker-compose api
 email:
 - mauricio.klein.msk@gmail.com
@@ -80,6 +96,7 @@ files:
 - lib/docker-compose/utils/compose_utils.rb
 - lib/version.rb
 - spec/docker-compose/docker_compose_spec.rb
+- spec/docker-compose/fixtures/Dockerfile
 - spec/docker-compose/fixtures/sample1.yaml
 - spec/docker-compose/models/compose_container_spec.rb
 - spec/docker-compose/utils/compose_utils_spec.rb
@@ -111,6 +128,7 @@ specification_version: 3
 summary: A simple ruby client for docker-compose api
 test_files:
 - spec/docker-compose/docker_compose_spec.rb
+- spec/docker-compose/fixtures/Dockerfile
 - spec/docker-compose/fixtures/sample1.yaml
 - spec/docker-compose/models/compose_container_spec.rb
 - spec/docker-compose/utils/compose_utils_spec.rb