eac_docker 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d5ee27849d893d0baaeae9c9693dcb5b3b84349eee98f07081d6566ee5b632
-  data.tar.gz: 749bf0ae7c23323717f41acfa32170e4053c4d43205269c643da486d1d73cd00
+  metadata.gz: 23cb2be3b085b58aca17331b8423c9a7411a80c405288aa4985dd638bddc3ac3
+  data.tar.gz: fe63f09139b19feefcf0593f18f3816cefa6c2ef625ebf7c019bca25436fa42d
 SHA512:
-  metadata.gz: c054e0d39c8aad0cf2547b49ec509331bc8e98548208e7769c7d742fc585e2436dd1998630dac2792c1732e00df4e191f06766f04522404f0fc330b9e367146f
-  data.tar.gz: 3386804efb02936f16b3d2e3564c8fb07834309d778ce20c7edba1a0dbd5d8e68967b4b16779984804abc99acf7076324509932c42ea230067b80819e5b4a0a6
+  metadata.gz: 2028ed9e3f5de2c1cdf4a3135876cde44d4f870f611329c0846e3043bb0efbe404e150fb53cc1451d21d6c836c4a784c25aae4784301eba2ba0bafbb256ad46b
+  data.tar.gz: cf15244416cd4839de5642b6cb68cd90b26327cb99455a337246b5d8b7854655aba2b06702d5c5929132c4313b97ed12adabea33acaaf2106cfceda88b03fb69

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_include.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/conditional'
+require 'eac_docker/executables'
+
+module EacDocker
+  module Rspec
+    module SetupInclude
+      class << self
+        def setup(setup_obj)
+          setup_conditional_docker_executable(setup_obj)
+        end
+
+        def setup_conditional_docker_executable(setup_obj)
+          ::EacRubyUtils::Rspec::Conditional.default.add(:docker) do
+            ::EacDocker::Executables.docker.validate
+          end
+          ::EacRubyUtils::Rspec::Conditional.default.configure(setup_obj.rspec_config)
+        end
+      end
+    end
+  end
+end

data/lib/eac_docker/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_docker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -16,34 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.70'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.70'
 - !ruby/object:Gem::Dependency
-  name: eac_ruby_gem_support
+  name: eac_templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
+  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.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.3'
 description: 
 email: 
 executables: []
@@ -52,6 +60,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
@@ -60,6 +69,7 @@ files:
 - lib/eac_docker/images/templatized.rb
 - lib/eac_docker/registry.rb
 - lib/eac_docker/rspec.rb
+- lib/eac_docker/rspec/setup_include.rb
 - lib/eac_docker/version.rb
 homepage: 
 licenses: []
@@ -79,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Put here de description.