bigrig 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00aa4dcc5c5020989a86e614b6275ece8b0c4186
-  data.tar.gz: be21feead0bf637a42fbab508afc42dab1354e46
+  metadata.gz: 7efe9f59950d19fdb1cdf53db16d27936f113506
+  data.tar.gz: 0b7009c17a3ac7afb42c453dce0c07a2a2002806
 SHA512:
-  metadata.gz: 0815eb41d36aa361896dda68ce455f0d053717696292ed2972b8bae108a9bc4dee7a5e9c4a314511b365ff9f298cd6b8609703444ae64229b08bba2c71209b16
-  data.tar.gz: 259c2135db5db706b882dabeb21e7f9965eee97d4063149f3cbfef99f23365561feb480353e9ad06aaef781d7317c2851d6044f34467996ef4c22fbd932275ce
+  metadata.gz: efc06d73bb0ef865abbe7a66b37194ea77f946cf2833c3206cb4c8f9655d64e90e355041f6bfe6c53ba483fa58314e9ce1326404d9f2e0b605fabec04a03c166
+  data.tar.gz: dce81ac7df035ba0e1135e6ecc532253772fd302b5e602c1334a37a5b8148d1364538b1b9a1181be51830e463e5f057556719d189c144a584ba042938cc6107a

data/CHANGELOG.md

@@ -63,3 +63,9 @@ Add `volumes` attriute
 0.4.2
 =====
 * Fix nasty jruby incompadability
+
+0.5.0
+=====
+**BREAKING CHANGE**
+* removed wait_for from bigrig.json.  We now wait for the script at
+  `/bigrig-wait.sh`, if present

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    bigrig (0.4.2)
+    bigrig (0.5.0)
       colorize (= 0.7.5)
-      docker-api (= 1.20.0)
+      docker-api (= 1.21.4)
       filewatcher (= 0.4.0)
       gli (= 2.12.2)
 
@@ -11,7 +11,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     Platform (0.4.0)
-    addressable (2.3.6)
+    addressable (2.3.8)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
@@ -19,49 +19,48 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    docker-api (1.20.0)
+    docker-api (1.21.4)
       excon (>= 0.38.0)
       json
-    excon (0.45.2)
+    excon (0.45.3)
     filewatcher (0.4.0)
       trollop (~> 2.0)
     gli (2.12.2)
-    json (1.8.2)
+    json (1.8.3)
     open4 (1.3.4)
-    parser (2.2.0.pre.8)
+    parser (2.2.2.5)
       ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
     powerpack (0.0.9)
     rainbow (2.0.0)
     rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
     rspec-eventually (0.0.1)
-    rspec-expectations (3.1.2)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-its (1.0.1)
-      rspec-core (>= 2.99.0.beta1)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     rubocop (0.27.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.0)
+    ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
-    slop (3.6.0)
     trollop (2.1.2)
     vcr (2.9.3)
     webmock (1.20.4)
@@ -69,7 +68,6 @@ GEM
       crack (>= 0.3.2)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -79,6 +77,6 @@ DEPENDENCIES
   rspec
   rspec-eventually
   rspec-its
-  rubocop
+  rubocop (~> 0.27.1)
   vcr (~> 2.9.3)
   webmock (~> 1.20.4)

data/bigrig.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
   s.add_development_dependency('rspec-its')
-  s.add_development_dependency('rubocop')
+  s.add_development_dependency('rubocop', '~> 0.27.1')
   s.add_development_dependency('vcr', '~> 2.9.3')
   s.add_development_dependency('webmock', '~> 1.20.4')
   s.add_development_dependency('popen4')
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('gli', '2.12.2')
   s.add_runtime_dependency('colorize', '0.7.5')
-  s.add_runtime_dependency('docker-api', '1.20.0')
+  s.add_runtime_dependency('docker-api', '1.21.4')
   s.add_runtime_dependency('filewatcher', '0.4.0')
 end

data/lib/bigrig/models/container.rb

@@ -1,8 +1,8 @@
 module Bigrig
   class Container < BaseModel
-    ARRAY_ATTRS = :volumes_from, :links, :hosts, :volumes, :wait_for
+    ARRAY_ATTRS = :volumes_from, :links, :hosts, :volumes
     attr_accessor :env, :name, :path, :ports, :tag, :volumes_from, :links, :hosts, :repo,
-                  :volumes, :scan, :wait_for
+                  :volumes, :scan
 
     class << self
       def from_json(name, json)

data/lib/bigrig/runner.rb

@@ -43,8 +43,7 @@ module Bigrig
         volumes: container.volumes,
         links: container.links,
         hosts: container.hosts,
-        image_id: image_id(container),
-        wait_for: container.wait_for }
+        image_id: image_id(container) }
     end
 
     def image_id(container)
@@ -72,7 +71,7 @@ module Bigrig
         Thread.new do
           puts "Starting #{container[:name]}"
           puts DockerAdapter.run(container)
-          wait_for container
+          Waiter.new(container[:name]).wait_if_needed
         end
       end
 
@@ -91,12 +90,5 @@ module Bigrig
       end
       steps
     end
-
-    def wait_for(container)
-      container[:wait_for].empty? && return
-      puts "Waiting for `#{container[:wait_for].join ' '}` to compelte on #{container[:name]}"
-      result = DockerAdapter.exec(container[:name], container[:wait_for])
-      result[2] != 0 && fail("Error waiting for container: #{result.first.first}")
-    end
   end
 end

data/lib/bigrig/version.rb

@@ -1,3 +1,3 @@
 module Bigrig
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/lib/bigrig/waiter.rb

@@ -0,0 +1,20 @@
+module Bigrig
+  class Waiter
+    def initialize(name)
+      @name = name
+    end
+
+    def wait_if_needed
+      script_present? || return
+      puts "Waiting for `/bigrig-wait.sh` to compelte on #{@name}"
+      result = DockerAdapter.exec @name, '/bigrig-wait.sh'
+      result[2] != 0 && fail("Error waiting for container: #{result.first.first}")
+    end
+
+    def script_present?
+      DockerAdapter.exec(@name, ['ls', '/bigrig-wait.sh'])[2] == 0
+    rescue Docker::Error::NotFoundError => e
+      puts "Unable to determine if wait script is available: #{e}"
+    end
+  end
+end

data/lib/bigrig.rb

@@ -9,5 +9,6 @@ require 'bigrig/output_parser'
 require 'bigrig/tar'
 require 'bigrig/runner'
 require 'bigrig/version'
+require 'bigrig/waiter'
 
 module Bigrig; end

data/spec/bigrig/actions/run_action_spec.rb

@@ -56,6 +56,10 @@ module Bigrig
           end
         end
 
+        before do
+          allow_any_instance_of(Waiter).to receive :wait_if_needed
+        end
+
         it 'spins up multiple containers', :vcr do
           perform
           expect(running?).to be true
@@ -199,6 +203,8 @@ module Bigrig
             sleep 0.5
             expect(running).to eq 0
           end
+
+          allow_any_instance_of(Waiter).to receive :wait_if_needed
           perform
         end
       end
@@ -231,6 +237,7 @@ module Bigrig
             image_id: 'env-testid',
             env: { 'NAME1' => 'VALUE1', 'NAME2' => 'VALUE2' }
           )
+          allow_any_instance_of(Waiter).to receive :wait_if_needed
 
           subject
         end
@@ -247,6 +254,7 @@ module Bigrig
             image_id: 'env-testid',
             ports: ['80:8080', '12345']
           )
+          allow_any_instance_of(Waiter).to receive :wait_if_needed
 
           subject
         end

data/spec/bigrig/docker_adapter_spec.rb

@@ -264,7 +264,7 @@ module Bigrig
 
         it 'removes the image', :vcr do
           subject
-          expect { Docker::Image.get(image_id) }.to raise_error(/404 Not Found/)
+          expect { Docker::Image.get(image_id) }.to raise_error Docker::Error::NotFoundError
         end
       end
 

data/spec/bigrig/models/container_spec.rb

@@ -20,8 +20,6 @@ module Bigrig
     it { is_expected.to respond_to :volumes_from= }
     it { is_expected.to respond_to :volumes }
     it { is_expected.to respond_to :volumes= }
-    it { is_expected.to respond_to :wait_for }
-    it { is_expected.to respond_to :wait_for= }
 
     it 'accepts volumes as an array' do
       expect(Container.from_json(nil, 'volumes' => ['test']).volumes).to be_kind_of Array
@@ -63,14 +61,6 @@ module Bigrig
       expect(Container.from_json(nil, 'links' => 'machine:alias').dependencies).to eq ['machine']
     end
 
-    it 'accepts wait_for as an array' do
-      expect(Container.from_json(nil, 'wait_for' => ['test']).wait_for).to be_kind_of Array
-    end
-
-    it 'wraps a single wait_for in an array' do
-      expect(Container.from_json(nil, 'wait_for' => 'test').wait_for).to be_kind_of Array
-    end
-
     describe '#dependencies' do
       it 'returns an empty array when no dependencies are present' do
         expect(Container.from_json(nil, {}).dependencies).to eq []
@@ -142,14 +132,6 @@ module Bigrig
           expect(subject.ports).to eq ['80:8080', '12345']
         end
       end
-
-      context 'given json with wait_for' do
-        let(:json) { { 'wait_for' => 'random command' } }
-
-        it 'has wait_for' do
-          expect(subject.wait_for).to eq ['random command']
-        end
-      end
     end
   end
 end

data/spec/bigrig_spec.rb

@@ -216,28 +216,42 @@ describe 'bigrig' do
       end
     end
 
-    context 'spec/data/wait_for.json' do
+    context 'spec/data/wait_for/bigrig.json' do
       let(:args) { ['run'] }
       let(:output) { subject }
-      let(:file) { 'spec/data/wait_for.json' }
+      let(:file) { 'bigrig.json' }
+      let(:here) { "#{File.expand_path '../..', __FILE__}/" }
       let(:container) { Docker::Container.get 'wait_for-test' }
       let(:result) do
-        Docker::Container.get('wait_for-test').exec(['cat', '/tmp/result.txt']).first.first.to_i
+        Docker::Container.get('wait_for-test').exec(['cat', '/tmp/result.txt']).first.first.strip
+      end
+
+      around do |example|
+        Dir.chdir 'spec/data/wait_for' do
+          example.run
+        end
       end
 
       it 'waits for wait_for', :vcr do
         subject
-        expect(result).to be 2
+        expect(result).to eq '2'
       end
     end
 
     context 'spec/data/wait_for_broken.json' do
-      let(:command) { %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '}) }
-      let(:args) { %w(-f spec/data/wait_for_broken.json run) }
+      let(:command) { %(#{here}spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '}) }
+      let(:args) { ['run'] }
+      let(:here) { "#{File.expand_path '../..', __FILE__}/" }
       let(:container) do
         Docker::Container.get('wait_for_broken-test')
       end
 
+      around do |example|
+        Dir.chdir 'spec/data/wait_for_broken' do
+          example.run
+        end
+      end
+
       it 'fails with an error', :vcr do
         pid, output = capture_stdout command
         Process.kill :SIGINT, pid

data/spec/data/wait_for/Dockerfile

@@ -0,0 +1,4 @@
+FROM debian:jessie
+
+ADD bigrig-wait.sh /
+CMD tail -f /dev/null

data/spec/data/wait_for/bigrig-wait.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BEFORE=$(date +%s)
+sleep 2
+echo $(($(date +%s) - $BEFORE)) > /tmp/result.txt

data/spec/data/wait_for/bigrig.json

@@ -0,0 +1,8 @@
+{
+  "containers": {
+    "wait_for-test": {
+      "repo": "hawknewton/wait_for",
+      "path": "."
+    }
+  }
+}

data/spec/data/wait_for_broken/Dockerfile

@@ -0,0 +1,4 @@
+FROM debian:jessie
+
+ADD bigrig-wait.sh /
+CMD tail -f /dev/null

data/spec/data/wait_for_broken/bigrig-wait.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 1

data/spec/data/wait_for_broken/bigrig.json

@@ -0,0 +1,8 @@
+{
+  "containers": {
+    "wait_for_broken-test": {
+      "repo": "hawknewton/wait_for-broken",
+      "path": "."
+    }
+  }
+}