rake_docker 0.16.0 → 0.16.1.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b9f5024bbc14e88dcbbe7809f5f4038df723cf0d8fc9a2cbf43195bddc1752
-  data.tar.gz: 1c657d3d8b4937e915ffb3f4f5dc253200e2dbd6f38e0b476c7f7e98c8c93163
+  metadata.gz: a5f16a02705cc04f0051afd2f517282c3cf7ee0f7b34afce35df213ad385a183
+  data.tar.gz: b25cb7c4d1180053584ba986b8404d41372eb10728c964d430204762fc49ea3a
 SHA512:
-  metadata.gz: b167707592c2acdb508ca32a9268afc8fda2eb84eb677ffdf4ba529ea9350c6086065e43392d4eaa6c09de0dcc36488e095ac5974bc5f45257b9196b78540d89
-  data.tar.gz: 2dc56dcb9953fe39e63707387fbec8ba2c8cec9ff18eb467d97d158648c4d684a930f978af404c29da9d58e18a403bc9b42214b298e32e9239eccce96fee708a
+  metadata.gz: 0eab4b2c5d74f84daafb35daccf3b1e7705da7bbeb8e38a9f8a7ac23c5ed2e3ea2dab6677e2d7a9d358eecf1defd0505ae423ee68195eb96b907d67b9e81cf48
+  data.tar.gz: dd14371620e032183b282ca648322134023c96196cc6fc3eda372f5bff78ebdb71eee500a9ff45f44bf7fcd70c6e53a9884cc6071e77ea7d91868297ec530487

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rake_docker (0.16.0)
+    rake_docker (0.16.1.pre1)
       aws-sdk (~> 2.10)
+      colored2 (~> 3.1)
       docker-api (~> 1.34)
 
 GEM
@@ -13,27 +14,28 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    aws-sdk (2.10.115)
-      aws-sdk-resources (= 2.10.115)
-    aws-sdk-core (2.10.115)
+    aws-sdk (2.11.93)
+      aws-sdk-resources (= 2.11.93)
+    aws-sdk-core (2.11.93)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.115)
-      aws-sdk-core (= 2.10.115)
-    aws-sigv4 (1.0.2)
+    aws-sdk-resources (2.11.93)
+      aws-sdk-core (= 2.11.93)
+    aws-sigv4 (1.0.3)
+    colored2 (3.1.2)
     diff-lcs (1.3)
     docile (1.1.5)
-    docker-api (1.34.0)
+    docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    excon (0.60.0)
+    excon (0.62.0)
     gem-release (0.7.4)
     i18n (0.8.4)
-    jmespath (1.3.1)
+    jmespath (1.4.0)
     json (2.1.0)
     memfs (1.0.0)
     minitest (5.10.2)
-    multi_json (1.13.0)
+    multi_json (1.13.1)
     rake (10.5.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)

data/lib/docker_output.rb

@@ -0,0 +1,47 @@
+require 'json'
+require 'colored2'
+
+module DockerOutput
+  def self.parse(chunk)
+    chunk.each_line do |line|
+      yield self.parse_line(line)
+    end
+  end
+
+  def self.parse_line(line)
+    begin
+      json = JSON.parse(line.strip)
+    rescue JSON::ParserError
+      return line
+    end
+
+    # Skip progress and aux as they are covered by other status messages
+    return '' if json['progress'] && json['status']
+    return '' if json['aux']
+
+    # Return error flag as a second result
+    return [json['error'], true] if json['error']
+
+    return json['stream'] if json['stream']
+
+    if json['status']
+      if json['id']
+        return json['id'] + ': ' + json['status'] + "\n"
+      else
+        return json['status'] + "\n"
+      end
+    end
+
+    return line # Nothing else matches
+  end
+
+  def self.print(chunk)
+    self.parse(chunk) do |text, is_error|
+      if is_error
+        $stdout.print text.red + "\n"
+        raise text
+      end
+      $stdout.print text unless text.empty?
+    end
+  end
+end

data/lib/rake_docker/tasks/build.rb

@@ -1,5 +1,6 @@
 require 'docker'
 require_relative '../tasklib'
+require_relative '../../docker_output'
 
 module RakeDocker
   module Tasks
@@ -49,7 +50,7 @@ module RakeDocker
           Docker::Image.build_from_dir(
               File.join(work_directory, image_name),
               options) do |chunk|
-            $stdout.puts chunk
+            DockerOutput.print chunk
           end
         end
       end

data/lib/rake_docker/tasks/push.rb

@@ -49,7 +49,7 @@ module RakeDocker
           image = images.first
           derived_tags.each do |tag|
             image.push(nil, tag: tag) do |chunk|
-              $stdout.puts chunk
+              DockerOutput.print chunk
             end
           end
         end

data/lib/rake_docker/version.rb

@@ -1,3 +1,3 @@
 module RakeDocker
-  VERSION = '0.16.0'
+  VERSION = '0.16.1.pre1'
 end

data/rake_docker.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'docker-api', '~> 1.34'
   spec.add_dependency 'aws-sdk', '~> 2.10'
+  spec.add_dependency 'colored2', '~> 3.1'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_docker
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1.pre1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: colored2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +185,7 @@ files:
 - config/secrets/ci/ssh.public
 - config/secrets/rubygems/credentials
 - go
+- lib/docker_output.rb
 - lib/rake_docker.rb
 - lib/rake_docker/authentication.rb
 - lib/rake_docker/authentication/ecr.rb
@@ -207,9 +222,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7