docker-spec 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8ff71a56ef41011aa9419939fcbe126dfad03db
-  data.tar.gz: b8b7050569474f29a16ebd954584528f4e8c781d
+  metadata.gz: 3ca15895fd936cd2a664100fd10ac43d858c6fca
+  data.tar.gz: e70a7268eaeb90054b35d4171d7b29ac07abdb80
 SHA512:
-  metadata.gz: 2e4c04eff8f2c2d5d859f59f9838d3ce813393187ac80eb5a506155968e7401af7dd422004841af939c60843a6ee3b6e8b79a28682c72497eac01ae241da7872
-  data.tar.gz: 5cbd4e789bc14c7dbd0f323600add1cc5e7767b2728106c309037c76b32af210d7efa94a6a2ef16065740e93826bab781983795784fdd962152e6f65f8e1fe84
+  metadata.gz: 0114ca4f5e090d18dc1c3dd2ad9610d5e08d02fb4bba34059005f0ed3dd70cf03ca2ff41639729165447018c16fd0cef0ad0b573bb01132bcd7726800fbb038a
+  data.tar.gz: 7597bc6a959191ec31f192fcb9af765cf6a9363a8821030f0c262e121b633def1690d841a0c6b5ec7e54816dc9f4af9e101ed8cbdc70dae184b9f1e295fdce30

data/lib/docker/spec.rb

@@ -18,7 +18,7 @@ class DockerSpec
 
   include Singleton
 
-  attr_accessor :config, :test_failed
+  attr_accessor :config, :test_failed, :container
 
   CONTAINER_RUN_WAIT_TIMEOUT = 60
   CONFIG_FILE = 'docker_spec.yml'
@@ -97,7 +97,6 @@ class DockerSpec
     @config[:name] || fail('name is not defined in docker_spec.yml')
     @config[:account] || fail('account is not defined in docker_spec.yml')
     @config[:image_name] = format '%s/%s', @config[:account], @config[:name]
-    @config[:container_name] = format 'docker_spec-%s', @config[:name]
     @config[:build_image] = get_config(:build_image, 'DOCKER_SPEC_BUILD_DOCKER_IMAGE',
                                        'Build docker image? ')
     @config[:build_root] = get_config(:build_root, 'DOCKER_SPEC_BUILD_ROOT',
@@ -146,7 +145,6 @@ EOF
       end
 
       rc.before(:suite) do
-        DockerSpec.instance.delete_container
         DockerSpec.instance.start_container
       end
 
@@ -166,27 +164,30 @@ EOF
 
     opts['env'] = @config[:env] unless @config[:env].nil?
     opts['Image'] = @config[:image_name]
-    opts['name'] = @config[:container_name]
-    container = Docker::Container.create(opts).start
+    @container = Docker::Container.create(opts).start
+    Timeout::timeout(10) do
+      loop do
+        @container.refresh! 
+        break if @container.info["State"]["Running"]
+      end
+    end
+
 
     # Check the logs, when it stops logging we can assume the container
     # is fully up and running
     log_size_ary = []
     CONTAINER_RUN_WAIT_TIMEOUT.times do
-      log_size_ary << container.logs(stdout: true).size
+      log_size_ary << @container.logs(stdout: true).size
       break if log_size_ary.last(3).sort.uniq.size == 1 &&
                log_size_ary.last(3).sort.uniq.last > 0
       sleep 1
     end
-    set :docker_container, container.id
+    set :docker_container, @container.id
   end
 
   def delete_container
-    filters = { name: [@config[:container_name]] }.to_json
-    Docker::Container.all(all: true, filters: filters).each do |c|
-      c.kill
-      c.delete
-    end
+    @container.kill
+    @container.delete
   end
 
   def clean_up
@@ -195,7 +196,7 @@ EOF
                                                    "\nKeep container running? ")
     if @config[:keep_running]
       puts "\nINFO: To connect to a running container: \n\n" \
-        "docker exec -ti #{@config[:container_name]} bash"
+        "docker exec -ti #{@container.info["Name"][1..-1]} bash"
     else
       delete_container
     end

data/lib/docker/spec/docker.rb

@@ -1,15 +1,10 @@
 module Docker
   module Spec
     def self.docker_tests
-      describe 'Running a docker container' do
+      describe 'Running a docker container', test: :default do
         before(:all) do
-          @config = DockerSpec.instance.config
-          @image = Docker::Image.all.detect do |i|
-            i.info['RepoTags'].include?(@config[:image_name] + ':latest')
-          end
-          @container = Docker::Container.all.select do |c|
-            c.info["Names"] == [ "/" + @config[:container_name] ]
-          end.first
+          @container = DockerSpec.instance.container
+          @image = @container.info["Image"]
         end
 
         it 'should be available' do

data/lib/docker/spec/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Spec
-    VERSION = "0.8.1"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-spec
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A docker spec library to build and test docker containers