rbld 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94bbf882c9641e89b93419feedd8b99818fe7b72
-  data.tar.gz: 1eafc984b557b8a420289fb80ae97ab43eead5dc
+  metadata.gz: fc3bf06f427b26d18323c5f232e31579479b0907
+  data.tar.gz: fdc5b95543ea855690230682759a139175a26aed
 SHA512:
-  metadata.gz: a4e2551b3b1bea0fac3841ef45b1d52f3445b3f4bf3c3b9f77eebe6d8499aa274fa1970803e48a66b4ec19f17322a62a1ec2dfd0b8acc36d723be6f03e343794
-  data.tar.gz: 246e52055929d406644c8eedb0a984d354de2371d275ee517f907b83c6aaa2e7650eccec386b39979ca26735018ed354b3a5b4da862dc70deddb11fa7107cb4c
+  metadata.gz: 969921f5c1152e067706ff5d75e002164d7e65546cd33339c5596b5ec8c3018bee3944966ef490306603840b8284e39e113884dcc9e541dcf5f648b5e98487ec
+  data.tar.gz: ed3610e8ffe3e6b98effd0589047db91121bd2bbe365bbb1f2ca9e9b16ff368cdec1df0928d4c9e5f90fe34af0e9f94293538629eb72e0b2690f12cf413ad3d5

data/cli/lib/data/version

@@ -1 +1 @@
-1.3.4
+1.3.5

data/cli/lib/rbld_dockerops.rb

@@ -100,13 +100,9 @@ module Rebuild
       end
 
       def process_log(log_item)
-        begin
-          json = JSON.parse( log_item )
-        rescue
-        else
-          trace_progress( json['progress'] )
-          save_last_error( json['errorDetail'] )
-        end
+        json = Rebuild::Utils::SafeJSONParser.new( log_item )
+        trace_progress( json['progress'] )
+        save_last_error( json['errorDetail'] )
       end
 
       def trace_progress(line)

data/cli/lib/rbld_engine.rb

@@ -25,7 +25,8 @@ module Rebuild::Engine
       @name, @api_obj = name, api_obj
     end
 
-    def remove!
+    def remove!(with_containers = false)
+      remove_containers if with_containers
       @api_obj.remove( name: @name.to_s )
     end
 
@@ -37,6 +38,17 @@ module Rebuild::Engine
     def identity
       @name.to_s
     end
+
+    private
+
+    def remove_containers
+      Docker::Container.all( opts = { all:true } ).each do |c|
+        if c.info['ImageID'] == @api_obj.info['id']
+          rbld_log.info("Removing dangling container #{c.info['id']}")
+          c.delete( force: true )
+        end
+      end
+    end
   end
 
   class NamedDockerContainer
@@ -459,11 +471,17 @@ module Rebuild::Engine
     end
 
     def load!(filename)
-      EnvironmentFile.new( filename ).load!
+      if name = EnvironmentFile.new( filename ).load!
+        # In case a modified environment was overriden,
+        # drop modifications as well
+        rbld_log.info( "Loaded environment #{name}, running checkout")
+        checkout!( name ) if @cache.get( name )
+      end
+
       # If image with the same name but another
       # ID existed before load it becomes dangling
       # and should be ditched
-      @cache.dangling.each(&:remove)
+      @cache.dangling.each { |img| remove_docker_img_if_unused( img ) }
       @cache.refresh!
     end
 
@@ -557,7 +575,7 @@ module Rebuild::Engine
 
         names = NameFactory.new( new_name )
         env.modification_container.flatten( names.identity )
-        env.rerun_img.remove! if env.rerun_img
+        env.rerun_img.remove!( true ) if env.rerun_img
       else
         raise NoChangesToCommit, env_name.full
       end
@@ -592,11 +610,8 @@ module Rebuild::Engine
           opts = { t: NameFactory.new(env_name).identity,
                    rm: true }
           new_img = Docker::Image.build_from_tar( tar, opts ) do |v|
-            begin
-              if ( log = JSON.parse( v ) ) && log.has_key?( "stream" )
-                rbld_print.raw_trace( log["stream"] )
-              end
-            rescue
+            Rebuild::Utils::SafeJSONParser.new( v ).get( 'stream' ) do |s|
+              rbld_print.raw_trace( s )
             end
           end
         end
@@ -639,7 +654,7 @@ module Rebuild::Engine
       rescue => msg
         rbld_log.fatal( msg )
         raise InaccessibleDockerService
-  end
+    end
 
     def registry
       return @registry if @registry
@@ -759,5 +774,11 @@ module Rebuild::Engine
     def nonexisting_env(name)
       raise EnvironmentAlreadyExists, name.full if @cache.get(name)
     end
+
+    def remove_docker_img_if_unused(image)
+      image.remove
+      rescue Docker::Error::ConflictError => e
+        rbld_log.info( "Unable to delete dangling image after load: #{e}" )
+    end
   end
 end

data/cli/lib/rbld_fileops.rb

@@ -15,7 +15,28 @@ module Rebuild::Engine
     end
 
     def load!
-      with_gzip_reader { |gz| Docker::Image.load(gz) }
+      loaded_name = nil
+
+      with_gzip_reader do |gz|
+        Docker::Image.load(gz) do |response|
+          Rebuild::Utils::SafeJSONParser.new( response ).get( 'stream' ) do |s|
+            response = s
+          end
+
+          if m = response.match( /Loaded image: (.*)$/ )
+            loaded_name = m.captures[0]
+          elsif m = response.match( /The image (.*) already exists/ )
+            loaded_name = m.captures[0]
+          end
+        end
+      end
+
+      if loaded_name
+        env = Environment.from_image( loaded_name, nil )
+        return Rebuild::Utils::EnvNameHolder.new( env.name, env.tag )
+      else
+        return nil
+      end
 
       rescue => msg
         rbld_print.trace( msg )

data/cli/lib/rbld_reg_docker.rb

@@ -69,11 +69,8 @@ module Rebuild
       private
 
       def trace_progress(log_item)
-        begin
-          line = JSON.parse( log_item )["progress"]
-          rbld_print.inplace_trace( line ) if line
-        rescue
-        end
+        line = Rebuild::Utils::SafeJSONParser.new( log_item )['progress']
+        rbld_print.inplace_trace( line ) if line
       end
 
       def parse_entry(internal_name)

data/cli/lib/rbld_utils.rb

@@ -1,5 +1,6 @@
 require 'delegate'
 require 'ruby-progressbar'
+require 'json'
 
 module Rebuild
   module Utils
@@ -37,6 +38,19 @@ module Rebuild
       alias_method :name, :repo
     end
 
+    class EnvNameHolder
+      def initialize(name, tag)
+        @name, @tag = name, tag
+        @full = "#{name}:#{tag}"
+      end
+
+      def to_s
+        @full
+      end
+
+      attr_reader :name, :tag, :full
+    end
+
     module Errors
       def rebuild_errors(definitions)
         definitions.each_pair do |name, msg_fmt|
@@ -108,5 +122,21 @@ module Rebuild
       end
     end
 
+    class SafeJSONParser
+      def initialize(string)
+        @json = JSON.parse( string )
+        rescue
+      end
+
+      def [](key)
+        get( key )
+      end
+
+      def get(key)
+        key = ( @json && @json.has_key?( key ) ) ? @json[key] : nil
+        yield key if key && block_given?
+        key
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbld
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Dmitry Fleytman
 autorequire: 
 bindir: cli/bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -207,25 +207,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -386,6 +400,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.9
+- !ruby/object:Gem::Dependency
+  name: license_finder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Zero-dependency, reproducible build environments
 email: rbld-devel@rbld.io
 executables:
@@ -452,5 +486,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: rbld-1.3.4
+summary: rbld-1.3.5
 test_files: []