miniexec 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d3ec6ebddbfa656fc808948f9b00d4a3d21fc5c9e99cfa57cc1c75ae6ff4db
-  data.tar.gz: fa30d9899cecab9a7132aa70020b2beb9993470d19ed90f72077a8c4ff290ba9
+  metadata.gz: f159f73abf46bbc302ba16f34e5f3ec7eac0fe530e57e06e24e3504f198f2027
+  data.tar.gz: 41bd239c0271b589f448de12318397324f2e6ab67e6274caaa79405668119ef7
 SHA512:
-  metadata.gz: b9742c67bf8c386046b180c71f7f0370fbdf85c14562876da14c18604a6ee247e47f2c8c939530f4ed505d2374b2c26361e525d3904e51a2e7a5fac22a995ca0
-  data.tar.gz: e1c7e81a025b817e1701d8029aa7bac7e7552e2dc0ee615c6ddf56fdd098da7771f5745c26419c6a4fa121e6bff4a7b233dbca81889938ba247e41376b187cb3
+  metadata.gz: a86c5c2d96807c1572d2a78a6799e05694987f2bee706fb7b9822a6ee0b6d5481bcc43e4aa3a668957b476a30d6dfb5f054aa37956948cd3e9b8d2dac336af4d
+  data.tar.gz: 8722200cb309d02e28272ef2977464c1870980442deafacaa0dbd55842eb0fcfab77c0e33bf86bbd2ab18b7c39d48cf67fedbac3225b0ad84848436f36fbfffc

data/bin/miniexec

@@ -1,12 +1,16 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+lib = File.expand_path('../lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'miniexec'
 require 'optparse'
 
 options = {
   binds: [],
-  env: {}
+  env: {},
+  path: '.',
+  docker: ENV['DOCKER_HOST'] || '/run/docker.sock'
 }
 
 OptionParser.new do |opts|
@@ -34,17 +38,15 @@ OptionParser.new do |opts|
   end
   opts.on('-d', '--docker-url URL',
           'Location of the docker socket') do |sock|
-    options[:docker] = sock || ENV['DOCKER_HOST'] || '/run/docker.sock'
+    options[:docker] = sock
   end
 end.parse!
 
 raise OptionParser::MissingArgument, 'Specify a job with -j' if options[:job].nil?
-raise OptionParser::MissingArgument, 'Specify a job with -p' if options[:path].nil?
 
 MiniExec.config(project_path: options[:path])
 exec = MiniExec.new options[:job],
                     docker_url: options[:docker],
                     binds: options[:binds],
                     env: options[:env]
-
 exec.run_job

data/lib/miniexec.rb

@@ -38,7 +38,10 @@ class MiniExec
     @image = set_job_image
     @script = compile_script
     @binds = binds
-    @env = env.merge gitlab_env, variables
+    @env = {}
+    @env.merge! env
+    @env.merge! gitlab_env
+    @env.merge! variables
     configure_logger
     Docker.options[:read_timeout] = 6000
     Docker.url = docker_url if docker_url
@@ -46,11 +49,11 @@ class MiniExec
 
   def run_job
     script_path = "/tmp/#{@job['name']}.sh"
-    @logger.debug "Fetching image #{@image}"
+    @logger.info "Fetching image #{@image}"
     Docker::Image.create(fromImage: @image)
-    @logger.debug 'Image fetched'
+    @logger.info 'Image fetched'
     Dir.chdir(@project_path) do
-      @logger.debug 'Creating container'
+      @logger.info 'Creating container'
       container = Docker::Container.create(
         Cmd: ['/bin/bash', script_path],
         Image: @image,
@@ -59,7 +62,7 @@ class MiniExec
       )
       container.store_file(script_path, @script)
       container.start({ Binds: [@binds] })
-      container.tap(&:start).attach { |_, chunk| @logger.info chunk }
+      container.tap(&:start).attach { |_, chunk| puts chunk }
     end
   end
 
@@ -99,8 +102,8 @@ class MiniExec
   end
 
   def variables
-    globals = @workflow['variables']
-    job_locals = @job['variables']
+    globals = @workflow['variables'] || {}
+    job_locals = @job['variables'] || {}
     globals.merge job_locals
   end
 
@@ -109,13 +112,13 @@ class MiniExec
     @logger.formatter = proc do |severity, _, _, msg|
       "[#{severity}]: #{msg}\n"
     end
-    @logger.level = ENV['LOGLEVEL'] || Logger::WARN
+    @logger.level = ENV['LOGLEVEL'] || Logger::INFO
   end
 
   def compile_script
-    before_script = @job['before_script'] || []
-    script = @job['script'] || []
-    after_script = @job['after_script'] || []
-    (before_script + script + after_script).flatten.join("\n")
+    before_script = @job['before_script'] || ''
+    script = @job['script'] || ''
+    after_script = @job['after_script'] || ''
+    [before_script, script, after_script].flatten.join("\n").strip
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniexec
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Martin Pugh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies: []
 description: A minimal interpretor/executor for .gitlab-ci.yml
 email: pugh@s3kr.it