bigrig 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45105f59905374c0229e4ae83c1bdd37614242f
-  data.tar.gz: 152ce1cc2b69fcbb0965086d17d6cba1cdd5d661
+  metadata.gz: d20693edd19fd3772463838bf41ac7a525541e83
+  data.tar.gz: 86f2dacffa8ff0ad6cba5170f6b7f5e73605dfdc
 SHA512:
-  metadata.gz: d373c76d6031b6c61ce612b32131c40b572d89a7f3dc4ea64be110a288af7091a57c9d64af9672fb1bd84a326cfc93b16e5c3e53a2c243d20aaf70b669e2024e
-  data.tar.gz: e480b7fdfff35ddad6edab2bce175e27ec59ed4176edc632c0689c6fd5b01c76ce80ddaad2fcbc55c34335524dfdc9470694d1c4b2b05a0e45692711e8869a69
+  metadata.gz: 65cfa236bf4374f8b9522aa852246a701125378f6653ad1692e508facc3f8485314ba00d5ceea63125c2714f3a3177ae2f5be85b4bc08743a15990bd150d79e9
+  data.tar.gz: e7b721bd63a21e55d62bc6fe9c2df8cc1e7ffad0617cc891db53cfc0edd754e871a75bfeb840557656ce69577d1bdfb17e67cb02bf2e0098ff8cf2ee55455747

data/CHANGELOG.md

@@ -39,3 +39,7 @@ Add `volumes` attriute
 0.2.0
 =====
 * Added `scan` functionality
+
+0.2.2
+=====
+* scanned containers no longer restart their dependencies

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigrig (0.2.1)
+    bigrig (0.2.2)
       colorize (= 0.7.5)
       docker-api (= 1.20.0)
       filewatcher (= 0.4.0)
@@ -49,6 +49,7 @@ GEM
       rspec-mocks (~> 3.1.0)
     rspec-core (3.1.7)
       rspec-support (~> 3.1.0)
+    rspec-eventually (0.0.1)
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
@@ -82,6 +83,7 @@ DEPENDENCIES
   pry
   rake
   rspec
+  rspec-eventually
   rspec-its
   rubocop
   vcr (~> 2.9.3)

data/bigrig.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('vcr', '~> 2.9.3')
   s.add_development_dependency('webmock', '~> 1.20.4')
   s.add_development_dependency('popen4')
+  s.add_development_dependency('rspec-eventually')
 
   s.add_runtime_dependency('gli', '2.12.2')
   s.add_runtime_dependency('colorize', '0.7.5')

data/lib/bigrig/dependency_graph.rb

@@ -10,7 +10,8 @@ module Bigrig
     end
 
     def resolve_subtree(container)
-      startup_order @containers.select { |c| resolve_deps(c, []).include? container.name }
+      subtree = @containers.select { |c| resolve_deps(c, []).include? container.name }
+      startup_order(subtree) & subtree
     end
 
     private
@@ -26,6 +27,7 @@ module Bigrig
     end
 
     def resolve_deps(container, resolved)
+      container || return
       container.dependencies.each do |dep_name|
         resolve_deps @map[dep_name], resolved unless resolved.include? dep_name
       end

data/lib/bigrig/version.rb

@@ -1,3 +1,3 @@
 module Bigrig
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/bigrig/dependency_graph_spec.rb

@@ -20,19 +20,25 @@ module Bigrig
       subject { described_class.new(containers).resolve_subtree target }
       context 'given three containers, two of which have a relationship' do
         let(:target) do
-          Container.new(name: 'target')
+          containers[2]
         end
 
+        let(:subtree) { subject }
+
         let(:containers) do
           [
-            target,
             Container.new(name: 'test1', volumes_from: ['target']),
-            Container.new(name: 'test2')
+            Container.new(name: 'test2'),
+            Container.new(name: 'target', volumes_from: ['test2'])
           ]
         end
 
         it 'resolves only related containers' do
-          expect(subject.map(&:name)).to eq %w(target test1)
+          expect(subtree.map(&:name)).to match_array %w(target test1)
+        end
+
+        it 'orders containers in restart order' do
+          expect(subtree.map(&:name)).to eq %w(target test1)
         end
       end
     end

data/spec/bigrig_spec.rb

@@ -18,18 +18,26 @@ describe 'bigrig' do
       before do
         FileUtils.mkdir_p '/tmp/scan'
         FileUtils.touch '/tmp/scan/scan.me'
+
+        %w(scanning uses_scanning some_ahole).each do |name|
+          begin
+            Docker::Container.get(name).kill.delete
+          rescue Docker::Error::NotFoundError # rubocop:disable Lint/HandleExceptions
+          end
+        end
       end
 
       it 'restarts the container when the scanned file changes', :vcr do
         pid, _stdin, stdout, _stderr = Open4.popen4(command)
         drain_io stdout
 
-        wait_for %w(scanning uses_scanning some_ahole)
-        before_image = Docker::Container.get 'scanning'
+        scanning = wait_for_containers(%w(scanning uses_scanning some_ahole)).first
+
         FileUtils.touch '/tmp/scan/scan.me'
-        sleep 3
-        wait_for 'scanning'
-        expect(before_image.id).to_not eq Docker::Container.get('scanning').id
+        expect { Docker::Container.get('scanning').id }.to eventually_not(eq scanning.id).
+          by_suppressing_errors
+        wait_for { Docker::Container.get('uses_scanning').info['State']['Running'] }.to eq true
+
         Process.kill :SIGINT, pid
         Process.wait pid
       end
@@ -37,13 +45,14 @@ describe 'bigrig' do
       it 'restarts dependant containers when the scanned file changes', :vcr do
         pid, _stdin, stdout, _stderr = Open4.popen4(command)
         drain_io stdout
-        wait_for %w(scanning uses_scanning some_ahole)
-        before_image = Docker::Container.get 'uses_scanning'
+
+        before_image = wait_for_containers(%w(uses_scanning scanning some_ahole)).first
 
         FileUtils.touch '/tmp/scan/scan.me'
-        sleep 3
-        wait_for 'uses_scanning'
-        expect(before_image.id).to_not eq Docker::Container.get('uses_scanning').id
+        expect { Docker::Container.get('uses_scanning').id }.to eventually_not(eq before_image.id).
+          by_suppressing_errors
+        wait_for { Docker::Container.get('uses_scanning').info['State']['Running'] }.to eq true
+
         Process.kill :SIGINT, pid
         Process.wait pid
       end
@@ -51,13 +60,14 @@ describe 'bigrig' do
       it 'leaves unaffected containers alone when the scanned file changes', :vcr do
         pid, _stdin, stdout, _stderr = Open4.popen4(command)
         drain_io stdout
-        wait_for %w(scanning uses_scanning some_ahole)
-        before_image = Docker::Container.get 'some_ahole'
+        containers = wait_for_containers(%w(some_ahole uses_scanning scanning ))
 
         FileUtils.touch '/tmp/scan/scan.me'
-        sleep 3
-        wait_for %w(scanning uses_scanning)
-        expect(before_image.id).to eq Docker::Container.get('some_ahole').id
+
+        wait_for { Docker::Container.get('uses_scanning').id }.to_not eq containers[1].id
+        wait_for { Docker::Container.get('scanning').id }.to_not eq containers[2].id
+
+        expect(Docker::Container.get('some_ahole').id).to eq containers.first.id
         Process.kill :SIGINT, pid
         Process.wait pid
       end
@@ -67,9 +77,11 @@ describe 'bigrig' do
       let(:args) { ['-f', 'spec/data/dev.json', 'dev'] }
       let(:command) { %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '}) }
       let(:env) do
-        url = URI.parse Docker.connection.url
-        text = Net::HTTP.get URI.parse("http://#{url.host}:4568")
-        text.split("\n").each_with_object({}) { |e, o| o.store(*e.split('=')) }
+        lambda do
+          url = URI.parse Docker.connection.url
+          text = Net::HTTP.get URI.parse("http://#{url.host}:4568")
+          text.split("\n").each_with_object({}) { |e, o| o.store(*e.split('=')) }
+        end
       end
 
       before do
@@ -83,13 +95,12 @@ describe 'bigrig' do
 
       it 'starts the containers', :vcr do
         pid = Open4.popen4(command).first
-        wait_for %w(dev-test dev-logs)
-        sleep 2
-        dev_test = Docker::Container.get('dev-test')
-        dev_logs = Docker::Container.get('dev-logs')
         begin
-          expect(dev_test.json['State']['Running']).to be true
-          expect(dev_logs.json['State']['Running']).to be true
+          expect { Docker::Container.get('dev-test').json['State']['Running'] }.
+            to eventually(be true).by_suppressing_errors
+
+          expect { Docker::Container.get('dev-logs').json['State']['Running'] }.
+            to eventually(be true).by_suppressing_errors
         ensure
           Process.kill :SIGINT, pid
           Process.wait pid
@@ -114,10 +125,9 @@ describe 'bigrig' do
 
       it 'activates the dev profile', :vcr do
         pid = Open4.popen4(command).first
-        wait_for 'dev-test'
-        sleep 2
         begin
-          expect(env).to include 'PROFILE' => 'dev'
+          wait_for { Docker::Container.get('dev-test').info['State']['Running'] }.to eq true
+          expect { env.call }.to eventually(include 'PROFILE' => 'dev').by_suppressing_errors
         ensure
           Process.kill :SIGINT, pid
           Process.wait pid
@@ -183,9 +193,11 @@ describe 'bigrig' do
       let(:image) { Docker::Image.get 'hawknewton/show-env' }
       let(:file) { 'spec/data/profiles.json' }
       let(:env) do
-        url = URI.parse Docker.connection.url
-        text = Net::HTTP.get URI.parse("http://#{url.host}:4567")
-        text.split("\n").each_with_object({}) { |e, o| o.store(*e.split('=')) }
+        lambda do
+          url = URI.parse Docker.connection.url
+          text = Net::HTTP.get URI.parse("http://#{url.host}:4567")
+          text.split("\n").each_with_object({}) { |e, o| o.store(*e.split('=')) }
+        end
       end
 
       after { container.kill.delete }
@@ -197,14 +209,12 @@ describe 'bigrig' do
 
       it 'overrides the env', :vcr do
         subject
-        sleep 1
-        expect(env).to include 'NAME1' => 'VALUE1A'
+        expect { env.call }.to eventually(include 'NAME1' => 'VALUE1A').by_suppressing_errors
       end
 
       it 'leaves existing env values alone', :vcr do
         subject
-        sleep 1
-        expect(env).to include 'NAME2' => 'VALUE2'
+        expect { env.call }.to eventually(include 'NAME2' => 'VALUE2').by_suppressing_errors
       end
     end
   end

data/spec/data/scan.json

@@ -3,7 +3,8 @@
     "scanning": {
       "repo": "hawknewton/log-test",
       "tag": "0.0.1",
-      "scan": "/tmp/scan/**"
+      "scan": "/tmp/scan/**",
+      "links": "some_ahole:some_ahole"
     },
     "uses_scanning": {
       "repo": "hawknewton/log-test",

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'bigrig'
 require 'rspec/its'
+require 'rspec/eventually'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
@@ -114,16 +115,3 @@ def read_stdout(stdout)
   end
   output
 end
-
-def wait_for(containers)
-  [containers].flatten.each do |container|
-    Timeout.timeout(5) do
-      begin
-        Docker::Container.get container
-      rescue Docker::Error::NotFoundError
-        sleep 0.5
-        retry
-      end
-    end
-  end
-end

data/spec/support/wait_for.rb

@@ -0,0 +1,35 @@
+require 'rspec/eventually'
+
+class WaitFor
+  def initialize(&block)
+    @block = block
+  end
+
+  [:to, :to_not].each do |method|
+    define_method method do |matcher|
+      waiter = eventually(matcher)
+      method == :to_not && waiter.not
+      waiter.matches?(@block) || fail('wait_for never came true')
+    end
+  end
+
+  private
+
+  def eventually(matcher)
+    Rspec::Eventually::Eventually.new(matcher).by_suppressing_errors
+  end
+end
+
+def wait_for(&block)
+  WaitFor.new(&block)
+end
+
+def wait_for_container(name)
+  c = nil
+  wait_for { (c = Docker::Container.get(name)).info['State']['Running'] }.to eq true
+  c
+end
+
+def wait_for_containers(containers)
+  containers.map { |n| wait_for_container n }
+end