eac_docker 0.2.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 545512f3dd607d1e114604b58871a5ed17caab02e685e38e5612c00c498aa5b9
-  data.tar.gz: c044921d80cfa1397a702833a65580d66786892a675b6e2e26fc46c6487c5ae6
+  metadata.gz: 7a0db3a2d136f74a3f4794e70a5641bb10d679be7a21731c67a8869b282d3f51
+  data.tar.gz: 496a58ae61c00001258bf0886de2f02a30d127384b0d822c408251d2e4770c26
 SHA512:
-  metadata.gz: c5c9628a9aed8aaf7b7a37cb308b7bce2d2c31a63a30319b7178af5e284866b134c2b527b22abd68b0a74e9191dfa8f0de89e3e85ac555b9138c5aec50655baa
-  data.tar.gz: 8b4a9a6ed89407f2847ac1c9d0d968481b0eb1fba5d94cb2bc26bd6db2ec90e5687603ccf76f68087f8147330b73b335bb95325b2993d86883e61057a7fd9cb1
+  metadata.gz: 61ae5de6921486e25d33e2718c80dbd15b2634985e8f0fb1d2bae3222f07846392ef3b4b1f971d3e9b32475bd473f9d402102a8634920866959670fa4a9dec89
+  data.tar.gz: 128a951fb2c98561b707aca8926a3289139fb4835c42de07ee9339a0802e33680a1b6aabc9d450ec8b9712364d6551668996ce9068f442d3c847c30885abb7b9

data/lib/eac_docker/container.rb

@@ -7,7 +7,7 @@ module EacDocker
     enable_immutable
     immutable_accessor :interactive, :temporary, :tty, type: :boolean
     immutable_accessor :env, type: :hash
-    immutable_accessor :command_arg, :volume, type: :array
+    immutable_accessor :capability, :command_arg, :volume, type: :array
     attr_reader :id
     common_constructor :image
 
@@ -43,8 +43,8 @@ module EacDocker
     end
 
     def run_command_args
-      run_command_boolean_args + run_command_envs_args + run_command_volumes_args + [image.id] +
-        command_args
+      run_command_boolean_args + run_command_capabilities_args + run_command_envs_args +
+        run_command_volumes_args + [image.provide.id] + command_args
     end
 
     def stop
@@ -63,6 +63,10 @@ module EacDocker
       r
     end
 
+    def run_command_capabilities_args
+      capabilities.flat_map { |capability| ['--cap-add', capability] }
+    end
+
     def run_command_volumes_args
       volumes.flat_map { |volume| ['--volume', volume] }
     end

data/lib/eac_docker/debug.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/boolean'
+
+module EacDocker
+  module Debug
+    class << self
+      ENABLE_ENVVAR = 'EAC_DOCKER_DEBUG'
+
+      def enabled?
+        ::EacRubyUtils::Boolean.parse(ENV[ENABLE_ENVVAR])
+      end
+    end
+  end
+end

data/lib/eac_docker/images/coded.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_docker/debug'
 require 'eac_docker/executables'
 require 'eac_docker/images/base'
 require 'eac_ruby_utils/core_ext'
@@ -26,6 +27,9 @@ module EacDocker
       private
 
       def id_uncached
+        if ::EacDocker::Debug.enabled?
+          ::EacDocker::Executables.docker.command(*build_args.excluding('--quiet')).system!
+        end
         ::EacDocker::Executables.docker.command(*build_args).execute!.strip
       end
 

data/lib/eac_docker/images/templatized.rb

@@ -4,23 +4,38 @@ require 'eac_docker/images/base'
 require 'eac_docker/images/coded'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/fs/temp'
+require 'eac_templates/patches/object/template'
 
 module EacDocker
   module Images
     class Templatized < ::EacDocker::Images::Base
       enable_immutable
       immutable_accessor :tag
+      attr_reader :provide_dir
+
+      def id
+        tag
+      end
 
       def provide
         ::EacRubyUtils::Fs::Temp.on_directory do |provide_dir|
-          template.apply(self, provide_dir)
-          coded_image(provide_dir).tag(tag).provide
+          begin
+            self.provide_dir = provide_dir
+            template.apply(self, provide_dir)
+            coded_image(provide_dir).tag(tag).provide
+          ensure
+            self.provide_dir = nil
+          end
         end
       end
 
       def coded_image(provide_dir)
         ::EacDocker::Images::Coded.new(provide_dir)
       end
+
+      private
+
+      attr_writer :provide_dir
     end
   end
 end

data/lib/eac_docker/rspec.rb

@@ -1,17 +1,9 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/rspec/conditional'
-require 'eac_docker/executables'
+require 'eac_ruby_utils/core_ext'
 
 module EacDocker
   module Rspec
-    class << self
-      def configure
-        ::EacRubyUtils::Rspec::Conditional.default.add(:docker) do
-          ::EacDocker::Executables.docker.validate
-        end
-        RSpec.configure { |config| ::EacRubyUtils::Rspec::Conditional.default.configure(config) }
-      end
-    end
+    require_sub __FILE__
   end
 end

data/lib/eac_docker/rspec/setup.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_docker/executables'
+
+module EacDocker
+  module Rspec
+    module Setup
+      def self.extended(obj)
+        obj.setup_conditional_docker_executable
+      end
+
+      def setup_conditional_docker_executable
+        conditional(:docker) { ::EacDocker::Executables.docker.validate }
+      end
+    end
+  end
+end

data/lib/eac_docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacDocker
-  VERSION = '0.2.1'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_docker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -16,28 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.74'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.74'
+- !ruby/object:Gem::Dependency
+  name: eac_templates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 description: 
 email: 
 executables: []
@@ -46,6 +66,7 @@ extra_rdoc_files: []
 files:
 - lib/eac_docker.rb
 - lib/eac_docker/container.rb
+- lib/eac_docker/debug.rb
 - lib/eac_docker/executables.rb
 - lib/eac_docker/images.rb
 - lib/eac_docker/images/base.rb
@@ -54,6 +75,7 @@ files:
 - lib/eac_docker/images/templatized.rb
 - lib/eac_docker/registry.rb
 - lib/eac_docker/rspec.rb
+- lib/eac_docker/rspec/setup.rb
 - lib/eac_docker/version.rb
 homepage: 
 licenses: []
@@ -73,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Put here de description.