bigrig 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681ac8a51eebdb90849b5e4d444583f4b651119d
-  data.tar.gz: d25ebc45f4af29b468231985847e7c1d295348e2
+  metadata.gz: a001e90b4c9468158187737587e7927c425d79a7
+  data.tar.gz: d1efdce57b29e23ea77d8897cab045ea41be2474
 SHA512:
-  metadata.gz: cf7d8a8ad5b9735817c8e2ef4a535a1928afd7314e890693ffc4c883cb9059acf9d83fa510bac8a46b947776e90622ab9cd4e291964be6327a7c5628e4453976
-  data.tar.gz: 5a6699fd7aa8df839185dcd9f2177c22fcbb6ce349042cb60df644b5167367ce5383384f67ab858246fbc885e226c0f05273e142284d3c1af8a2ae0be2a2b3d8
+  metadata.gz: 444a62218b09974941e3e5c6e25e0192e2319c5ee5c095fbf27eb66cb4ca20f07b211daae439c569deee0a0ed2ec628cd7f59febd3276abb73959b490e02bf92
+  data.tar.gz: 483ef66f2692664071025f51046988c95380116ddb1cde2e8edd16e7d37b95571404ed79ffea2b88259336f429932f104097330920cc555a7c181b7437f25f7e

data/CHANGELOG.md

@@ -21,3 +21,9 @@ Add profiles to most commands
 0.1.0
 =====
 Add `volumes` attriute
+
+0.1.1
+=====
+* Profiles with volumes or volumes_from now augment eachother
+* Profiles are applied based on the order they are defined
+* Enahnce output formatter

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
+
 gemspec
+gem 'pry-byebug'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bigrig (0.1.0)
+    bigrig (0.1.1)
       colorize (= 0.7.5)
       docker-api (= 1.20.0)
       gli (= 2.12.2)
@@ -14,15 +14,21 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     coderay (1.1.0)
     colorize (0.7.5)
+    columnize (0.9.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     docker-api (1.20.0)
       excon (>= 0.38.0)
       json
-    excon (0.44.4)
+    excon (0.45.1)
     gli (2.12.2)
     json (1.8.2)
     method_source (0.8.2)
@@ -38,6 +44,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-byebug (2.0.0)
+      byebug (~> 3.4)
+      pry (~> 0.10)
     rainbow (2.0.0)
     rake (10.4.2)
     rspec (3.1.0)
@@ -76,6 +85,7 @@ DEPENDENCIES
   bigrig!
   popen4
   pry
+  pry-byebug
   rake
   rspec
   rspec-its

data/lib/bigrig/descriptor.rb

@@ -25,6 +25,8 @@ module Bigrig
         container = container_map[name] ||= {}
         if value.is_a? Hash
           (container[key] ||= {}).merge! value
+        elsif %w(volumes volumes_from).include? key
+          container[key] = (([container[key]] || []) + [value]).flatten
         else
           container[key] = value
         end
@@ -33,6 +35,7 @@ module Bigrig
 
     def self.profiles_for(json, active_profiles)
       if json['profiles']
+        active_profiles = json['profiles'].keys.select { |x| active_profiles.include? x }
         profiles = active_profiles.map do |profile|
           [profile, json['profiles'][profile]]
         end

data/lib/bigrig/output_parser.rb

@@ -1,3 +1,5 @@
+require 'pry-byebug'
+
 module Bigrig
   class OutputParser
     def self.parser_proc
@@ -6,25 +8,62 @@ module Bigrig
 
     def initialize
       @last_line = ''
+      @buffer = ''
     end
 
     def parse(input)
-      json = JSON.parse input
-      if json['errorDetail']
-        "#{json['errorDetail']['message'].red}\n"
-      elsif json['stream'] || json['id'].nil?
-        json['stream'] || "#{json['status']}\n"
-      else
-        parse_progress json
+      output = documents(input).map do |json|
+        if json['errorDetail']
+          "#{json['errorDetail']['message'].red}\n"
+        elsif json['stream'] || json['id'].nil?
+          json['stream'] || "#{json['status']}\n"
+        else
+          parse_progress json
+        end
       end
+      output.join
     end
 
     private
 
+    def documents(str)
+      @buffer += str
+      documents = []
+      begin
+        loop do
+          documents << JSON.parse(next_document)
+        end
+      rescue JSON::ParserError # rubocop:disable Lint/HandleExceptions
+      end
+      documents
+    end
+
     def last_line_length
       @last_line.strip.length
     end
 
+    # rubocop:disable all
+    def next_document
+      chars = @buffer.chars
+      i = count = 0
+      string = false
+
+      while i < chars.length
+        chars[i] == '"' && string = !string
+        chars[i] == '\\' && i += 1
+        unless string
+          chars[i] == '{' && count += 1
+          chars[i] == '}' && count -= 1
+        end
+        count == 0 && chars[0..i].join.strip.length > 0 && break
+        i += 1
+      end
+
+      count == 0 && @buffer = (chars.join[i + 1..-1] || '')
+      chars.join[0..i]
+    end
+    # rubocop:enable all
+
     def padding(line)
       if last_line_length > line.length
         padding = ' ' * (last_line_length - line.length)

data/lib/bigrig/version.rb

@@ -1,3 +1,3 @@
 module Bigrig
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/bigrig/descriptor_spec.rb

@@ -43,6 +43,40 @@ module Bigrig
       end
     end
 
+    context 'given a descriptor that adds a volume' do
+      let(:file) { 'adds_volume.json' }
+      let(:profiles) { ['qa'] }
+      let(:volumes) { subject.as_json['adds_volumes']['volumes'] }
+
+      it 'includes both volumes' do
+        expect(volumes).to be_a Array
+        expect(volumes).to include '/tmp/volume1'
+        expect(volumes).to include '/tmp/volume2'
+      end
+    end
+
+    context 'given a descriptor that adds a volumes_from' do
+      let(:file) { 'adds_volumes_from.json' }
+      let(:profiles) { ['qa'] }
+      let(:volumes_from) { subject.as_json['adds_volumes_from']['volumes_from'] }
+
+      it 'includes both volumes' do
+        expect(volumes_from).to be_a Array
+        expect(volumes_from).to include 'container1'
+        expect(volumes_from).to include 'container2'
+      end
+    end
+
+    context 'given a descriptor that overrides the same value in multiple profiles' do
+      let(:file) { 'multiple_overrides.json' }
+      let(:profiles) { %w(profile2 profile1) }
+      let(:tag) { subject.as_json['container']['tag'] }
+
+      it 'uses the last value in the file' do
+        expect(tag).to eq 'profile2'
+      end
+    end
+
     context 'given a descriptor that adds a container' do
       let(:file) { 'addscontainer.json' }
       let(:profiles) { ['new'] }

data/spec/bigrig/output_parser_spec.rb

@@ -9,6 +9,20 @@ module Bigrig
       let(:mock_io) { double IO }
       let(:output) { subject }
 
+      context 'when the document comes in multiple chunks' do
+        let(:input) { ['{"stream": "val', 'ue"}'] }
+        it 'parses the document' do
+          expect(output).to eq 'value'
+        end
+      end
+
+      context 'when the chunk contains multiple documents' do
+        let(:input) { '{"stream": "value1"} {"stream": "value2"}' }
+        it 'parses both documents' do
+          expect(output).to eq 'value1value2'
+        end
+      end
+
       context 'with input that has a stream' do
         let(:input) { '{"stream": "value"}' }
 
@@ -66,6 +80,14 @@ module Bigrig
           expect(output).to eq "id: status progress                  \r"
         end
       end
+
+      context 'given string with tokens' do
+        let(:input) { '{"status": "bla bla bla} { \\" bla"}' }
+
+        it 'ignores the special characters' do
+          expect(output).to eq "bla bla bla} { \" bla\n"
+        end
+      end
     end
   end
 end

data/spec/bigrig_spec.rb

@@ -19,6 +19,15 @@ describe 'bigrig' do
         text.split("\n").each_with_object({}) { |e, o| o.store(*e.split('=')) }
       end
 
+      before do
+        ['dev-test', 'dev-logs'].each do |container|
+          begin
+            Docker::Container.get(container).kill.delete
+          rescue Docker::Error::NotFoundError # rubocop:disable Lint/HandleExceptions
+          end
+        end
+      end
+
       it 'starts the containers', :vcr do
         command = %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '})
         pid = Open4.popen4(command).first
@@ -37,7 +46,6 @@ describe 'bigrig' do
       it 'destroys containers on exit', :vcr do
         command = %(spec/support/bigrig_vcr "#{casette_name}" #{args.join ' '})
         pid = Open4.popen4(command).first
-        sleep 2
         Process.kill :SIGINT, pid
         Process.wait pid
         begin

data/spec/data/adds_volume.json

@@ -0,0 +1,17 @@
+{
+  "containers": {
+    "adds_volumes": {
+      "repo": "hawknewton/true",
+      "tag": "0.0.1",
+      "volumes": "/tmp/volume1"
+    }
+  },
+
+  "profiles": {
+    "qa": {
+      "adds_volumes": {
+        "volumes": "/tmp/volume2"
+      }
+    }
+  }
+}

data/spec/data/adds_volumes_from.json

@@ -0,0 +1,17 @@
+{
+  "containers": {
+    "adds_volumes_from": {
+      "repo": "hawknewton/true",
+      "tag": "0.0.1",
+      "volumes_from": "container1"
+    }
+  },
+
+  "profiles": {
+    "qa": {
+      "adds_volumes_from": {
+        "volumes_from": "container2"
+      }
+    }
+  }
+}

data/spec/data/multiple_overrides.json

@@ -0,0 +1,22 @@
+{
+  "containers": {
+    "container": {
+      "repo": "hawknewton/true",
+      "tag": "0.0.1"
+    }
+  },
+
+  "profiles": {
+    "profile1": {
+      "container": {
+        "tag": "profile1"
+      }
+    },
+
+    "profile2": {
+      "container": {
+        "tag": "profile2"
+      }
+    }
+  }
+}

data/spec/support/vcr.rb

@@ -3,12 +3,17 @@ require 'webmock'
 require 'docker'
 
 VCR.configure do |c|
+  docker_host = URI.parse(Docker.url).host
   c.allow_http_connections_when_no_cassette = false
-  c.filter_sensitive_data('<DOCKER_HOST>') { Docker.url.sub(/tcp\:/, 'https:') }
-  c.filter_sensitive_data('<DOCKER_HTTP>') { "http:#{Docker.url.split(':')[1]}:4567" }
   c.filter_sensitive_data('<USERNAME>') { ENV['DOCKER_API_USER'] }
   c.filter_sensitive_data('<PASSWORD>') { ENV['DOCKER_API_PASS'] }
   c.filter_sensitive_data('<EMAIL>') { ENV['DOCKER_API_EMAIL'] }
+
+  c.define_cassette_placeholder('<ENCODED_REPO_URL>') { "#{docker_host}%3A5000" }
+  c.define_cassette_placeholder('<REPO_URL>') { "#{docker_host}:5000" }
+  c.define_cassette_placeholder('<TEST_URL>') { "http://#{docker_host}:4568" }
+  c.define_cassette_placeholder('<DOCKER_HOST>') { Docker.url.sub(/tcp\:/, 'https:') }
+  c.define_cassette_placeholder('<DOCKER_HTTP>') { "http:#{Docker.url.split(':')[1]}:4567" }
   c.hook_into :excon, :webmock
   c.cassette_library_dir = File.join(File.dirname(__FILE__), '..', 'vcr')
   defined?(RSpec) && c.configure_rspec_metadata!