docker-spec 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94c481576b9b1f8ea278350227a880b958fb154f
-  data.tar.gz: 413ae381b4f411436f52e29d80a498f7068a3f0f
+  metadata.gz: 5b8fbb164e0c9e54f85c058ec942ef0bb1c3933a
+  data.tar.gz: 5aa7c913127434f13c0e88a1cc86ca038ced9ee0
 SHA512:
-  metadata.gz: 1039784e522f87466a4aa6b203dc5f26bf0d78830656dd0fe98b091cc5cbbdb5c2ae01bae70b2be98307b76a4e877daba84e6090b1efd2c593bd4a2fc4c88e8f
-  data.tar.gz: ec7f94900ce0769541e500097a03f265f424c45de228748e3de926b9b7f8b692f3dff94800595500feba32d02d584a3095537b60b33ff0baa524a5cc8f3845f0
+  metadata.gz: fd1d7db5d4a15c0a72fc63a2ef340e70dbb57ccd29daaa8a3e5d56dc4d428180f777beba5f2302ea9a1f12bd02cd193b402c32de82375bb90fa0a2ec05aa77c2
+  data.tar.gz: 2d6788a53853f3a1149a4917b6cc3c0eacaac1ba70ea600181b41dd3c74424c906a9260f0edb6270c095c501a3b33b52e4774b8a8019372035ab1f489e84a37a

data/lib/docker/spec.rb

@@ -10,27 +10,36 @@ require 'colorize'
 require 'yaml'
 require 'logger'
 require 'moneta'
-require "base64"
+require 'base64'
+require 'singleton'
 require 'pp'
 
 # Documentation
-module DockerSpec
+class DockerSpec
+
+  include Singleton
+
+  attr_accessor :config, :test_failed
+
   CONTAINER_RUN_WAIT_TIMEOUT = 60
   CONFIG_FILE = 'docker_spec.yml'
   ROOT_DIR = 'root'
   DOCKER_AUTH_FILE = '~/.docker/config.json'
   STDOUT.sync = true
 
-  def self.run
+  def run
+    @config = nil
+    @test_failed = false
+
     load_config
     build_root if @config[:build_root]
-    build_docker_image
-    rspec_run
+    build_docker_image if @config[:build_image]
+    rspec_configure
   end
 
-  def self.push
-    @config[:push_container] = DockerSpec.get_config(:push_container, 'DOCKER_SPEC_PUSH_CONTAINER',
-                                                     "\nPush new tag? ")
+  def push
+    @config[:push_container] = get_config(:push_container, 'DOCKER_SPEC_PUSH_CONTAINER',
+                                                     'Push new tag? ')
     if @config[:push_container]
 
       @config[:tag_db] ||
@@ -81,7 +90,7 @@ module DockerSpec
     end
   end
 
-  def self.load_config
+  def load_config
     File.exist?(CONFIG_FILE) || fail('Could not load docker_spec.yml')
     @config = YAML.load(File.read(CONFIG_FILE)) ||
               fail('docker_spec.yml is not a valid yml file')
@@ -90,21 +99,24 @@ module DockerSpec
     @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_root] = DockerSpec.get_config(:build_root, 'DOCKER_SPEC_BUILD_ROOT',
-                                                 'Rebuild root filesystem? ')
-    @config[:clear_cache] = DockerSpec.get_config(:clear_cache, 'DOCKER_SPEC_CLEAR_CACHE',
-                                                  'Clear docker cache? ')
+    @config[:build_image] = get_config(:build_image, 'DOCKER_SPEC_BUILD_',
+                                       'Build docker image? ')
+    @config[:build_root] = get_config(:build_root, 'DOCKER_SPEC_BUILD_ROOT',
+                                      'Rebuild root filesystem? ') if @config[:build_image]
+    @config[:clear_cache] = get_config(:clear_cache, 'DOCKER_SPEC_CLEAR_CACHE',
+                                       'Clear docker cache? ') if @config[:build_image]
     @config
   end
 
-  def self.build_root
+  def build_root
     system 'bash -ec \'sudo chown root:root -R root &&' \
            '(cd root && sudo tar zcf ../root.tar.gz .) && ' \
            'sudo chown -R `id -u`:`id -g` root.tar.gz root\'' \
            if Dir.exist?(ROOT_DIR)
   end
 
-  def self.build_docker_image
+  def build_docker_image
+    puts
     # Rebuild the cache filesystem
     build_args = ''
     build_args += ' --no-cache' if @config[:clear_cache]
@@ -118,26 +130,30 @@ module DockerSpec
     fail("#{build_cmd} failed") if status.exitstatus != 0
   end
 
-  def self.rspec_run
+  def rspec_configure
     set :backend, :docker
 
     RSpec.configure do |rc|
       rc.fail_fast = true
 
+      rc.after(:each) do |test|
+        DockerSpec.instance.test_failed = true if test.exception
+      end
+
       rc.before(:suite) do
-        DockerSpec.delete_container
-        DockerSpec.start_container
+        DockerSpec.instance.delete_container
+        DockerSpec.instance.start_container
       end
 
       rc.after(:suite) do
-        DockerSpec.clean_up
-        DockerSpec.push
+        DockerSpec.instance.clean_up
+        DockerSpec.instance.push unless DockerSpec.instance.test_failed
       end
     end
-    docker_tests
+    Docker::Spec::docker_tests
   end
 
-  def self.start_container
+  def start_container
     # Run  the container with options
     opts = {}
     opts['HostConfig'] = { 'NetworkMode' => @config[:network_mode] } \
@@ -160,7 +176,7 @@ module DockerSpec
     set :docker_container, container.id
   end
 
-  def self.delete_container
+  def delete_container
     filters = { name: [@config[:container_name]] }.to_json
     Docker::Container.all(all: true, filters: filters).each do |c|
       c.kill
@@ -168,10 +184,10 @@ module DockerSpec
     end
   end
 
-  def self.clean_up
+  def clean_up
     # Keep container running
-    @config[:keep_running] = DockerSpec.get_config(:keep_running, 'DOCKER_SPEC_KEEP_RUNNING',
-                                                   'Keep container running? ')
+    @config[:keep_running] = get_config(:keep_running, 'DOCKER_SPEC_KEEP_RUNNING',
+                                                   "\nKeep container running? ")
     if @config[:keep_running]
       puts "\nINFO: To connect to a running container: \n\n" \
         "docker exec -ti #{@config[:container_name]} bash"
@@ -180,14 +196,14 @@ module DockerSpec
     end
   end
 
-  def self.get_config(key, envvar, question)
+  def get_config(key, envvar, question)
     value = to_boolean(ENV[envvar])
     value = @config[key] if value.nil?
     value = agree(question, 'n') if value.nil?
     value
   end
 
-  def self.to_boolean(str)
+  def to_boolean(str)
     str == 'true' unless str.nil?
   end
 end

data/lib/docker/spec/docker.rb

@@ -1,34 +1,36 @@
-module DockerSpec
-  def self.docker_tests
-    describe 'Running a docker container' do
-      before(:all) do
-        @config = DockerSpec.load_config
-        @image = Docker::Image.all.detect do |i|
-          i.info['RepoTags'].include?(@config[:image_name] + ':latest')
+module Docker
+  module Spec
+    def self.docker_tests
+      describe 'Running a docker container' 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
         end
-        @container = Docker::Container.all.select do |c|
-          c.info["Names"] == [ "/" + @config[:container_name] ]
-        end.first
-      end
 
-      it 'should be available' do
-        expect(@image).to_not be_nil
-      end
+        it 'should be available' do
+          expect(@image).to_not be_nil
+        end
 
-      it 'should have state running' do
-        expect(@container.json['State']['Running']).to be true
-      end
+        it 'should have state running' do
+          expect(@container.json['State']['Running']).to be true
+        end
 
-      it 'Should stay running' do
-        expect(@container.json['State']['Running']).to be true
-      end
+        it 'Should stay running' do
+          expect(@container.json['State']['Running']).to be true
+        end
 
-      it 'Should not have exit processes' do
-        expect(@container.logs(stdout: true)).to_not match(/exit/)
-      end
+        it 'Should not have exit processes' do
+          expect(@container.logs(stdout: true)).to_not match(/exit/)
+        end
 
-      it 'Services supervisor should be running' do
-        expect(process('supervisord')).to be_running
+        it 'Services supervisor should be running' do
+          expect(process('supervisord')).to be_running
+        end
       end
     end
   end

data/lib/docker/spec/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Spec
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-spec
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler