phoebo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f04f78db0118a1c401d6e8fb38767540a0770c
-  data.tar.gz: 6b74da1cd4f1d534057c5e67c001a315978087ee
+  metadata.gz: b51f88a605d5610ffe5ad9a116133f1bfbd827a6
+  data.tar.gz: 5eab25352327affc5cd992d7992665ccaef95550
 SHA512:
-  metadata.gz: 354236b15bef8f208762c2bbe4459a60066d7c323a3aacac03625cd56fa3417b89d573d4c8ca1c7746def9ee4889d4dfa9505962ac12b3ab5fc6c4a71c004cba
-  data.tar.gz: f5d1ef725707f8427491bf10fb525ad8a30c77503160b6a2f3de7ce44ea08c02bbc60a1d235c9e7849dc67100133e264b880b5d37088e2cf692690c38bbefff5
+  metadata.gz: 9ab14f8c74e16a695d331ad31beb983b43e7b84506802861ab6fa177d69f2ad6193a7b212c8e06dd7605c9c55701d6f535583ab1770f69cc9d72848f5796b72b
+  data.tar.gz: ebf9b8b8d13cf6b8897e1a03aa0d39adedbad4d8c279001d13a0a839c045c654f1a0a82841cca73d769bd73466f3a4362dcca865dc47dbfe491a39f7bcb8a45e

data/lib/phoebo/config/image_commands.rb

@@ -1,4 +1,4 @@
-# Auto-require for all Image commands
+# Auto-require
 Dir[File.dirname(__FILE__) + '/image_commands/*.rb'].each { |file| require file }
 
 # Module containing all Image commands

data/lib/phoebo/docker/image_builder.rb

@@ -59,8 +59,9 @@ module Phoebo
 
         begin
           stdout.puts "Building image " + "...".light_black
-          built_image = ::Docker::Image.build_from_tar(tar_stream.tap(&:rewind))
-
+          built_image = ::Docker::Image.build_from_tar(tar_stream.tap(&:rewind)) { |text|
+            Docker.process_output_stream(stdout, text)
+          }
 
           # TODO: Perhaps we should calculate size from virtual size of the base,
           # this is not working very well while merging layers.

data/lib/phoebo/docker/image_pusher.rb

@@ -21,9 +21,10 @@ module Phoebo
         end
 
         stdout.puts "Pushing image " + image_id.cyan + " ...".light_black
-
         built_image = ::Docker::Image.get(image_id)
-        built_image.push
+        built_image.push { |text|
+            Docker.process_output_stream(stdout, text)
+        }
       end
     end
   end

data/lib/phoebo/docker.rb

@@ -2,5 +2,12 @@ module Phoebo
   module Docker
     autoload :ImageBuilder, 'phoebo/docker/image_builder'
     autoload :ImagePusher, 'phoebo/docker/image_pusher'
+
+    # Writes stripped streamed response to output stream
+    def self.process_output_stream(out, text)
+      if m = text.match(/^{"stream"\:"(.+?)\\n?"}/)
+        out.puts m[1].gsub(/\\u[0-9a-f]{4}/, '').light_black
+      end
+    end
   end
 end

data/lib/phoebo/version.rb

@@ -1,3 +1,3 @@
 module Phoebo
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/phoebo.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://gitlab.fit.cvut.cz/phoebo/phoebo"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0") - %w(.gitignore Dockerfile wrapdocker)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", '~> 3.0'
+  spec.add_development_dependency "simplecov", '~> 0.9.0'
 end

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'bundler/setup'
 Bundler.setup
 
+require 'simplecov'
+SimpleCov.start
+
 require 'phoebo'
 
 # This file was generated by the `rspec --init` command. Conventionally, all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phoebo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Adam Staněk
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: Phoebo creates ready-to-deploy Docker images from project Git repository
 email:
 - adam.stanek@v3net.cz
@@ -102,7 +116,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - ".rspec"
 - Gemfile
 - LICENSE.txt

data/.gitignore

@@ -1,14 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log