all_images 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05e803f38074cc12ba26b4720f6fadc89e2e4a684ae9755b60d97773c4f8992f
-  data.tar.gz: 42864bc243ebf51e1c72285bdbcc7cd1fe37620120bbdfe16d71a4867d73f1e9
+  metadata.gz: cbf39eaf44bd3eef5cba7b22e942621717fd838cde984764c684ba2a7f8842f7
+  data.tar.gz: f8c257c224e80f2ae251ec8e05b8869d3348ae0408d4a0dadd789ef74ce182c3
 SHA512:
-  metadata.gz: 1c7900c9400afa3ec720879299212395cb63a77bcba30a02c8d31f687df1d23c697b41e139b5e262e418a42e91d50166af6fd6438c42de73e79364401c24b6df
-  data.tar.gz: efc3e9241153ee54b8cc5ce2701040be5ab0b5cd0181b89744c891f2caf8fedbfcc7fde069ca57783997dec763485c1f3da6785c89edfab6151929963ea5afa6
+  metadata.gz: 39b423c850d91d8a7261c2b4677ba9935486797e0dd08ab2cca2ed6e9af78c162296cd89daa7e7ce71dd23999fed098f4158edc57d34222d99ef38db495bca10
+  data.tar.gz: 4a2d1611e0452b452963c099aed19163af335290015b25b72757db37803827a304d77282c3cc0919cfc0b24855703d8fb727cd74dd4c11664edcee7b3bbbac08

data/CHANGES.md

@@ -1,9 +1,28 @@
 # Changes
 
+## 2024-10-14 v0.6.0
+
+### Significant Changes
+* **Add support for environment variables to all_images**
+  + Require `'tins/xt/full'` and add new method `env` to set environment variables.
+  + Modified the `sh` method to use environment variables from the `env` method.
+  + Modified the `run_image` method to include environment variables in the Docker command.
+* Update rake task to use spec instead of test
+* Added `[IMAGE]` as an optional argument in the Usage message.
+
+### Other Changes
+* Reformat CHANGES.md
+* Add error reporting to `sh`
+  + Added require `'shellwords'`
+
+#### Environment Variables
+* Added `env` section to `.all_images.yml`
+* Defined `FOO=bar` and `USER` environment variables
+
 ## 2024-09-01 v0.5.0
 
 * **Update image processing for parallel execution**:
-	+ Added random suffix to image names to prevent conflicts between concurrent processes.
+  + Added random suffix to image names to prevent conflicts between concurrent processes.
 * Added `CHANGES.md` file
 
 ## 2024-08-08 v0.4.1
@@ -31,20 +50,20 @@
 ## 2023-06-01 v0.2.3
 
 * **New Features**
-	+ Added support for Ruby 3.2
+  + Added support for Ruby 3.2
 * **Changes**
-	+ Bumped build version
-	+ Removed support for Ruby 2.5
+  + Bumped build version
+  + Removed support for Ruby 2.5
 * **Bug Fixes**
-	+ Repaired `fail_fast` mode
+  + Repaired `fail_fast` mode
 
 ## 2023-04-19 v0.2.2
 
 * **New Version Features**
-	+ Progress into the future of ruby development
-	+ Progress into the future
+  + Progress into the future of ruby development
+  + Progress into the future
 * **Significant Changes**
-	+ Removed development dependency (again)
+  + Removed development dependency (again)
 
 ## 2022-11-17 v0.2.1
 
@@ -53,8 +72,8 @@
 ## 2022-11-17 v0.2.0
 
 * **New Features**
-	+ Added commands to run and debug single images
-	+ Added a debug debugger feature
+  + Added commands to run and debug single images
+  + Added a debug debugger feature
 
 ## 2022-11-17 v0.1.0
 

data/all_images.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: all_images 0.5.0 ruby lib
+# stub: all_images 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "all_images".freeze
-  s.version = "0.5.0".freeze
+  s.version = "0.6.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2024-08-31"
+  s.date = "2024-10-14"
   s.description = "A script that runs a script in all of the configured docker images".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["all_images".freeze]
@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/flori/all_images".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "AllImages -- Runs a script in all of the docker images".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.5.16".freeze
+  s.rubygems_version = "3.5.18".freeze
   s.summary = "Runs a script in all of the docker images".freeze
   s.test_files = ["spec/app_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.17.0".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.19".freeze])
   s.add_development_dependency(%q<rake>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<rspec>.freeze, [">= 0".freeze])

data/lib/all_images/app.rb

@@ -2,13 +2,13 @@ require 'term/ansicolor'
 require 'tmpdir'
 require 'fileutils'
 require 'tins'
+require 'tins/xt/full'
+require 'shellwords'
 
 class AllImages::App
   include Term::ANSIColor
   include FileUtils
 
-  alias sh system
-
   def initialize(args)
     @args     = args.dup
     @command  = pick_command
@@ -18,13 +18,12 @@ class AllImages::App
 
   def run
     @config   = load_config or return 23
-
     result = 0
     case @command
     when 'ls'
       puts Array(@config['images']).map(&:first)
     when 'help'
-      puts "Usage: #{File.basename($0)} #{@commands * ?|} IMAGE"
+      puts "Usage: #{File.basename($0)} #{@commands * ?|} [IMAGE]"
     else
       Array(@config['images']).each do |image, script|
         case @command
@@ -45,20 +44,45 @@ class AllImages::App
 
   private
 
+  def env
+    vars = @config.fetch('env', [])
+    vars << 'TERM' if ENV.key?('TERM')
+    vars.each_with_object({}) { |v, h|
+      name, value = v.split(?=, 2)
+      if value
+        h[name] = value
+      else
+        h[name] = ENV[name]
+      end
+    }
+  end
+
+  def sh(*a)
+    if $DEBUG
+      STDERR.puts "Executing #{a.inspect}."
+    end
+    system(*a)
+    if $?.success?
+      true
+    else
+      raise "Command #{Shellwords.join(a).inspect} failed with: #{$?.exitstatus}"
+    end
+  end
+
   def name
     [ 'all_images', @suffix ] * ?-
   end
 
   def run_image(image, script, interactive: false)
     dockerfile = @config.fetch('dockerfile').to_s
-    tag = provide_image image, dockerfile, script
-    term = ENV.key?('TERM') ? %{ -e TERM=#{ENV['TERM'].inspect} } : ' '
+    tag  = provide_image image, dockerfile, script
+    envs = env.full? { |e| +' ' << e.map { |n, v| '-e %s=%s' % [ n, v.inspect ] } * ' ' }
     if interactive
       puts "You can run /script interactively now."
-      sh "docker run --name #{name} -it #{term}-v `pwd`:/work '#{tag}' sh"
+      sh "docker run --name #{name} -it#{envs} -v `pwd`:/work '#{tag}' sh"
       return 0
     else
-      if sh "docker run --name #{name} -it #{term}-v `pwd`:/work '#{tag}' sh -c /script"
+      if sh "docker run --name #{name} -it#{envs} -v `pwd`:/work '#{tag}' sh -c /script"
         puts green('SUCCESS')
         return 0
       else

data/lib/all_images/version.rb

@@ -1,6 +1,6 @@
 module AllImages
   # AllImages version
-  VERSION         = '0.5.0'
+  VERSION         = '0.6.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: all_images
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: '1.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Runs a script in all of the docker images