eac_docker 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb76d84d03b5ac717ad2ff9d7fab59de8399402fea4148105cf795b7012f76f3
-  data.tar.gz: 2151150c28e034afe331b8c07cfc0c3aea4165b495a98eb174610a3d7de19688
+  metadata.gz: b7ab9fa3bac2e0412b72d2cc72bbfba976e201b41f7579b943c619c8dc100e5f
+  data.tar.gz: ff1730b169c326274ad6c928c503141c586907279fe1b90e720228fa62d64cfc
 SHA512:
-  metadata.gz: cfb9ee8645109d9a41a9fce41214455b65ad62f05c095bfba27787c07e8f040f727a232b12202dbb623faca3788cdf764e2ea928d6e8b706509f822e5e04d09c
-  data.tar.gz: 1a0d46709c2af0b410dcfc47db46c356b295634ddf03514a0d860a95d343fc89331a0bfc9a9330beedfd20fcb5b77b32d36d1e558a91cc6c066ab8feea03d379
+  metadata.gz: 0744a0dcee991434317cb8233ba18b7eb3f657ab625fb619ecd7d1e942b64db1f7e88e37bd82548f7ec3667e3ba9bbd80b8cb4172c57acda9b21be7bcf31208e
+  data.tar.gz: 774b285e7cfc47ec13506438f935170e39fea6869fda96a36026efabeb897fdd86993af09cf4eccd33b659480e905a17387320171a729a87fa42e8b54c86b403

data/lib/eac_docker/container/exist.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module EacDocker
+  class Container
+    # Verify if a container identified by {#id}, if present, or {#name} already exists
+    # (running or not).
+    class Exist
+      acts_as_instance_method name_mark: :'?'
+      common_constructor :container
+      delegate :id, :name, to: :container
+
+      # @return [Boolean]
+      def result # rubocop:disable Naming/PredicateMethod
+        ::EacDocker::Executables.docker.command(
+          'ps', '--all', '--quiet', '--filter', filter
+        ).execute!.present?
+      end
+
+      # Filter used by {#result}: by {#id}, if present, or by {#name}.
+      #
+      # @return [String]
+      def filter
+        id.presence ? "id=#{id}" : "name=^/#{name}$"
+      end
+    end
+  end
+end

data/lib/eac_docker/container/identifiers.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module EacDocker
+  class Container
+    module Identifiers
+      common_concern do
+        immutable_accessor :name, type: :common
+      end
+
+      attr_reader :id
+
+      # Value that identifies the container to Docker commands: {#id}, if present, or {#name}.
+      #
+      # @return [String]
+      def identifier
+        id.presence || name.presence || raise('Neither `id` or `name` is present ' \
+                                              '- need at least one of them')
+      end
+
+      protected
+
+      attr_writer :id
+    end
+  end
+end

data/lib/eac_docker/container/run_command.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module EacDocker
+  class Container
+    class RunCommand
+      acts_as_instance_method
+      common_constructor :container, :extra_args, default: [[]]
+      delegate :capabilities, :command_args, :envs, :image, :interactive?, :name, :temporary?,
+               :tty?, :volumes, to: :container
+
+      # @return [EacRubyUtils::Envs::Command]
+      def result
+        ::EacDocker::Executables.docker.command('run', *all_args)
+      end
+
+      # @return [Array<String>]
+      def all_args
+        %w[boolean capabilities envs name volumes]
+          .inject([]) { |a, e| a + send("#{e}_args") } +
+          extra_args + [image.provide.id] + command_args
+      end
+
+      # @return [Array<String>]
+      def boolean_args
+        r = []
+        r << '--interactive' if interactive?
+        r << '--tty' if tty?
+        r << '--rm' if temporary?
+        r
+      end
+
+      # @return [Array<String>]
+      def capabilities_args
+        capabilities.flat_map { |capability| ['--cap-add', capability] }
+      end
+
+      # @return [Array<String>]
+      def envs_args
+        envs.flat_map { |name, value| ['--env', "#{name}=#{value}"] }
+      end
+
+      # @return [Array<String>]
+      def name_args
+        name.if_present([]) { |v| ['--name', v] }
+      end
+
+      # @return [Array<String>]
+      def volumes_args
+        volumes.flat_map { |volume| ['--volume', volume] }
+      end
+    end
+  end
+end

data/lib/eac_docker/container/start_command.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module EacDocker
+  class Container
+    # Start an already existing container identified by {#id}, if present, or {#name}.
+    class StartCommand
+      acts_as_instance_method
+      common_constructor :container
+      delegate :identifier, :interactive?, :tty?, to: :container
+
+      # @return [EacRubyUtils::Envs::Command]
+      def result
+        ::EacDocker::Executables.docker.command('start', *start_args)
+      end
+
+      # @return [Array<String>]
+      def start_args
+        r = []
+        r << '--attach' if interactive? || tty?
+        r << '--interactive' if interactive?
+        r << identifier
+        r
+      end
+    end
+  end
+end

data/lib/eac_docker/container.rb

@@ -6,7 +6,6 @@ module EacDocker
     immutable_accessor :interactive, :temporary, :tty, type: :boolean
     immutable_accessor :env, type: :hash
     immutable_accessor :capability, :command_arg, :volume, type: :array
-    attr_reader :id
 
     common_constructor :image
 
@@ -29,8 +28,7 @@ module EacDocker
     end
 
     def on_detached
-      command = ::EacDocker::Executables.docker.command(*(%w[run --detach] + run_command_args))
-      self.id = command.execute!.strip
+      self.id = run_command(%w[--detach]).execute!.strip
       begin
         yield(self)
       ensure
@@ -42,42 +40,17 @@ module EacDocker
       immutable_volume(right_part.if_present(left_part) { |v| "#{left_part}:#{v}" })
     end
 
-    def run_command
-      ::EacDocker::Executables.docker.command('run', *run_command_args)
-    end
-
-    def run_command_args
-      %w[boolean capabilities envs volumes]
-        .inject([]) { |a, e| a + send("run_command_#{e}_args") } +
-        [image.provide.id] + command_args
+    # Force removal of the container identified by {#id}, if present, or {#name}.
+    #
+    # @return [String] output of the "docker rm" command.
+    def remove_command
+      ::EacDocker::Executables.docker.command('rm', '--force', identifier)
     end
 
     def stop
       ::EacDocker::Executables.docker.command('stop', id).execute!
     end
 
-    private
-
-    attr_writer :id
-
-    def run_command_boolean_args
-      r = []
-      r << '--interactive' if interactive?
-      r << '--tty' if tty?
-      r << '--rm' if temporary?
-      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
-
-    def run_command_envs_args
-      envs.flat_map { |name, value| ['--env', "#{name}=#{value}"] }
-    end
+    require_sub __FILE__, require_mode: :kernel, include_modules: true
   end
 end

data/lib/eac_docker/images/named.rb

@@ -5,12 +5,18 @@ module EacDocker
     class Named < ::EacDocker::Images::Base
       common_constructor :source_tag
 
+      # @return [Boolean]
+      def exist?
+        ::EacDocker::Executables.docker.command('image', 'inspect', source_tag).execute
+          .fetch(:exit_code).zero?
+      end
+
       def id
         source_tag
       end
 
       def provide
-        provide_command.execute!
+        provide_command.execute! unless exist?
         self
       end
 

data/lib/eac_docker/images/templatized.rb

@@ -32,7 +32,7 @@ module EacDocker
       end
 
       def write_in_provide_dir
-        template.apply(variables_source, provide_dir)
+        eac_template.apply(variables_source, provide_dir)
       end
 
       private

data/lib/eac_docker/rspec/stub_image.rb

@@ -18,13 +18,13 @@ module EacDocker
         internal_container
       end
 
-      def on_container(&block)
+      def on_container(&)
         raise 'A container was already created' if internal_container.present?
 
         build_container.on_detached do |container|
           self.internal_container = container
           begin
-            run_callbacks(:on_container, &block)
+            run_callbacks(:on_container, &)
           ensure
             self.internal_container = nil
           end

data/lib/eac_docker/version.rb

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

data/lib/eac_docker.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils'
-EacRubyUtils::RootModuleSetup.perform __FILE__
-
-module EacDocker
+require 'eac_ruby_base1'
+EacRubyBase1::RootModuleSetup.perform __FILE__ do
+  require 'eac_templates'
 end
-
-require 'eac_templates'

metadata

@@ -1,77 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: eac_docker
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Put here the authors
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-08-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eac_ruby_utils
+  name: eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.128'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.128.2
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.128'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.128.2
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-description: 
-email: 
+        version: '0.15'
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/eac_docker.rb
 - lib/eac_docker/container.rb
+- lib/eac_docker/container/exist.rb
+- lib/eac_docker/container/identifiers.rb
+- lib/eac_docker/container/run_command.rb
+- lib/eac_docker/container/start_command.rb
 - lib/eac_docker/debug.rb
 - lib/eac_docker/executables.rb
 - lib/eac_docker/images/base.rb
@@ -82,10 +77,8 @@ files:
 - lib/eac_docker/rspec/setup.rb
 - lib/eac_docker/rspec/stub_image.rb
 - lib/eac_docker/version.rb
-homepage: 
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -93,15 +86,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Put here de description.
 test_files: []