bigrig 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67c0ec6d99a335ab032bf9ca126d7175e3c4a08e
-  data.tar.gz: 756289a5f4bf550b94f8dc6eb1cf547d4458db53
+  metadata.gz: c9a963f80ce0fa0894c6a8dff9c4676778a99dcf
+  data.tar.gz: 5905ee20eb915c1b58f095d35375f125ba887840
 SHA512:
-  metadata.gz: 67d2524b1ad424c25886a2e7b2c196af1bb1dfb54cd7547c774a446bacb95e9a1d0a2e03dda5a10cc36e029586e26e4a2103164b5c6b0dcda18c7ea4da8a9d06
-  data.tar.gz: ab4098ceae9911c786ca40cc72a2b2791ed8c3d213da133c4caf69925e741e21ffbb1a1e694d45da2ed69a135ef34c4dc2cc4238b9c7af2496153d3a63597562
+  metadata.gz: b8bfaef2b69cd7af858afdbfb33394c9c3c737c4c6d0f5929f5a1b3b996a0bfbb3f21e2b9096c2b292a9059f60938219c71e701b50d46df7e758e0abda8a745c
+  data.tar.gz: c2f5dcdb8d3a32127482c92d6ec5ad9b16695c5913308f0da7cb4787dd61ca067a3f0e264f77435e53abf27417a0ae738e857fef5457591f2c45c8282e305d92

data/CHANGELOG.md

@@ -35,3 +35,7 @@ Add `volumes` attriute
 0.1.4
 =====
 * Unbreak build caching
+
+0.2.0
+=====
+* Added `scan` functionality

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    bigrig (0.1.4)
+    bigrig (0.2.0)
       colorize (= 0.7.5)
       docker-api (= 1.20.0)
+      filewatcher (= 0.4.0)
       gli (= 2.12.2)
 
 GEM
@@ -23,6 +24,8 @@ GEM
       excon (>= 0.38.0)
       json
     excon (0.45.1)
+    filewatcher (0.4.0)
+      trollop (~> 2.0)
     gli (2.12.2)
     json (1.8.2)
     method_source (0.8.2)
@@ -64,6 +67,7 @@ GEM
     ruby-progressbar (1.7.0)
     safe_yaml (1.0.4)
     slop (3.6.0)
+    trollop (2.1.2)
     vcr (2.9.3)
     webmock (1.20.4)
       addressable (>= 2.3.6)

data/README.md

@@ -55,6 +55,7 @@ generate a docker image.
       "ports": ["80:80"],
       "repo": "hawknewton/my-awesome-app",
       "path": ".",
+      "scan": "target/app.war",
       "env": {
         "USE_SSL": true,
         "CACHE_TIMEOUT": "3600"

data/bigrig.gemspec

@@ -26,4 +26,5 @@ 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('filewatcher', '0.4.0')
 end

data/lib/bigrig/actions/dev_action.rb

@@ -1,13 +1,21 @@
+require 'filewatcher'
+
 module Bigrig
   class DevAction
     def initialize(active_containers)
       @active_containers = active_containers
+      @application = Application.from_json active_containers
+      @restarting = 0
     end
 
     def perform
+      Thread.new { watch_for_changes }
+
       RunAction.new(@active_containers).perform
       [:SIGTERM, :SIGINT].each { |s| Signal.trap(s) { destroy } }
-      LogAction.new(@active_containers).perform
+
+      follow_logs
+      wait_for_containers
     end
 
     private
@@ -15,5 +23,52 @@ module Bigrig
     def destroy
       DestroyAction.new(@active_containers).perform
     end
+
+    def follow_logs
+      @tailers = @application.containers.map do |container|
+        LogTailer.create container.name
+      end
+    end
+
+    def kill_containers(containers)
+      containers.reverse.each do |c|
+        puts "Killing #{c.name} for restart".light_white
+        DockerAdapter.kill c.name
+      end
+    end
+
+    def restart(container)
+      @restarting += 1
+      containers = DependencyGraph.new(@application.containers).resolve_subtree container
+      kill_containers containers
+      Runner.new(containers).run
+      containers.each { |c| @tailers << LogTailer.create(c.name) }
+    ensure
+      @restarting -= 1
+    end
+
+    def tailers
+      @tailers ||= []
+    end
+
+    def watch_for_changes
+      @application.containers.select(&:scan).each do |container|
+        FileWatcher.new([container.scan]).watch do
+          begin
+            restart container
+          rescue => e
+            puts "Error restarting container: #{e}\n#{e.backtrace.join}".red
+          end
+        end
+      end
+    end
+
+    def wait_for_containers
+      while @tailers.any? || @restarting != 0
+        @tailers.each(&:join)
+        @tailers.keep_if(&:alive?)
+        sleep 0.1
+      end
+    end
   end
 end

data/lib/bigrig/actions/log_action.rb

@@ -2,44 +2,13 @@ require 'colorize'
 
 module Bigrig
   class LogAction
-    COLORS = [:green,
-              :yellow,
-              :light_blue,
-              :magenta,
-              :light_white]
-
     def initialize(active_containers)
       @application = Application.from_json active_containers
     end
 
     def perform
-      threads = @application.containers.map do |container|
-        color = next_color
-        Thread.new do
-          DockerAdapter.logs container.name, &print_block(container.name.send color)
-        end
-      end
-
-      threads.each(&:join)
-    end
-
-    private
-
-    def print_block(name)
-      proc do |stream, chunk|
-        if stream == :stderr
-          print "#{name}: #{chunk.light_red}"
-        else
-          puts "#{name}: #{chunk}"
-        end
-        $stdout.flush
-      end
-    end
-
-    def next_color
-      @color ||= 0
-      @color += 1
-      COLORS[(@color - 1) % 5]
+      tailers = @application.containers.map { |c| LogTailer.create c.name }
+      tailers.each(&:join)
     end
   end
 end

data/lib/bigrig/actions/run_action.rb

@@ -4,7 +4,7 @@ module Bigrig
 
     def initialize(active_containers)
       application = Application.from_json active_containers
-      @runner = Runner.new application
+      @runner = Runner.new application.containers
     end
 
     def perform

data/lib/bigrig/dependency_graph.rb

@@ -6,9 +6,23 @@ module Bigrig
     end
 
     def resolve
+      startup_order @containers
+    end
+
+    def resolve_subtree(container)
+      startup_order @containers.select { |c| resolve_deps(c, []).include? container.name }
+    end
+
+    private
+
+    def containers_for(names)
+      names.map { |n| @map[n] }
+    end
+
+    def startup_order(containers)
       resolved = []
-      @containers.each { |c| resolve_deps(c, resolved) unless resolved.include? c.name }
-      resolved.map { |n| @map[n] }
+      containers.each { |c| resolve_deps(c, resolved) unless resolved.include? c.name }
+      containers_for resolved
     end
 
     def resolve_deps(container, resolved)

data/lib/bigrig/log_tailer.rb

@@ -0,0 +1,56 @@
+require 'colorize'
+require 'forwardable'
+
+module Bigrig
+  class LogTailer
+    extend Forwardable
+
+    COLORS = [:green,
+              :yellow,
+              :light_blue,
+              :magenta,
+              :light_white]
+
+    def_delegators :@thread, :alive?, :join, :kill
+
+    class << self
+      def create(name)
+        new name, color_for(name)
+      end
+
+      def color_for(name)
+        @colors ||= {}
+        @colors[name] ||= next_color
+      end
+
+      def next_color
+        @color ||= 0
+        @color += 1
+        COLORS[(@color - 1) % 5]
+      end
+    end
+
+    private
+
+    def initialize(name, color)
+      @thread = Thread.new do
+        begin
+          DockerAdapter.logs name, &print_block(name.send color)
+        rescue => e
+          puts "Error starting log tailer: #{e}\n#{e.backtrace.join "\n"}"
+        end
+      end
+    end
+
+    def print_block(name)
+      proc do |stream, chunk|
+        if stream == :stderr
+          print "#{name}: #{chunk.light_red}"
+        else
+          puts "#{name}: #{chunk}"
+        end
+        $stdout.flush
+      end
+    end
+  end
+end

data/lib/bigrig/models/container.rb

@@ -1,10 +1,11 @@
 module Bigrig
   class Container < BaseModel
-    attr_accessor :env, :name, :path, :ports, :tag, :volumes_from, :links, :hosts, :repo, :volumes
+    attr_accessor :env, :name, :path, :ports, :tag, :volumes_from, :links, :hosts, :repo,
+                  :volumes, :scan
 
     class << self
       def from_json(name, json)
-        opts = [:env, :path, :ports, :tag, :repo].each_with_object(name: name) do |e, o|
+        opts = [:env, :path, :ports, :tag, :repo, :scan].each_with_object(name: name) do |e, o|
           o[e] = json.send :[], e.to_s
         end
         [:volumes_from, :links, :hosts, :volumes].each { |x| opts[x] = as_array json[x.to_s] }

data/lib/bigrig/runner.rb

@@ -1,7 +1,12 @@
 module Bigrig
   class Runner
-    def initialize(application)
-      @application = application
+    def self.start(container)
+      puts "Starting #{container.name}"
+      puts DockerAdapter.run docker_opts_for container
+    end
+
+    def initialize(containers)
+      @containers = containers
     end
 
     def run
@@ -10,15 +15,13 @@ module Bigrig
 
     private
 
+    attr_accessor :containers
+
     def build(path)
       puts "Building #{path}"
       DockerAdapter.build path, &OutputParser.parser_proc
     end
 
-    def containers
-      @application.containers
-    end
-
     def depends_on_containers(container, containers)
       (containers.map(&:name) & container.dependencies).any?
     end
@@ -33,22 +36,21 @@ module Bigrig
     end
 
     def docker_opts(step)
-      step.map do |container|
-        docker_opts_for(container).merge image_id: image_id(container)
-      end
+      step.map { |c| Runner.docker_opts_for c }
     end
 
-    def docker_opts_for(container)
+    def self.docker_opts_for(container)
       { env: container.env,
         name: container.name,
         ports: container.ports,
         volumes_from: container.volumes_from,
         volumes: container.volumes,
         links: container.links,
-        hosts: container.hosts }
+        hosts: container.hosts,
+        image_id: image_id(container) }
     end
 
-    def image_id(container)
+    def self.image_id(container)
       if container.path
         build container.path
       else

data/lib/bigrig/version.rb

@@ -1,3 +1,3 @@
 module Bigrig
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/lib/bigrig.rb

@@ -2,6 +2,7 @@ require 'bigrig/actions'
 require 'bigrig/descriptor'
 require 'bigrig/dependency_graph'
 require 'bigrig/docker_adapter'
+require 'bigrig/log_tailer'
 require 'bigrig/models'
 require 'bigrig/output_parser'
 require 'bigrig/runner'

data/spec/bigrig/actions/dev_action_spec.rb

@@ -2,7 +2,7 @@ module Bigrig
   describe DevAction do
     describe '#perform' do
       subject { described_class.new descriptor.as_json }
-      let(:descriptor) { Descriptor.new test_file(file), profiles }
+      let(:descriptor) { Descriptor.read test_file(file), profiles }
 
       context 'when no profile is provided' do
         let(:profiles) { [] }

data/spec/bigrig/actions/log_action_spec.rb

@@ -10,6 +10,10 @@ module Bigrig
       let(:container) { Docker::Container.get 'log-test' }
 
       before do
+        begin
+          Docker::Container.get('log-test').kill.delete
+        rescue Docker::Error::NotFoundError # rubocop:disable Lint/HandleExceptions
+        end
         Docker::Container.create('Image' => image.id, 'name' => 'log-test').start
       end
 
@@ -24,7 +28,7 @@ module Bigrig
           and_yield(:stdout, 'stdout message').
           and_yield(:stderr, 'stderr message')
         expect($stdout).to receive(:puts).with "\e[0;32;49mlog-test\e[0m: stdout message"
-        expect(runner).to receive(:print).
+        expect_any_instance_of(LogTailer).to receive(:print).
           with "\e[0;32;49mlog-test\e[0m: \e[0;91;49mstderr message\e[0m"
         subject
       end

data/spec/bigrig/dependency_graph_spec.rb

@@ -11,7 +11,28 @@ module Bigrig
         end
 
         it 'resolves in the correct order' do
-          expect(subject.map(&:name)).to match_array %w(test1 test2)
+          expect(subject.map(&:name)).to eq %w(test1 test2)
+        end
+      end
+    end
+
+    describe '#resolve_subtree' do
+      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')
+        end
+
+        let(:containers) do
+          [
+            target,
+            Container.new(name: 'test1', volumes_from: ['target']),
+            Container.new(name: 'test2')
+          ]
+        end
+
+        it 'resolves only related containers' do
+          expect(subject.map(&:name)).to eq %w(target test1)
         end
       end
     end

data/spec/bigrig/log_tailer_spec.rb

@@ -0,0 +1,24 @@
+module Bigrig
+  describe LogTailer do
+
+    describe '#create' do
+      before do
+        LogTailer.instance_variable_set :@colors, nil
+        LogTailer.instance_variable_set :@color, nil
+      end
+      it 'reuses the same color for a given container' do
+        expect(LogTailer).to receive(:new).with('container', :green).twice
+        LogTailer.create 'container'
+        LogTailer.create 'container'
+      end
+
+      it 'uses new colors for new containers' do
+        expect(LogTailer).to receive(:new).with 'container1', :green
+        expect(LogTailer).to receive(:new).with 'container2', :yellow
+
+        LogTailer.create 'container1'
+        LogTailer.create 'container2'
+      end
+    end
+  end
+end

data/spec/bigrig/models/container_spec.rb

@@ -12,6 +12,8 @@ module Bigrig
     it { is_expected.to respond_to :ports= }
     it { is_expected.to respond_to :repo }
     it { is_expected.to respond_to :repo= }
+    it { is_expected.to respond_to :scan= }
+    it { is_expected.to respond_to :scan }
     it { is_expected.to respond_to :tag }
     it { is_expected.to respond_to :tag= }
     it { is_expected.to respond_to :volumes_from }
@@ -83,7 +85,6 @@ module Bigrig
 
         its(:ports) { is_expected.to be_a Array }
         its(:ports) { is_expected.to be_empty }
-
       end
 
       context 'given json with a path' do
@@ -94,6 +95,14 @@ module Bigrig
         end
       end
 
+      context 'given json with a scan' do
+        let(:json) { { 'scan' => '/path/to/scan' } }
+
+        it 'sets the path' do
+          expect(subject.scan).to eq '/path/to/scan'
+        end
+      end
+
       context 'given json with env params' do
         let(:json) { { 'env' => { 'NAME1' => 'VALUE1', 'NAME2' => 'VALUE2' } } }
 

data/spec/bigrig_spec.rb

@@ -11,8 +11,61 @@ describe 'bigrig' do
   end
 
   describe 'dev' do
+    context 'spec/data/scan.json' do
+      let(:args) { ['-f', 'spec/data/scan.json', 'dev'] }
+      let(:command) { %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '}) }
+
+      before do
+        FileUtils.mkdir_p '/tmp/scan'
+        FileUtils.touch '/tmp/scan/scan.me'
+      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'
+        FileUtils.touch '/tmp/scan/scan.me'
+        sleep 3
+        wait_for 'scanning'
+        expect(before_image.id).to_not eq Docker::Container.get('scanning').id
+        Process.kill :SIGINT, pid
+        Process.wait pid
+      end
+
+      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'
+
+        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
+        Process.kill :SIGINT, pid
+        Process.wait pid
+      end
+
+      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'
+
+        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
+        Process.kill :SIGINT, pid
+        Process.wait pid
+      end
+    end
+
     context 'spec/data/dev.json' 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")
@@ -29,8 +82,8 @@ describe 'bigrig' do
       end
 
       it 'starts the containers', :vcr do
-        command = %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '})
         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')
@@ -44,7 +97,6 @@ describe 'bigrig' do
       end
 
       it 'destroys containers on exit', :vcr do
-        command = %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '})
         pid = Open4.popen4(command).first
         Process.kill :SIGINT, pid
         Process.wait pid
@@ -61,8 +113,8 @@ describe 'bigrig' do
       end
 
       it 'activates the dev profile', :vcr do
-        command = %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '})
         pid = Open4.popen4(command).first
+        wait_for 'dev-test'
         sleep 2
         begin
           expect(env).to include 'PROFILE' => 'dev'
@@ -73,7 +125,6 @@ describe 'bigrig' do
       end
 
       it 'tails the logs', :vcr do
-        command = %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '})
         pid, output = capture_stdout command
         Process.kill :SIGINT, pid
         Process.wait pid

data/spec/data/scan.json

@@ -0,0 +1,18 @@
+{
+  "containers": {
+    "scanning": {
+      "repo": "hawknewton/log-test",
+      "tag": "0.0.1",
+      "scan": "/tmp/scan/**"
+    },
+    "uses_scanning": {
+      "repo": "hawknewton/log-test",
+      "tag": "0.0.1",
+      "links": "scanning:scanning"
+    },
+    "some_ahole": {
+      "repo": "hawknewton/log-test",
+      "tag": "0.0.1"
+    }
+  }
+}

data/spec/spec_helper.rb

@@ -90,6 +90,18 @@ def capture_stdout(command)
   [pid, output]
 end
 
+def drain_io(io)
+  Thread.new do
+    loop do
+      begin
+        puts io.read_nonblock 512_000
+      rescue IO::EAGAINWaitReadable # rubocop:disable Lint/HandleExceptions
+      end
+      sleep 0.1
+    end
+  end
+end
+
 def read_stdout(stdout)
   output = ''
   5.times do
@@ -102,3 +114,16 @@ 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/vcr.rb

@@ -3,6 +3,7 @@ require 'webmock'
 require 'docker'
 
 VCR.configure do |c|
+  ENV['VCR_RECORD_ALL'] == 'true' && c.default_cassette_options = { record: :all }
   docker_host = URI.parse(Docker.url).host
   c.allow_http_connections_when_no_cassette = false
   c.filter_sensitive_data('<USERNAME>') { ENV['DOCKER_API_USER'] }