miniexec 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7167acf5043ec6bf1dd58585100d89cc68704bcbcabd1d9dbb516aa264263bc5
-  data.tar.gz: 61077414a22ad766389a6b869fa776858955733cc32c667bf94d1d89bb0d5a49
+  metadata.gz: 1c459ebbf1b0b28551c9d8243d323552518f19594ebf1cd327db16a0e4a629c5
+  data.tar.gz: 03c7bb377700b97f4bace54b20c1ca10d75be95f6e773e7347204d17fbed6a9a
 SHA512:
-  metadata.gz: 5cab8edace6a15d9c8e7bd7afb9efc46778fcf99821ff58ae34fd9c3c9fd7fb8387b1e98719c68c160fef5aab95a9f1c599d6be99f6215a253e9ef90a52be2f5
-  data.tar.gz: 4967266794a76314873f51aaef7d245327dbfcda0bccee453f3fa5c45bc4c903b45a9d3b37ca95c9cbc6d246dc32d1bf4c28b88274749a881e827c2b1fdba46c
+  metadata.gz: dceeeb43f8835bc188b7bf1f7dab09b0666563b04eb3428434debe5d1125b1962fe07c0efcba15685db7b8d27bb23927558cafecb6d55d20591fa29ee89e4431
+  data.tar.gz: 61f032f5532532db3b935fea5538b0d5591bbe44d1cc63d8ac9a9d9d5335a5b15043dc8c52651131e0f444362a33e4c09a9b28963eadadff36050fe7c9272418

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

@@ -8,7 +8,6 @@ class MiniExec
   require 'tempfile'
   require 'yaml'
   require 'git'
-  require 'pry'
   # Class instance variables
   @project_path = '.'
   @workflow_file = '.gitlab-ci.yml'
@@ -47,11 +46,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,
@@ -60,7 +59,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
 
@@ -100,8 +99,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
 
@@ -110,13 +109,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.3
+  version: 0.0.8
 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